go1.18 compatibility

Author: ahouene

backends/s3/credentials.go

@@ -1,7 +1,6 @@
 package s3
 
 import (
-	"errors"
 	"os"
 
 	"github.com/minio/minio-go/v7/pkg/credentials"
@@ -31,18 +30,22 @@ func (*K8sSecretProvider) IsExpired() bool {
 // Retrieve implements credentials.Provider.
 // It reads files pointed to by p.AccessKeyFilename and p.SecretKeyFilename.
 func (p *K8sSecretProvider) Retrieve() (value credentials.Value, err error) {
-	load := func(filename string, dst *string) {
-		b, err1 := os.ReadFile(filename)
-		if err1 != nil {
-			err = errors.Join(err, err1)
-			return
+	load := func(filename string, dst *string) error {
+		var b []byte
+		b, err = os.ReadFile(filename)
+		if err != nil {
+			return err
 		}
 
 		*dst = string(b)
+		return nil
 	}
 
-	load(p.AccessKeyFilename, &value.AccessKeyID)
-	load(p.SecretKeyFilename, &value.SecretAccessKey)
+	err = load(p.AccessKeyFilename, &value.AccessKeyID)
+	if err != nil {
+		return value, err
+	}
+	err = load(p.SecretKeyFilename, &value.SecretAccessKey)
 
 	return value, err
 }

backends/s3/s3testing/minio.go

@@ -38,7 +38,7 @@ func ServeMinio(ctx context.Context, dir string) (string, func() error, error) {
 	}
 
 	cmd := exec.CommandContext(ctx, cmdname, "server", "--quiet", "--address", addr, dir)
-	cmd.Env = append(cmd.Environ(), "MINIO_BROWSER=off")
+	cmd.Env = append(os.Environ(), "MINIO_BROWSER=off")
 	cmd.Env = append(cmd.Env, "MINIO_ROOT_USER="+AdminUserOrPassword, "MINIO_ROOT_PASSWORD="+AdminUserOrPassword)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr