address ci findings

address ci findings

address ci findings

address ci findings

internal/service/controltower/control.go

@@ -83,14 +83,16 @@ func resourceControlRead(ctx context.Context, d *schema.ResourceData, meta inter
 	}
 
 	for _, c := range output.EnabledControls {
-		if *c.ControlIdentifier == d.Get("control_identifier") {
+		if aws.StringValue(c.ControlIdentifier) == d.Get("control_identifier") {
 			return nil
 		}
 	}
 
 	// control identifier not found in response
-	log.Printf("[WARN] ControlTower Control (%s) not found, removing from state", d.Id())
-	d.SetId("")
+	if !d.IsNewResource() {
+		log.Printf("[WARN] ControlTower Control (%s) not found, removing from state", d.Id())
+		d.SetId("")
+	}
 	return nil
 }
 

internal/service/controltower/control_test.go

@@ -7,7 +7,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/controltower"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
 	"github.com/hashicorp/terraform-provider-aws/internal/acctest"
+	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 )
 
 func TestAccControlTowerControl_basic(t *testing.T) {
@@ -21,6 +23,7 @@ func TestAccControlTowerControl_basic(t *testing.T) {
 			acctest.PreCheckControlTowerDeployed(t)
 		},
 		ErrorCheck:               acctest.ErrorCheck(t, controltower.EndpointsID),
+		CheckDestroy:             testAccCheckControlDisable,
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
 		Steps: []resource.TestStep{
 			{
@@ -37,18 +40,46 @@ func testAccControlConfig_basic(controlName string, ouName string) string {
 	return fmt.Sprintf(`
 data "aws_region" "current" {}
 
+data "aws_partition" "current" {}
+
 data "aws_organizations_organization" "test" {}
 
 data "aws_organizations_organizational_units" "test" {
   parent_id = data.aws_organizations_organization.test.roots[0].id
 }
 
 resource "aws_controltower_control" "test" {
-  control_identifier = "arn:aws:controltower:${data.aws_region.current.name}::control/%[1]s"
+  control_identifier = "arn:${data.aws_partition.current.partition}:controltower:${data.aws_region.current.name}::control/%[1]s"
   target_identifier = [
     for x in data.aws_organizations_organizational_units.test.children :
     x.arn if x.name == "%[2]s"
   ][0]
 }
 `, controlName, ouName)
 }
+
+func testAccCheckControlDisable(s *terraform.State) error {
+	for _, rs := range s.RootModule().Resources {
+		if rs.Type != "aws_controltower_control" {
+			continue
+		}
+		conn := acctest.Provider.Meta().(*conns.AWSClient).ControlTowerConn
+		input := &controltower.ListEnabledControlsInput{
+			TargetIdentifier: &rs.Primary.ID,
+		}
+
+		output, err := conn.ListEnabledControls(input)
+
+		if err != nil {
+			return err
+		}
+
+		for _, c := range output.EnabledControls {
+			if *c.ControlIdentifier == rs.Primary.Attributes["control_identifier"] {
+				return fmt.Errorf("ControlTower Control still enabled: %s", rs.Primary.ID)
+			}
+		}
+	}
+
+	return nil
+}

internal/service/controltower/wait.go

@@ -13,6 +13,7 @@ const (
 	controlTimeout = 60 * time.Minute
 )
 
+//nolint:unparam //linter is producing false positive
 func waitControl(ctx context.Context, conn *controltower.ControlTower, operation_identifier string) (*controltower.ControlOperation, error) {
 	stateConf := &resource.StateChangeConf{
 		Pending: []string{controltower.ControlOperationStatusInProgress},
@@ -21,7 +22,7 @@ func waitControl(ctx context.Context, conn *controltower.ControlTower, operation
 		Timeout: controlTimeout,
 	}
 
-	outputRaw, err := stateConf.WaitForState()
+	outputRaw, err := stateConf.WaitForStateContext(ctx)
 
 	if v, ok := outputRaw.(*controltower.ControlOperation); ok {
 		return v, err