s3: do not allow 0s refresh interval after applying defaults

ahouene · ahouene · commit a040cf72e60a · 2023-09-12T16:09:18.000+02:00
diff --git a/backends/s3/s3.go b/backends/s3/s3.go
@@ -117,7 +117,7 @@ func (o Options) Check() error {
 	if !hasSecretsCreds && !hasStaticCreds {
 		return fmt.Errorf("s3 storage.options: credentials are required, fill either (access_key and secret_key) or (access_key_filename and secret_key_filename)")
 	}
-	if d := o.SecretsRefreshInterval; hasSecretsCreds && d != 0 && d < time.Second {
+	if hasSecretsCreds && o.SecretsRefreshInterval < time.Second {
 		return fmt.Errorf("s3 storage.options: field refresh_secrets is required when using secret credentials")
 	}
 	if o.Bucket == "" {

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ func (o Options) Check() error {`
`117`	`117`	`if !hasSecretsCreds && !hasStaticCreds {`
`118`	`118`	`return fmt.Errorf("s3 storage.options: credentials are required, fill either (access_key and secret_key) or (access_key_filename and secret_key_filename)")`
`119`	`119`	`}`
`120`		`- if d := o.SecretsRefreshInterval; hasSecretsCreds && d != 0 && d < time.Second {`
	`120`	`+ if hasSecretsCreds && o.SecretsRefreshInterval < time.Second {`
`121`	`121`	`return fmt.Errorf("s3 storage.options: field refresh_secrets is required when using secret credentials")`
`122`	`122`	`}`
`123`	`123`	`if o.Bucket == "" {`