Revert "provider/aws: Support additional changes to security groups of instance without forcing new"
This commit is contained in:
parent
e0d489f086
commit
e9c4d4f6d5
|
@ -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 {
|
||||||
|
|
Loading…
Reference in New Issue