Merge pull request #5193 from innossh/f-aws-instance-security-groups-updates

provider/aws: Support additional changes to security groups of instance without forcing new

builtin/providers/aws/resource_aws_instance.go

@@ -107,7 +107,6 @@ func resourceAwsInstance() *schema.Resource {
 				Type:     schema.TypeSet,
 				Optional: true,
 				Computed: true,
-				ForceNew: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 				Set:      schema.HashString,
 			},
@@ -581,6 +580,28 @@ 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") {
 		var groups []*string
 		if v := d.Get("vpc_security_group_ids").(*schema.Set); v.Len() > 0 {