Merge pull request #52 from GreenmaskIO/fix_broken_s3_st

Fixed broken S3 storage after structure refactoring

internal/storages/builder/builder.go

@@ -40,9 +40,6 @@ func GetStorage(ctx context.Context, stCfg *domains.StorageConfig, logCgf *domai
 		}
 		return directory.NewStorage(stCfg.Directory)
 	case S3StorageType:
-		if err := stCfg.S3.Validate(); err != nil {
-			return nil, fmt.Errorf("s3 storage config validation failed: %w", err)
-		}
 		return s3.NewStorage(ctx, stCfg.S3, logCgf.Level)
 	}
 	return nil, fmt.Errorf("unknown storage type: %s", stCfg.Type)

internal/storages/s3/config.go

@@ -14,13 +14,11 @@
 
 package s3
 
-import (
-	"errors"
-)
-
 const (
-	defaultMaxRetries  = 3
-	defaultMaxPartSize = 50 * 1024 * 1024
+	defaultMaxRetries   = 3
+	defaultMaxPartSize  = 50 * 1024 * 1024
+	defaultStorageClass = "STANDARD"
+	defaultForcePath    = true
 )
 
 type Config struct {
@@ -47,16 +45,9 @@ type Config struct {
 
 func NewConfig() *Config {
 	return &Config{
-		StorageClass:   "STANDARD",
-		ForcePathStyle: true,
+		StorageClass:   defaultStorageClass,
+		ForcePathStyle: defaultForcePath,
 		MaxRetries:     defaultMaxRetries,
 		MaxPartSize:    defaultMaxPartSize,
 	}
 }
-
-func (c *Config) Validate() error {
-	if c.Region != "" {
-		return errors.New("region cannot be empty")
-	}
-	return nil
-}

playground/config.yml

@@ -3,6 +3,7 @@ common:
   tmp_dir: "/tmp"
 
 storage:
+  type: "s3"
   s3:
     endpoint: "http://playground-storage:9000"
     bucket: "adventureworks"