Diffstat (limited to 'config')
| -rw-r--r-- | config/config-s3.sample.json | 53 | ||||
| -rw-r--r-- | config/config.go | 26 |
2 files changed, 2 insertions, 77 deletions
diff --git a/config/config-s3.sample.json b/config/config-s3.sample.json deleted file mode 100644 index 5b067a5..0000000 --- a/config/config-s3.sample.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "MaxProcessThreads": 4, - "MaxPreProcessThreads": 12, - "LogLevel": "info", - "Input": { - "Storage": { - "Type": "s3", - "Config": { - "BucketName": "my-photos", - "Region": "", - "Prefix": "full/", - "Endpoint": "https://minio.local", - "UsePathStyle": true, - "AccessKeyID": "${AWS_ACCESS_KEY_ID}", - "SecretAccessKey": "${AWS_SECRET_ACCESS_KEY}" - } - }, - "KnownExtensions": [ - "jpg", - "jpeg", - "png" - ], - "CacheProcessed": true, - "CacheProcessedCsvPath": "cache.csv" - }, - "Converters": [ - { - "Type": "webp", - "Config": { - "Quality": 80, - "Size": { - "MaxWidth": 320, - "MaxHeight": 0 - } - }, - "Output": { - "RewriteOn": "UnequalHashInCache", - "Storage": { - "Type": "s3", - "Config": { - "BucketName": "my-photos", - "Region": "", - "Prefix": "webp-320p/", - "Endpoint": "https://minio.local", - "UsePathStyle": true, - "AccessKeyID": "${AWS_ACCESS_KEY_ID}", - "SecretAccessKey": "${AWS_SECRET_ACCESS_KEY}" - } - } - } - } - ] -} diff --git a/config/config.go b/config/config.go index 06fa94f..e55d4b7 100644 --- a/config/config.go +++ b/config/config.go @@ -25,7 +25,7 @@ type InputConfig struct { } type InputStorageConfig struct { - Type string `json:"Type" validate:"required,oneof=b2 s3 local-unix"` + Type string `json:"Type" validate:"required,oneof=b2 local-unix"` Config any `json:"Config" validate:"required"` } @@ -48,12 +48,6 @@ func (sc *InputStorageConfig) UnmarshalJSON(data []byte) error { return fmt.Errorf("unmarshal B2Config: %w", err) } sc.Config = &b2Config - case "s3": - var s3Config S3Config - if err := json.Unmarshal(tmp.Config, &s3Config); err != nil { - return fmt.Errorf("unmarshal S3Config: %w", err) - } - sc.Config = &s3Config case "local-unix": var localUnixConfig InputLocalUnixConfig if err := json.Unmarshal(tmp.Config, &localUnixConfig); err != nil { @@ -124,7 +118,7 @@ type SizeConfig struct { } type OutputStorageConfig struct { - Type string `json:"Type" validate:"required,oneof=b2 s3 local-unix"` + Type string `json:"Type" validate:"required,oneof=b2 local-unix"` Config any `json:"Config" validate:"required"` } @@ -147,12 +141,6 @@ func (sc *OutputStorageConfig) UnmarshalJSON(data []byte) error { return fmt.Errorf("unmarshal B2Config: %w", err) } sc.Config = &b2Config - case "s3": - var s3Config S3Config - if err := json.Unmarshal(tmp.Config, &s3Config); err != nil { - return fmt.Errorf("unmarshal S3Config: %w", err) - } - sc.Config = &s3Config case "local-unix": var localUnixConfig OutputLocalUnixConfig if err := json.Unmarshal(tmp.Config, &localUnixConfig); err != nil { @@ -174,16 +162,6 @@ type B2Config struct { ApplicationKey string `json:"ApplicationKey"` } -type S3Config struct { - BucketName string `json:"BucketName" validate:"required,min=1"` - Region string `json:"Region" validate:"required,min=1"` - Prefix string `json:"Prefix"` - Endpoint string `json:"Endpoint"` - UsePathStyle bool `json:"UsePathStyle"` - AccessKeyID string `json:"AccessKeyID"` - SecretAccessKey string `json:"SecretAccessKey"` -} - type InputLocalUnixConfig struct { MaxDepth int `json:"MaxDepth" validate:"required,min=0"` Path string `json:"Path" validate:"required,min=1"` |