Add instance shutdown behavior retrieval

hashicorp · Apr 17, 2021 · 7e76931 · 7e76931
1 parent 79da3dd
commit 7e76931
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/aws/resource_aws_instance.go b/aws/resource_aws_instance.go
@@ -273,6 +273,7 @@ func resourceAwsInstance() *schema.Resource {
 			"instance_initiated_shutdown_behavior": {
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 			},
 			"instance_state": {
 				Type:     schema.TypeString,
@@ -940,6 +941,11 @@ func resourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error {
 		return err
 	}
 
+	// Retrieve instance shutdown behavior
+	if err := readInstanceShutdownBehavior(d, conn); err != nil {
+		return err
+	}
+
 	if err := readBlockDevices(d, instance, conn); err != nil {
 		return err
 	}
@@ -2188,6 +2194,23 @@ func readSecurityGroups(d *schema.ResourceData, instance *ec2.Instance, conn *ec
 	return nil
 }
 
+func readInstanceShutdownBehavior(d *schema.ResourceData, conn *ec2.EC2) error {
+	out, err := conn.DescribeInstanceAttribute(&ec2.DescribeInstanceAttributeInput{
+		InstanceId: aws.String(d.Id()),
+		Attribute:  aws.String("instanceInitiatedShutdownBehavior"),
+	})
+
+	if err != nil {
+		return err
+	}
+
+	if err = d.Set("instance_initiated_shutdown_behavior", out.InstanceInitiatedShutdownBehavior.Value); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 func getAwsEc2InstancePasswordData(instanceID string, conn *ec2.EC2) (string, error) {
 	log.Printf("[INFO] Reading password data for instance %s", instanceID)
 

diff --git a/aws/resource_aws_instance_test.go b/aws/resource_aws_instance_test.go
@@ -258,6 +258,7 @@ func TestAccAWSInstance_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckInstanceExists(resourceName, &v),
 					testAccMatchResourceAttrRegionalARN(resourceName, "arn", "ec2", regexp.MustCompile(`instance/i-[a-z0-9]+`)),
+					resource.TestCheckResourceAttr(resourceName, "instance_initiated_shutdown_behavior", "stop"),
 				),
 			},
 			{