From 2a0b3cfdc254c720f0e6b53c628fd278477b3534 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 8 Aug 2013 22:46:22 -0700 Subject: [PATCH] builder/amazon/common: on modify AMI attributes, skip if no work /cc @jmassara --- builder/amazon/common/step_modify_attributes.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/builder/amazon/common/step_modify_attributes.go b/builder/amazon/common/step_modify_attributes.go index cba5c7e3b..94feaa482 100644 --- a/builder/amazon/common/step_modify_attributes.go +++ b/builder/amazon/common/step_modify_attributes.go @@ -20,6 +20,17 @@ func (s *StepModifyAttributes) Run(state map[string]interface{}) multistep.StepA amis := state["amis"].(map[string]string) ami := amis[ec2conn.Region.Name] + // Determine if there is any work to do. + valid := false + valid = valid || s.Description != "" + valid = valid || (s.Users != nil && len(s.Users) > 0) + valid = valid || (s.Groups != nil && len(s.Groups) > 0) + valid = valid || (s.ProductCodes != nil && len(s.ProductCodes) > 0) + + if !valid { + return multistep.ActionContinue + } + options := &ec2.ModifyImageAttribute{ Description: s.Description, AddUsers: s.Users,