builder/amazon: region copy must go before modify attributes

/cc @jmassara - This has to go before the modify attributes so that
the attributes are properly modified on all resulting AMIs.

builder/amazon/common/step_ami_region_copy.go

@@ -8,12 +8,12 @@ import (
 	"github.com/mitchellh/packer/packer"
 )
 
-type StepAMIRegionCopyAttributes struct {
+type StepAMIRegionCopy struct {
 	Regions []string
 	Tags    map[string]string
 }
 
-func (s *StepAMIRegionCopyAttributes) Run(state map[string]interface{}) multistep.StepAction {
+func (s *StepAMIRegionCopy) Run(state map[string]interface{}) multistep.StepAction {
 	ec2conn := state["ec2"].(*ec2.EC2)
 	ui := state["ui"].(packer.Ui)
 	amis := state["amis"].(map[string]string)
@@ -74,6 +74,6 @@ func (s *StepAMIRegionCopyAttributes) Run(state map[string]interface{}) multiste
 	return multistep.ActionContinue
 }
 
-func (s *StepAMIRegionCopyAttributes) Cleanup(state map[string]interface{}) {
+func (s *StepAMIRegionCopy) Cleanup(state map[string]interface{}) {
 	// No cleanup...
 }

builder/amazon/ebs/builder.go

@@ -130,16 +130,16 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		&common.StepProvision{},
 		&stepStopInstance{},
 		&stepCreateAMI{},
+		&awscommon.StepAMIRegionCopy{
+			Regions: b.config.AMIRegions,
+			Tags:    b.config.Tags,
+		},
 		&awscommon.StepCreateTags{Tags: b.config.Tags},
 		&awscommon.StepModifyAMIAttributes{
 			Description: b.config.AMIDescription,
 			Users:       b.config.AMIUsers,
 			Groups:      b.config.AMIGroups,
 		},
-		&awscommon.StepAMIRegionCopyAttributes{
-			Regions: b.config.AMIRegions,
-			Tags:    b.config.Tags,
-		},
 	}
 
 	// Run!

builder/amazon/instance/builder.go

@@ -211,6 +211,10 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 		&StepBundleVolume{},
 		&StepUploadBundle{},
 		&StepRegisterAMI{},
+		&awscommon.StepAMIRegionCopy{
+			Regions: b.config.AMIRegions,
+			Tags:    b.config.Tags,
+		},
 		&awscommon.StepCreateTags{Tags: b.config.Tags},
 		&awscommon.StepModifyAMIAttributes{
 			Description:  b.config.AMIDescription,
@@ -218,10 +222,6 @@ func (b *Builder) Run(ui packer.Ui, hook packer.Hook, cache packer.Cache) (packe
 			Groups:       b.config.AMIGroups,
 			ProductCodes: b.config.AMIProductCodes,
 		},
-		&awscommon.StepAMIRegionCopyAttributes{
-			Regions: b.config.AMIRegions,
-			Tags:    b.config.Tags,
-		},
 	}
 
 	// Run!