1515package aws
1616
1717import (
18+ "context"
1819 "time"
1920
20- "github.com/aws/aws-sdk-go/aws"
21- "github.com/aws/aws-sdk-go/aws/client "
22- "github.com/aws/aws-sdk-go/aws /credentials"
23- "github.com/aws/aws-sdk-go/aws/session "
24- "github.com/aws/aws-sdk-go/service/ec2"
25- "github.com/aws/aws-sdk-go/service/iam"
26- "github.com/aws/aws-sdk-go/service/s3"
27- "github.com/aws/aws-sdk-go/service/sts"
21+ "github.com/aws/aws-sdk-go-v2 /aws"
22+ "github.com/aws/aws-sdk-go-v2/config "
23+ "github.com/aws/aws-sdk-go-v2 /credentials"
24+ "github.com/aws/aws-sdk-go-v2/service/ec2 "
25+ ec2types "github.com/aws/aws-sdk-go-v2 /service/ec2/types "
26+ "github.com/aws/aws-sdk-go-v2 /service/iam"
27+ "github.com/aws/aws-sdk-go-v2 /service/s3"
28+ "github.com/aws/aws-sdk-go-v2 /service/sts"
2829 "github.com/coreos/pkg/capnslog"
2930
3031 "github.com/coreos/coreos-assembler/mantle/platform"
@@ -57,11 +58,12 @@ type Options struct {
5758}
5859
5960type API struct {
60- session client.ConfigProvider
61- ec2 * ec2.EC2
62- iam * iam.IAM
63- s3 * s3.S3
64- opts * Options
61+ config aws.Config
62+ ec2 * ec2.Client
63+ iam * iam.Client
64+ s3 * s3.Client
65+ sts * sts.Client
66+ opts * Options
6567}
6668
6769// New creates a new AWS API wrapper. It uses credentials from any of the
@@ -71,28 +73,38 @@ type API struct {
7173// preflight check is recommended via api.PreflightCheck
7274// Note that this method may modify Options to update the AMI ID
7375func New (opts * Options ) (* API , error ) {
74- awsCfg := aws.Config {Region : aws .String (opts .Region )}
76+ ctx := context .Background ()
77+
78+ // Build configuration options
79+ configOpts := []func (* config.LoadOptions ) error {
80+ config .WithRegion (opts .Region ),
81+ }
82+
7583 if opts .AccessKeyID != "" {
76- awsCfg .Credentials = credentials .NewStaticCredentials (opts .AccessKeyID , opts .SecretKey , "" )
84+ configOpts = append (configOpts , config .WithCredentialsProvider (
85+ credentials .NewStaticCredentialsProvider (opts .AccessKeyID , opts .SecretKey , "" ),
86+ ))
7787 } else if opts .CredentialsFile != "" {
78- awsCfg .Credentials = credentials .NewSharedCredentials (opts .CredentialsFile , opts .Profile )
88+ configOpts = append (configOpts , config .WithSharedCredentialsFiles ([]string {opts .CredentialsFile }))
89+ if opts .Profile != "" {
90+ configOpts = append (configOpts , config .WithSharedConfigProfile (opts .Profile ))
91+ }
92+ } else if opts .Profile != "" {
93+ configOpts = append (configOpts , config .WithSharedConfigProfile (opts .Profile ))
7994 }
8095
81- sess , err := session .NewSessionWithOptions (session.Options {
82- SharedConfigState : session .SharedConfigEnable ,
83- Profile : opts .Profile ,
84- Config : awsCfg ,
85- })
96+ awsCfg , err := config .LoadDefaultConfig (ctx , configOpts ... )
8697 if err != nil {
8798 return nil , err
8899 }
89100
90101 api := & API {
91- session : sess ,
92- ec2 : ec2 .New (sess ),
93- iam : iam .New (sess ),
94- s3 : s3 .New (sess ),
95- opts : opts ,
102+ config : awsCfg ,
103+ ec2 : ec2 .NewFromConfig (awsCfg ),
104+ iam : iam .NewFromConfig (awsCfg ),
105+ s3 : s3 .NewFromConfig (awsCfg ),
106+ sts : sts .NewFromConfig (awsCfg ),
107+ opts : opts ,
96108 }
97109
98110 return api , nil
@@ -107,17 +119,17 @@ func (a *API) GC(gracePeriod time.Duration) error {
107119// PreflightCheck validates that the aws configuration provided has valid
108120// credentials
109121func (a * API ) PreflightCheck () error {
110- stsClient := sts . New ( a . session )
111- _ , err := stsClient . GetCallerIdentity (& sts.GetCallerIdentityInput {})
122+ ctx := context . Background ( )
123+ _ , err := a . sts . GetCallerIdentity (ctx , & sts.GetCallerIdentityInput {})
112124
113125 return err
114126}
115127
116- func tagSpecCreatedByMantle (name , resourceType string ) []* ec2 .TagSpecification {
117- return []* ec2 .TagSpecification {
128+ func tagSpecCreatedByMantle (name string , resourceType ec2types. ResourceType ) []ec2types .TagSpecification {
129+ return []ec2types .TagSpecification {
118130 {
119- ResourceType : aws . String ( resourceType ) ,
120- Tags : []* ec2 .Tag {
131+ ResourceType : resourceType ,
132+ Tags : []ec2types .Tag {
121133 {
122134 Key : aws .String ("CreatedBy" ),
123135 Value : aws .String ("mantle" ),
0 commit comments