Fix #17647 - AWS add tag to SG only if existing tag

This commit is contained in:
Jerome Touffe-Blin 2015-11-23 22:08:17 +11:00
parent 147b6911f5
commit 4a01539ded

View File

@ -1552,12 +1552,14 @@ func (s *AWSCloud) ensureSecurityGroup(name string, description string, vpcID st
tags = append(tags, tag) tags = append(tags, tag)
} }
tagRequest := &ec2.CreateTagsInput{} if len(tags) > 0 {
tagRequest.Resources = []*string{&groupID} tagRequest := &ec2.CreateTagsInput{}
tagRequest.Tags = tags tagRequest.Resources = []*string{&groupID}
if _, err := s.createTags(tagRequest); err != nil { tagRequest.Tags = tags
// Not clear how to recover fully from this; we're OK because we don't match on tags, but that is a little odd if _, err := s.createTags(tagRequest); err != nil {
return "", fmt.Errorf("error tagging security group: %v", err) // Not clear how to recover fully from this; we're OK because we don't match on tags, but that is a little odd
return "", fmt.Errorf("error tagging security group: %v", err)
}
} }
return groupID, nil return groupID, nil
} }