Merge pull request #2644 from hashicorp/b-aws-sg-account-update

provider/aws: Fix issue in Classic env with external Security Groups
hashicorp · Jul 8, 2015 · f2ff63d · f2ff63d
2 parents c2cf744 + cc79e6c
commit f2ff63d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/builtin/providers/aws/structure.go b/builtin/providers/aws/structure.go
@@ -157,12 +157,15 @@ func expandIPPerms(
 
 				perm.UserIDGroupPairs[i] = &ec2.UserIDGroupPair{
 					GroupID: aws.String(id),
-					UserID:  aws.String(ownerId),
 				}
+
+				if ownerId != "" {
+					perm.UserIDGroupPairs[i].UserID = aws.String(ownerId)
+				}
+
 				if !vpc {
 					perm.UserIDGroupPairs[i].GroupID = nil
 					perm.UserIDGroupPairs[i].GroupName = aws.String(id)
-					perm.UserIDGroupPairs[i].UserID = nil
 				}
 			}
 		}