Merge pull request #885 from rosstimson/ec2-upload-bundle

builder/amazon/instance: use --url flag rather than --location for ec2-upload-bundle

builder/amazon/instance/builder.go

@@ -74,7 +74,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
 			"-s {{.SecretKey}} " +
 			"-d {{.BundleDirectory}} " +
 			"--batch " +
-			"--location {{.Region}} " +
+			"--url https://s3-{{.Region}}.amazonaws.com " +
 			"--retry"
 	}
 

builder/amazon/instance/step_upload_bundle.go

@@ -32,18 +32,12 @@ func (s *StepUploadBundle) Run(state multistep.StateBag) multistep.StepAction {
 		return multistep.ActionHalt
 	}
 
-	// See GH-729 and http://goo.gl/rNZiCs
-	regionName := region.Name
-	if regionName == "us-east-1" {
-		regionName = "US"
-	}
-
 	config.BundleUploadCommand, err = config.tpl.Process(config.BundleUploadCommand, uploadCmdData{
 		AccessKey:       config.AccessKey,
 		BucketName:      config.S3Bucket,
 		BundleDirectory: config.BundleDestination,
 		ManifestPath:    manifestPath,
-		Region:          regionName,
+		Region:          region.Name,
 		SecretKey:       config.SecretKey,
 	})
 	if err != nil {

website/source/docs/builders/amazon-instance.html.markdown

@@ -277,7 +277,7 @@ sudo -n ec2-upload-bundle \
 	-s {{.SecretKey}} \
 	-d {{.BundleDirectory}} \
 	--batch \
-	--location {{.Region}} \
+	--url https://s3-{{.Region}}.amazonaws.com \
 	--retry
 ```