diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/config-s3.sample.json | 53 | ||||
| -rw-r--r-- | config/config.go | 26 |
2 files changed, 77 insertions, 2 deletions
diff --git a/config/config-s3.sample.json b/config/config-s3.sample.json new file mode 100644 index 0000000..5b067a5 --- /dev/null +++ b/config/config-s3.sample.json @@ -0,0 +1,53 @@ +{ + "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 e55d4b7..06fa94f 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 local-unix"` + Type string `json:"Type" validate:"required,oneof=b2 s3 local-unix"` Config any `json:"Config" validate:"required"` } @@ -48,6 +48,12 @@ 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 { @@ -118,7 +124,7 @@ type SizeConfig struct { } type OutputStorageConfig struct { - Type string `json:"Type" validate:"required,oneof=b2 local-unix"` + Type string `json:"Type" validate:"required,oneof=b2 s3 local-unix"` Config any `json:"Config" validate:"required"` } @@ -141,6 +147,12 @@ 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 { @@ -162,6 +174,16 @@ 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"` |