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

Merge pull request #5571 from hashicorp/revert-5193-f-aws-instance-security-groups-updates 

Revert "provider/aws: Support additional changes to security groups of instance without forcing new"
This commit is contained in:
Paul Hinze 2016-03-10 15:09:16 -06:00
parent 7c58f145fd e9c4d4f6d5
commit 5ce68fd1bd
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
builtin/providers/aws/resource_aws_instance.go
View File

@ -107,6 +107,7 @@ func resourceAwsInstance() *schema.Resource {
Type: schema.TypeSet, Type: schema.TypeSet,
Optional: true, Optional: true,
Computed: true, Computed: true,
ForceNew: true,
Elem: &schema.Schema{Type: schema.TypeString}, Elem: &schema.Schema{Type: schema.TypeString},
Set: schema.HashString, Set: schema.HashString,
}, },
@ -580,28 +581,6 @@ func resourceAwsInstanceUpdate(d *schema.ResourceData, meta interface{}) error {
} }
} }
if d.HasChange("security_groups") {
var groupIds []*string
if v := d.Get("security_groups").(*schema.Set); v.Len() > 0 {
resp, err := conn.DescribeSecurityGroups(&ec2.DescribeSecurityGroupsInput{
GroupNames: expandStringList(v.List()),
})
if err != nil {
return err
}
for _, v := range resp.SecurityGroups {
groupIds = append(groupIds, aws.String(*v.GroupId))
}
}
_, err := conn.ModifyInstanceAttribute(&ec2.ModifyInstanceAttributeInput{
InstanceId: aws.String(d.Id()),
Groups: groupIds,
})
if err != nil {
return err
}
}
if d.HasChange("vpc_security_group_ids") { if d.HasChange("vpc_security_group_ids") {
var groups []*string var groups []*string
if v := d.Get("vpc_security_group_ids").(*schema.Set); v.Len() > 0 { if v := d.Get("vpc_security_group_ids").(*schema.Set); v.Len() > 0 {