Revert refactoring of IMDS code

Author: Shreya Anil Naik

pkg/aws/cloud.go

@@ -43,10 +43,9 @@ type Cloud interface {
 
 // NewCloud constructs new Cloud implementation.
 func NewCloud(cfg CloudConfig, metricsRegisterer prometheus.Registerer) (Cloud, error) {
-	metadata := (services.EC2Metadata)(nil)
+	metadataSess := session.Must(session.NewSession(aws.NewConfig()))
+	metadata := services.NewEC2Metadata(metadataSess)
 	if len(cfg.VpcID) == 0 {
-		metadataSess := session.Must(session.NewSession(aws.NewConfig()))
-		metadata = services.NewEC2Metadata(metadataSess)
 		vpcId, err := metadata.VpcID()
 		if err != nil {
 			return nil, errors.Wrap(err, "failed to introspect vpcID from EC2Metadata, specify --aws-vpc-id instead if EC2Metadata is unavailable")
@@ -61,10 +60,6 @@ func NewCloud(cfg CloudConfig, metricsRegisterer prometheus.Registerer) (Cloud,
 		}
 
 		if region == ""{
-			if metadata  == nil {
-				metadataSess := session.Must(session.NewSession(aws.NewConfig()))
-				metadata = services.NewEC2Metadata(metadataSess)
-			}
 			err := (error)(nil)
 			region, err = metadata.Region()
 			if err != nil {