chore(deps): migrate to go aws sdk v2 (#2625)

Author: emosbaugh

cmd/installer/cli/restore.go

@@ -13,10 +13,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/s3"
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/config"
+	"github.com/aws/aws-sdk-go-v2/credentials"
+	"github.com/aws/aws-sdk-go-v2/service/s3"
 	k0sv1beta1 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
 	apitypes "github.com/replicatedhq/embedded-cluster/api/types"
 	"github.com/replicatedhq/embedded-cluster/cmd/installer/kotscli"
@@ -364,7 +364,7 @@ func runRestoreStepNew(ctx context.Context, appSlug, appTitle string, flags Inst
 
 	if !skipStoreValidation {
 		logrus.Debugf("validating backup store configuration")
-		if err := validateS3BackupStore(s3Store); err != nil {
+		if err := validateS3BackupStore(ctx, s3Store); err != nil {
 			return fmt.Errorf("unable to validate backup store: %w", err)
 		}
 	}
@@ -988,30 +988,35 @@ func promptForS3BackupStore(store *s3BackupStore) error {
 
 // validateS3BackupStore validates the S3 backup store configuration.
 // It tries to list objects in the bucket and prefix to ensure that the bucket exists and has backups.
-func validateS3BackupStore(s *s3BackupStore) error {
+func validateS3BackupStore(ctx context.Context, s *s3BackupStore) error {
 	u, err := url.Parse(s.endpoint)
 	if err != nil {
 		return fmt.Errorf("parse endpoint: %v", err)
 	}
 
 	isAWS := strings.HasSuffix(u.Hostname(), ".amazonaws.com")
-	sess, err := session.NewSession(&aws.Config{
-		Region:           aws.String(s.region),
-		Endpoint:         aws.String(s.endpoint),
-		Credentials:      credentials.NewStaticCredentials(s.accessKeyID, s.secretAccessKey, ""),
-		S3ForcePathStyle: aws.Bool(!isAWS),
-	})
+	creds := credentials.NewStaticCredentialsProvider(s.accessKeyID, s.secretAccessKey, "")
+
+	cfg, err := config.LoadDefaultConfig(ctx,
+		config.WithRegion(s.region),
+		config.WithCredentialsProvider(creds),
+	)
 	if err != nil {
-		return fmt.Errorf("create s3 session: %v", err)
+		return fmt.Errorf("load aws config: %v", err)
 	}
 
+	svc := s3.NewFromConfig(cfg, func(o *s3.Options) {
+		o.BaseEndpoint = aws.String(s.endpoint)
+		o.UsePathStyle = !isAWS
+	})
+
 	input := &s3.ListObjectsV2Input{
 		Bucket:    aws.String(s.bucket),
 		Delimiter: aws.String("/"),
 		Prefix:    aws.String(fmt.Sprintf("%s/", filepath.Join(s.prefix, "backups"))),
 	}
-	svc := s3.New(sess)
-	result, err := svc.ListObjectsV2(input)
+
+	result, err := svc.ListObjectsV2(ctx, input)
 	if err != nil {
 		return fmt.Errorf("list objects: %v", err)
 	}

go.mod

@@ -6,7 +6,6 @@ require (
 	github.com/AlecAivazis/survey/v2 v2.3.7
 	github.com/Masterminds/sprig/v3 v3.3.0
 	github.com/apparentlymart/go-cidr v1.1.0
-	github.com/aws/aws-sdk-go v1.55.7
 	github.com/aws/aws-sdk-go-v2 v1.37.1
 	github.com/aws/aws-sdk-go-v2/config v1.30.2
 	github.com/aws/aws-sdk-go-v2/credentials v1.18.2
@@ -95,6 +94,7 @@ require (
 	github.com/VividCortex/ewma v1.2.0 // indirect
 	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
 	github.com/ahmetalpbalkan/go-cursor v0.0.0-20131010032410-8136607ea412 // indirect
+	github.com/aws/aws-sdk-go v1.55.5 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.1 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.1 // indirect

go.sum

@@ -699,8 +699,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
-github.com/aws/aws-sdk-go v1.55.7 h1:UJrkFq7es5CShfBwlWAC8DA077vp8PyVbQd3lqLiztE=
-github.com/aws/aws-sdk-go v1.55.7/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
+github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU=
+github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
 github.com/aws/aws-sdk-go-v2 v1.37.1 h1:SMUxeNz3Z6nqGsXv0JuJXc8w5YMtrQMuIBmDx//bBDY=
 github.com/aws/aws-sdk-go-v2 v1.37.1/go.mod h1:9Q0OoGQoboYIAJyslFyF1f5K1Ryddop8gqMhWx/n4Wg=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 h1:6GMWV6CNpA/6fbFHnoAjrv4+LGfyTqZz2LtCHnspgDg=