fixup! fixup! reloader: allow suppressing envvar errors

docs/storage.md

@@ -66,6 +66,7 @@ config:
   bucket: ""
   endpoint: ""
   region: ""
+  disable_dualstack: false
   aws_sdk_auth: false
   access_key: ""
   insecure: false
@@ -94,6 +95,7 @@ config:
   list_objects_version: ""
   bucket_lookup_type: auto
   send_content_md5: true
+  disable_multipart: false
   part_size: 67108864
   sse_config:
     type: ""

pkg/reloader/reloader.go

@@ -238,7 +238,7 @@ func New(logger log.Logger, reg prometheus.Registerer, o *Options) *Reloader {
 		configEnvVarExpansionErrors: promauto.With(reg).NewGauge(
 			prometheus.GaugeOpts{
 				Name: "reloader_config_env_var_expansion_errors",
-				Help: "Total number of config environment variable expansions that failed.",
+				Help: "Number of environment variable expansions that failed during the last operation.",
 			},
 		),
 		reloaderInfo: promauto.With(reg).NewGaugeVec(
@@ -360,8 +360,8 @@ func (r *Reloader) Watch(ctx context.Context) error {
 	}
 }
 
-func (r *Reloader) normalize(input, output string) error {
-	b, err := os.ReadFile(input)
+func (r *Reloader) normalize(inputFile, outputFile string) error {
+	b, err := os.ReadFile(inputFile)
 	if err != nil {
 		return errors.Wrap(err, "read file")
 	}
@@ -385,14 +385,14 @@ func (r *Reloader) normalize(input, output string) error {
 		return errors.Wrap(err, "expand environment variables")
 	}
 
-	tmpFile := output + ".tmp"
+	tmpFile := outputFile + ".tmp"
 	defer func() {
 		_ = os.Remove(tmpFile)
 	}()
 	if err := os.WriteFile(tmpFile, b, 0644); err != nil {
 		return errors.Wrap(err, "write file")
 	}
-	if err := os.Rename(tmpFile, output); err != nil {
+	if err := os.Rename(tmpFile, outputFile); err != nil {
 		return errors.Wrap(err, "rename file")
 	}
 	return nil