Merge pull request #4098 from mitchellh/newsession

aws-sdk: use session.NewSession

builder/amazon/chroot/builder.go

@@ -180,7 +180,10 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		return nil, err
 	}
 
-	session := session.New(config)
+	session, err := session.NewSession(config)
+	if err != nil {
+		return nil, err
+	}
 	ec2conn := ec2.New(session)
 
 	wrappedCommand := func(command string) (string, error) {

builder/amazon/common/access_config.go

@@ -45,7 +45,10 @@ func (c *AccessConfig) Config() (*aws.Config, error) {
 			return nil, err
 		}
 	} else {
-		sess := session.New(config)
+		session, err := session.NewSession(config)
+		if err != nil {
+			return nil, err
+		}
 		creds = credentials.NewChainCredentials([]credentials.Provider{
 			&credentials.StaticProvider{Value: credentials.Value{
 				AccessKeyID:     c.AccessKey,
@@ -55,7 +58,7 @@ func (c *AccessConfig) Config() (*aws.Config, error) {
 			&credentials.EnvProvider{},
 			&credentials.SharedCredentialsProvider{Filename: "", Profile: ""},
 			&ec2rolecreds.EC2RoleProvider{
-				Client: ec2metadata.New(sess),
+				Client: ec2metadata.New(session),
 			},
 		})
 	}

builder/amazon/common/artifact.go

@@ -73,8 +73,11 @@ func (a *Artifact) Destroy() error {
 			Credentials: a.Conn.Config.Credentials,
 			Region:      aws.String(region),
 		}
-		sess := session.New(regionConfig)
-		regionConn := ec2.New(sess)
+		session, err := session.NewSession(regionConfig)
+		if err != nil {
+			return err
+		}
+		regionConn := ec2.New(session)
 
 		input := &ec2.DeregisterImageInput{
 			ImageId: &imageId,

builder/amazon/common/cli_config.go

@@ -61,7 +61,11 @@ func (c *CLIConfig) CredentialsFromProfile(conf *aws.Config) (*credentials.Crede
 		return c.SourceCredentials, nil
 	}
 	srcCfg := aws.NewConfig().Copy(conf).WithCredentials(c.SourceCredentials)
-	svc := sts.New(session.New(), srcCfg)
+	session, err := session.NewSession(srcCfg)
+	if err != nil {
+		return nil, err
+	}
+	svc := sts.New(session)
 	res, err := svc.AssumeRole(c.AssumeRoleInput)
 	if err != nil {
 		return nil, err

builder/amazon/common/step_ami_region_copy.go

@@ -88,8 +88,11 @@ func amiRegionCopy(state multistep.StateBag, config *AccessConfig, name string,
 	}
 	awsConfig.Region = aws.String(target)
 
-	sess := session.New(awsConfig)
-	regionconn := ec2.New(sess)
+	session, err := session.NewSession(awsConfig)
+	if err != nil {
+		return "", err
+	}
+	regionconn := ec2.New(session)
 
 	resp, err := regionconn.CopyImage(&ec2.CopyImageInput{
 		SourceRegion:  &source,

builder/amazon/common/step_create_tags.go

@@ -40,7 +40,13 @@ func (s *StepCreateTags) Run(state multistep.StateBag) multistep.StepAction {
 				Credentials: ec2conn.Config.Credentials,
 				Region:      aws.String(region),
 			}
-			session := session.New(&awsConfig)
+			session, err := session.NewSession(&awsConfig)
+			if err != nil {
+				err := fmt.Errorf("Error creating AWS session: %s", err)
+				state.Put("error", err)
+				ui.Error(err.Error())
+				return multistep.ActionHalt
+			}
 
 			regionconn := ec2.New(session)
 

builder/amazon/common/step_modify_ami_attributes.go

@@ -93,7 +93,13 @@ func (s *StepModifyAMIAttributes) Run(state multistep.StateBag) multistep.StepAc
 			Credentials: ec2conn.Config.Credentials,
 			Region:      aws.String(region),
 		}
-		session := session.New(&awsConfig)
+		session, err := session.NewSession(&awsConfig)
+		if err != nil {
+			err := fmt.Errorf("Error creating AWS session: %s", err)
+			state.Put("error", err)
+			ui.Error(err.Error())
+			return multistep.ActionHalt
+		}
 		regionconn := ec2.New(session)
 		for name, input := range options {
 			ui.Message(fmt.Sprintf("Modifying: %s", name))

builder/amazon/ebs/builder.go

@@ -70,7 +70,10 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		return nil, err
 	}
 
-	session := session.New(config)
+	session, err := session.NewSession(config)
+	if err != nil {
+		return nil, err
+	}
 	ec2conn := ec2.New(session)
 
 	// If the subnet is specified but not the AZ, try to determine the AZ automatically

builder/amazon/ebs/builder_acc_test.go

@@ -206,7 +206,10 @@ func testEC2Conn() (*ec2.EC2, error) {
 		return nil, err
 	}
 
-	session := session.New(config)
+	session, err := session.NewSession(config)
+	if err != nil {
+		return nil, err
+	}
 	return ec2.New(session), nil
 }
 

builder/amazon/instance/builder.go

@@ -160,7 +160,10 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		return nil, err
 	}
 
-	session := session.New(config)
+	session, err := session.NewSession(config)
+	if err != nil {
+		return nil, err
+	}
 	ec2conn := ec2.New(session)
 
 	// If the subnet is specified but not the AZ, try to determine the AZ automatically

builder/docker/ecr_login.go

@@ -27,7 +27,10 @@ func (c *AwsAccessConfig) config(region string) (*aws.Config, error) {
 	var creds *credentials.Credentials
 
 	config := aws.NewConfig().WithRegion(region).WithMaxRetries(11)
-	sess := session.New(config)
+	session, err := session.NewSession(config)
+	if err != nil {
+		return nil, err
+	}
 	creds = credentials.NewChainCredentials([]credentials.Provider{
 		&credentials.StaticProvider{Value: credentials.Value{
 			AccessKeyID:     c.AccessKey,
@@ -37,7 +40,7 @@ func (c *AwsAccessConfig) config(region string) (*aws.Config, error) {
 		&credentials.EnvProvider{},
 		&credentials.SharedCredentialsProvider{Filename: "", Profile: ""},
 		&ec2rolecreds.EC2RoleProvider{
-			Client: ec2metadata.New(sess),
+			Client: ec2metadata.New(session),
 		},
 	})
 	return config.WithCredentials(creds), nil

post-processor/amazon-import/post-processor.go

@@ -124,7 +124,10 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac
 
 	// Set up the AWS session
 	log.Println("Creating AWS session")
-	session := session.New(config)
+	session, err := session.NewSession(config)
+	if err != nil {
+		return nil, false, err
+	}
 
 	// open the source file
 	log.Printf("Opening file %s to upload", source)