Remove deprecated session.New method

aws · Nov 21, 2019 · 289812a · 289812a
1 parent 5aa67e9
commit 289812a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/pkg/ec2metadata/client.go b/pkg/ec2metadata/client.go
@@ -25,7 +25,10 @@ type EC2Metadata interface {
 	Region() (string, error)
 }
 
-// NewEC2Metadata creates a new EC2Metadata object
+// New creates a new EC2Metadata object
 func New() EC2Metadata {
-	return ec2metadatasvc.New(session.New(), aws.NewConfig().WithMaxRetries(10))
+	awsSession := session.Must(session.NewSession(aws.NewConfig().
+		WithMaxRetries(10),
+	))
+	return ec2metadatasvc.New(awsSession)
 }
diff --git a/pkg/ec2metadatawrapper/ec2metadatawrapper.go b/pkg/ec2metadatawrapper/ec2metadatawrapper.go
@@ -1,4 +1,4 @@
-// package ecmetadatawrapper is used to retrieve data from EC2 IMDS
+// Package ec2metadatawrapper is used to retrieve data from EC2 IMDS
 package ec2metadatawrapper
 
 import (
@@ -32,10 +32,12 @@ type ec2MetadataClientImpl struct {
 // New creates an ec2metadata client to retrieve metadata
 func New(client HttpClient) EC2MetadataClient {
 	if client == nil {
-		return &ec2MetadataClientImpl{client: ec2metadata.New(session.New(), aws.NewConfig().WithMaxRetries(metadataRetries))}
-	} else {
-		return &ec2MetadataClientImpl{client: client}
+		awsSession := session.Must(session.NewSession(aws.NewConfig().
+			WithMaxRetries(metadataRetries),
+		))
+		return &ec2MetadataClientImpl{client: ec2metadata.New(awsSession)}
 	}
+	return &ec2MetadataClientImpl{client: client}
 }
 
 // InstanceIdentityDocument returns instance identity documents