Upgrade to AWS SDK v2 (exoscale#3)

Author: falzm

go.mod

@@ -3,7 +3,11 @@ module github.com/exoscale/packer-plugin-exoscale
 go 1.15
 
 require (
-	github.com/aws/aws-sdk-go v1.36.5
+	github.com/aws/aws-sdk-go-v2 v1.2.1
+	github.com/aws/aws-sdk-go-v2/config v1.1.2
+	github.com/aws/aws-sdk-go-v2/credentials v1.1.2
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.0.3
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.2.1
 	github.com/deepmap/oapi-codegen v1.5.1 // indirect
 	github.com/exoscale/egoscale v0.43.1
 	github.com/gofrs/uuid v4.0.0+incompatible // indirect

go.sum

@@ -5,6 +5,10 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
+	awsconfig "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"
 	"github.com/exoscale/egoscale"
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	"github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps"
@@ -27,6 +31,7 @@ type PostProcessor struct {
 	config *Config
 	runner multistep.Runner
 	exo    *egoscale.Client
+	sos    *s3.Client
 }
 
 func (p *PostProcessor) Configure(raws ...interface{}) error {
@@ -53,9 +58,35 @@ func (p *PostProcessor) PostProcess(ctx context.Context, ui packer.Ui, a packer.
 
 	p.exo = egoscale.NewClient(p.config.APIEndpoint, p.config.APIKey, p.config.APISecret)
 
+	cfg, err := awsconfig.LoadDefaultConfig(
+		ctx,
+		awsconfig.WithRegion(p.config.TemplateZone),
+
+		awsconfig.WithEndpointResolver(aws.EndpointResolverFunc(
+			func(service, region string) (aws.Endpoint, error) {
+				return aws.Endpoint{
+					URL:           p.config.SOSEndpoint,
+					SigningRegion: p.config.TemplateZone,
+				}, nil
+			})),
+
+		awsconfig.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(
+			p.config.APIKey,
+			p.config.APISecret,
+			"")),
+	)
+	if err != nil {
+		return nil, false, false, fmt.Errorf("unable to initialize SOS client: %s", err)
+	}
+
+	p.sos = s3.NewFromConfig(cfg, func(o *s3.Options) {
+		o.UsePathStyle = true
+	})
+
 	state := new(multistep.BasicStateBag)
 	state.Put("config", p.config)
 	state.Put("exo", p.exo)
+	state.Put("sos", p.sos)
 	state.Put("ui", ui)
 	state.Put("artifact", a)
 

post-processor/exoscale-import/post-processor.go

@@ -5,10 +5,8 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"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/service/s3"
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	"github.com/hashicorp/packer-plugin-sdk/packer"
 )
@@ -19,6 +17,7 @@ func (s *stepDeleteImage) Run(ctx context.Context, state multistep.StateBag) mul
 	var (
 		ui       = state.Get("ui").(packer.Ui)
 		config   = state.Get("config").(*Config)
+		sos      = state.Get("sos").(*s3.Client)
 		artifact = state.Get("artifact").(packer.Artifact)
 
 		imageFile  = artifact.Files()[0]
@@ -31,20 +30,11 @@ func (s *stepDeleteImage) Run(ctx context.Context, state multistep.StateBag) mul
 
 	ui.Say("Deleting uploaded template image")
 
-	sess, err := session.NewSessionWithOptions(session.Options{Config: aws.Config{
-		Region:      aws.String(config.TemplateZone),
-		Endpoint:    aws.String(config.SOSEndpoint),
-		Credentials: credentials.NewStaticCredentials(config.APIKey, config.APISecret, "")}})
-	if err != nil {
-		ui.Error(fmt.Sprintf("unable to initialize session: %v", err))
-		return multistep.ActionHalt
-	}
-
-	svc := s3.New(sess)
-	if _, err := svc.DeleteObject(&s3.DeleteObjectInput{
-		Bucket: aws.String(config.ImageBucket),
-		Key:    aws.String(bucketFile),
-	}); err != nil {
+	if _, err := sos.DeleteObject(ctx,
+		&s3.DeleteObjectInput{
+			Bucket: aws.String(config.ImageBucket),
+			Key:    aws.String(bucketFile),
+		}); err != nil {
 		ui.Error(fmt.Sprintf("unable to delete template image: %v", err))
 		return multistep.ActionHalt
 	}

post-processor/exoscale-import/step_delete_image.go

@@ -9,10 +9,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"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/s3manager"
+	"github.com/aws/aws-sdk-go-v2/aws"
+	s3manager "github.com/aws/aws-sdk-go-v2/feature/s3/manager"
+	"github.com/aws/aws-sdk-go-v2/service/s3"
+	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	"github.com/hashicorp/packer-plugin-sdk/packer"
 )
@@ -58,23 +58,16 @@ func (s *stepUploadImage) Run(ctx context.Context, state multistep.StateBag) mul
 		return multistep.ActionHalt
 	}
 
-	sess, err := session.NewSessionWithOptions(session.Options{Config: aws.Config{
-		Region:      aws.String(config.TemplateZone),
-		Endpoint:    aws.String(config.SOSEndpoint),
-		Credentials: credentials.NewStaticCredentials(config.APIKey, config.APISecret, "")}})
-	if err != nil {
-		ui.Error(fmt.Sprintf("unable to initialize session: %v", err))
-		return multistep.ActionHalt
-	}
-
-	uploader := s3manager.NewUploader(sess)
-	output, err := uploader.UploadWithContext(ctx, &s3manager.UploadInput{
-		Body:       pf,
-		Bucket:     aws.String(config.ImageBucket),
-		Key:        aws.String(bucketFile),
-		ContentMD5: aws.String(base64.StdEncoding.EncodeToString(hash.Sum(nil))),
-		ACL:        aws.String("public-read"),
-	})
+	output, err := s3manager.
+		NewUploader(state.Get("sos").(*s3.Client)).
+		Upload(ctx,
+			&s3.PutObjectInput{
+				Bucket:     aws.String(config.ImageBucket),
+				Key:        aws.String(bucketFile),
+				Body:       pf,
+				ContentMD5: aws.String(base64.StdEncoding.EncodeToString(hash.Sum(nil))),
+				ACL:        s3types.ObjectCannedACLPublicRead,
+			})
 	if err != nil {
 		ui.Error(fmt.Sprintf("unable to upload template image: %v", err))
 		return multistep.ActionHalt