Merge pull request #2644 from hashicorp/b-aws-sg-account-update
provider/aws: Fix issue in Classic env with external Security Groups
This commit is contained in:
commit
f2ff63d0da
|
@ -157,12 +157,15 @@ func expandIPPerms(
|
||||||
|
|
||||||
perm.UserIDGroupPairs[i] = &ec2.UserIDGroupPair{
|
perm.UserIDGroupPairs[i] = &ec2.UserIDGroupPair{
|
||||||
GroupID: aws.String(id),
|
GroupID: aws.String(id),
|
||||||
UserID: aws.String(ownerId),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ownerId != "" {
|
||||||
|
perm.UserIDGroupPairs[i].UserID = aws.String(ownerId)
|
||||||
|
}
|
||||||
|
|
||||||
if !vpc {
|
if !vpc {
|
||||||
perm.UserIDGroupPairs[i].GroupID = nil
|
perm.UserIDGroupPairs[i].GroupID = nil
|
||||||
perm.UserIDGroupPairs[i].GroupName = aws.String(id)
|
perm.UserIDGroupPairs[i].GroupName = aws.String(id)
|
||||||
perm.UserIDGroupPairs[i].UserID = nil
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue