Unconditionally enable api termination when deleting aws_instance

.changelog/19277.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_instance: Correctly delete instance on destroy when `disable_api_termination` is `true`
+```

internal/service/ec2/ec2_instance.go

@@ -1506,16 +1506,14 @@ func resourceInstanceUpdate(d *schema.ResourceData, meta interface{}) error {
 			}
 
 			if err := modifyInstanceAttributeWithStopStart(conn, input); err != nil {
-				return fmt.Errorf("updating Ec2 Instance (%s) user data base64: %w", d.Id(), err)
+				return fmt.Errorf("updating EC2 Instance (%s) user data base64: %w", d.Id(), err)
 			}
 		}
 	}
 
 	if d.HasChange("disable_api_termination") && !d.IsNewResource() {
-		err := disableInstanceAPITermination(conn, d.Id(), d.Get("disable_api_termination").(bool))
-
-		if err != nil {
-			return fmt.Errorf("error modifying instance (%s) attribute (%s): %w", d.Id(), ec2.InstanceAttributeNameDisableApiTermination, err)
+		if err := disableInstanceAPITermination(conn, d.Id(), d.Get("disable_api_termination").(bool)); err != nil {
+			return err
 		}
 	}
 
@@ -1742,7 +1740,7 @@ func resourceInstanceUpdate(d *schema.ResourceData, meta interface{}) error {
 func resourceInstanceDelete(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*conns.AWSClient).EC2Conn
 
-	if err := disableInstanceAPITermination(conn, d.Id(), d.Get("disable_api_termination").(bool)); err != nil {
+	if err := disableInstanceAPITermination(conn, d.Id(), false); err != nil {
 		log.Printf("[WARN] attempting to terminate EC2 Instance (%s) despite error disabling API termination: %s", d.Id(), err)
 	}
 
@@ -1767,7 +1765,7 @@ func disableInstanceAPITermination(conn *ec2.EC2, id string, disableAPITerminati
 	}
 
 	if err != nil {
-		return fmt.Errorf("modifying EC2 Instance (%s) attribute: %w", id, err)
+		return fmt.Errorf("modifying EC2 Instance (%s) DisableApiTermination attribute: %w", id, err)
 	}
 
 	return nil

internal/service/ec2/ec2_instance_test.go

@@ -961,29 +961,11 @@ func TestAccEC2Instance_autoRecovery(t *testing.T) {
 	})
 }
 
-func TestAccEC2Instance_disableAPITermination(t *testing.T) {
+func TestAccEC2Instance_disableAPITerminationFinalFalse(t *testing.T) {
 	var v ec2.Instance
 	resourceName := "aws_instance.test"
 	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
 
-	checkDisableApiTermination := func(expected bool) resource.TestCheckFunc {
-		return func(*terraform.State) error {
-			conn := acctest.Provider.Meta().(*conns.AWSClient).EC2Conn
-			r, err := conn.DescribeInstanceAttribute(&ec2.DescribeInstanceAttributeInput{
-				InstanceId: v.InstanceId,
-				Attribute:  aws.String("disableApiTermination"),
-			})
-			if err != nil {
-				return err
-			}
-			got := *r.DisableApiTermination.Value
-			if got != expected {
-				return fmt.Errorf("expected: %t, got: %t", expected, got)
-			}
-			return nil
-		}
-	}
-
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { acctest.PreCheck(t) },
 		ErrorCheck:        acctest.ErrorCheck(t, ec2.EndpointsID),
@@ -994,7 +976,7 @@ func TestAccEC2Instance_disableAPITermination(t *testing.T) {
 				Config: testAccInstanceConfig_disableAPITermination(rName, true),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckInstanceExists(resourceName, &v),
-					checkDisableApiTermination(true),
+					resource.TestCheckResourceAttr(resourceName, "disable_api_termination", "true"),
 				),
 			},
 			{
@@ -1007,9 +989,37 @@ func TestAccEC2Instance_disableAPITermination(t *testing.T) {
 				Config: testAccInstanceConfig_disableAPITermination(rName, false),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckInstanceExists(resourceName, &v),
-					checkDisableApiTermination(false),
+					resource.TestCheckResourceAttr(resourceName, "disable_api_termination", "false"),
+				),
+			},
+		},
+	})
+}
+
+func TestAccEC2Instance_disableAPITerminationFinalTrue(t *testing.T) {
+	var v ec2.Instance
+	resourceName := "aws_instance.test"
+	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { acctest.PreCheck(t) },
+		ErrorCheck:        acctest.ErrorCheck(t, ec2.EndpointsID),
+		ProviderFactories: acctest.ProviderFactories,
+		CheckDestroy:      testAccCheckInstanceDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccInstanceConfig_disableAPITermination(rName, true),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckInstanceExists(resourceName, &v),
+					resource.TestCheckResourceAttr(resourceName, "disable_api_termination", "true"),
 				),
 			},
+			{
+				ResourceName:            resourceName,
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"user_data_replace_on_change"},
+			},
 		},
 	})
 }