ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update comments

This commit is contained in:
clint shryock 2016-03-09 15:50:01 -06:00
parent 23c42cd6cf
commit f96ec46681
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/providers/aws/structure.go
View File

@ -329,6 +329,7 @@ func flattenSecurityGroups(list []*ec2.UserIdGroupPair, ownerId *string) []*ec2.
if g.UserId != nil && *g.UserId != "" && (ownerId == nil || *ownerId != *g.UserId) { if g.UserId != nil && *g.UserId != "" && (ownerId == nil || *ownerId != *g.UserId) {
userId = g.UserId userId = g.UserId
} }
// userid nil here for same vpc groups
vpc := g.GroupName == nil || *g.GroupName == "" vpc := g.GroupName == nil || *g.GroupName == ""
var id *string var id *string
@ -338,6 +339,9 @@ func flattenSecurityGroups(list []*ec2.UserIdGroupPair, ownerId *string) []*ec2.
id = g.GroupName id = g.GroupName
} }
// id is groupid for vpcs
// id is groupname for non vpc (classic)
if userId != nil { if userId != nil {
id = aws.String(*userId + "/" + *id) id = aws.String(*userId + "/" + *id)
} }