r/aws_launch_configuration: support security groups and user data for…

… import
hashicorp · Apr 9, 2018 · f9eac46 · f9eac46
1 parent dddc588
commit f9eac46
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/aws/import_aws_launch_configuration_test.go b/aws/import_aws_launch_configuration_test.go
@@ -22,7 +22,7 @@ func TestAccAWSLaunchConfiguration_importBasic(t *testing.T) {
 				ResourceName:            resourceName,
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"associate_public_ip_address", "user_data"},
+				ImportStateVerifyIgnore: []string{"associate_public_ip_address"},
 			},
 		},
 	})

diff --git a/aws/resource_aws_launch_configuration.go b/aws/resource_aws_launch_configuration.go
@@ -516,6 +516,7 @@ func resourceAwsLaunchConfigurationRead(d *schema.ResourceData, meta interface{}
 	}
 
 	lc := describConfs.LaunchConfigurations[0]
+	log.Printf("[DEBUG] launch configuration output: %s", lc)
 
 	d.Set("key_name", lc.KeyName)
 	d.Set("image_id", lc.ImageId)
@@ -526,11 +527,18 @@ func resourceAwsLaunchConfigurationRead(d *schema.ResourceData, meta interface{}
 	d.Set("ebs_optimized", lc.EbsOptimized)
 	d.Set("spot_price", lc.SpotPrice)
 	d.Set("enable_monitoring", lc.InstanceMonitoring.Enabled)
-	d.Set("security_groups", lc.SecurityGroups)
 	d.Set("associate_public_ip_address", lc.AssociatePublicIpAddress)
+	if err := d.Set("security_groups", flattenStringList(lc.SecurityGroups)); err != nil {
+		return fmt.Errorf("error setting security_groups: %s", err)
+	}
+	if aws.StringValue(lc.UserData) != "" {
+		d.Set("user_data", userDataHashSum(*lc.UserData))
+	}
 
 	d.Set("vpc_classic_link_id", lc.ClassicLinkVPCId)
-	d.Set("vpc_classic_link_security_groups", lc.ClassicLinkVPCSecurityGroups)
+	if err := d.Set("vpc_classic_link_security_groups", flattenStringList(lc.ClassicLinkVPCSecurityGroups)); err != nil {
+		return fmt.Errorf("error setting vpc_classic_link_security_groups: %s", err)
+	}
 
 	if err := readLCBlockDevices(d, lc, ec2conn); err != nil {
 		return err

diff --git a/aws/resource_aws_launch_configuration_test.go b/aws/resource_aws_launch_configuration_test.go
@@ -194,6 +194,11 @@ func TestAccAWSLaunchConfiguration_withVpcClassicLink(t *testing.T) {
 					testAccCheckAWSSecurityGroupExists("aws_security_group.foo", &group),
 				),
 			},
+			{
+				ResourceName:      "aws_launch_configuration.foo",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }