feat(config):lab4 add optional S3 settings
This commit is contained in:
@@ -69,24 +69,18 @@ func Load() (*Config, error) {
|
||||
}
|
||||
|
||||
s3Endpoint := getenv("S3_ENDPOINT", "")
|
||||
if s3Endpoint == "" {
|
||||
return nil, fmt.Errorf("S3_ENDPOINT не задан")
|
||||
}
|
||||
s3Bucket := getenv("S3_BUCKET", "")
|
||||
if s3Bucket == "" {
|
||||
return nil, fmt.Errorf("S3_BUCKET не задан")
|
||||
}
|
||||
s3UseSSL, err := readBool("S3_USE_SSL", false)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("S3_USE_SSL: %w", err)
|
||||
}
|
||||
s3Region := getenv("S3_REGION", "us-east-1")
|
||||
|
||||
s3AccessKey, err := readSecret("S3_ACCESS_KEY_FILE", "S3_ACCESS_KEY")
|
||||
s3AccessKey, err := readSecretOptional("S3_ACCESS_KEY_FILE", "S3_ACCESS_KEY")
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("s3 access key: %w", err)
|
||||
}
|
||||
s3SecretKey, err := readSecret("S3_SECRET_KEY_FILE", "S3_SECRET_KEY")
|
||||
s3SecretKey, err := readSecretOptional("S3_SECRET_KEY_FILE", "S3_SECRET_KEY")
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("s3 secret key: %w", err)
|
||||
}
|
||||
@@ -109,6 +103,12 @@ func Load() (*Config, error) {
|
||||
S3SecretKey: s3SecretKey,
|
||||
}, nil
|
||||
}
|
||||
func (c *Config) S3Configured() bool {
|
||||
return c.S3Endpoint != "" &&
|
||||
c.S3Bucket != "" &&
|
||||
c.S3AccessKey != "" &&
|
||||
c.S3SecretKey != ""
|
||||
}
|
||||
|
||||
func getenv(key, def string) string {
|
||||
if v := os.Getenv(key); v != "" {
|
||||
|
||||
Reference in New Issue
Block a user