resource/aws_ssm_maintainance_window_target: Remove from state if del…

…eted (#16478) * remove from state if removed * Update aws/resource_aws_ssm_maintenance_window_target.go Co-authored-by: Kit Ewbank <Kit_Ewbank@hotmail.com> Co-authored-by: Kit Ewbank <Kit_Ewbank@hotmail.com>
hashicorp · Dec 2, 2020 · 7e2fb86 · 7e2fb86
1 parent 6cbf8f0
commit 7e2fb86
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 32 deletions.
diff --git a/aws/resource_aws_ssm_maintenance_window_target.go b/aws/resource_aws_ssm_maintenance_window_target.go
@@ -38,13 +38,10 @@ func resourceAwsSsmMaintenanceWindowTarget() *schema.Resource {
 			},
 
 			"resource_type": {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-				ValidateFunc: validation.StringInSlice([]string{
-					ssm.MaintenanceWindowResourceTypeInstance,
-					ssm.MaintenanceWindowResourceTypeResourceGroup,
-				}, true),
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validation.StringInSlice(ssm.MaintenanceWindowResourceType_Values(), true),
 			},
 
 			"targets": {
@@ -56,10 +53,15 @@ func resourceAwsSsmMaintenanceWindowTarget() *schema.Resource {
 						"key": {
 							Type:     schema.TypeString,
 							Required: true,
+							ValidateFunc: validation.All(
+								validation.StringMatch(regexp.MustCompile(`^[\p{L}\p{Z}\p{N}_.:/=\-@]*$|resource-groups:ResourceTypeFilters|resource-groups:Name$`), ""),
+								validation.StringLenBetween(1, 163),
+							),
 						},
 						"values": {
 							Type:     schema.TypeList,
 							Required: true,
+							MaxItems: 50,
 							Elem:     &schema.Schema{Type: schema.TypeString},
 						},
 					},
@@ -81,8 +83,9 @@ func resourceAwsSsmMaintenanceWindowTarget() *schema.Resource {
 			},
 
 			"owner_information": {
-				Type:     schema.TypeString,
-				Optional: true,
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validation.StringLenBetween(1, 128),
 			},
 		},
 	}
@@ -116,16 +119,17 @@ func resourceAwsSsmMaintenanceWindowTargetCreate(d *schema.ResourceData, meta in
 		return err
 	}
 
-	d.SetId(*resp.WindowTargetId)
+	d.SetId(aws.StringValue(resp.WindowTargetId))
 
 	return resourceAwsSsmMaintenanceWindowTargetRead(d, meta)
 }
 
 func resourceAwsSsmMaintenanceWindowTargetRead(d *schema.ResourceData, meta interface{}) error {
 	ssmconn := meta.(*AWSClient).ssmconn
 
+	windowID := d.Get("window_id").(string)
 	params := &ssm.DescribeMaintenanceWindowTargetsInput{
-		WindowId: aws.String(d.Get("window_id").(string)),
+		WindowId: aws.String(windowID),
 		Filters: []*ssm.MaintenanceWindowFilter{
 			{
 				Key:    aws.String("WindowTargetId"),
@@ -135,13 +139,18 @@ func resourceAwsSsmMaintenanceWindowTargetRead(d *schema.ResourceData, meta inte
 	}
 
 	resp, err := ssmconn.DescribeMaintenanceWindowTargets(params)
+	if isAWSErr(err, ssm.ErrCodeDoesNotExistException, "") {
+		log.Printf("[WARN] Maintenance Window (%s) Target (%s) not found, removing from state", windowID, d.Id())
+		d.SetId("")
+		return nil
+	}
 	if err != nil {
-		return err
+		return fmt.Errorf("Error getting Maintenance Window (%s) Target (%s): %w", windowID, d.Id(), err)
 	}
 
 	found := false
 	for _, t := range resp.Targets {
-		if *t.WindowTargetId == d.Id() {
+		if aws.StringValue(t.WindowTargetId) == d.Id() {
 			found = true
 
 			d.Set("owner_information", t.OwnerInformation)
@@ -151,7 +160,7 @@ func resourceAwsSsmMaintenanceWindowTargetRead(d *schema.ResourceData, meta inte
 			d.Set("description", t.Description)
 
 			if err := d.Set("targets", flattenAwsSsmTargets(t.Targets)); err != nil {
-				return fmt.Errorf("Error setting targets error: %#v", err)
+				return fmt.Errorf("Error setting targets: %w", err)
 			}
 		}
 	}
@@ -190,7 +199,7 @@ func resourceAwsSsmMaintenanceWindowTargetUpdate(d *schema.ResourceData, meta in
 
 	_, err := ssmconn.UpdateMaintenanceWindowTarget(params)
 	if err != nil {
-		return fmt.Errorf("error updating SSM Maintenance Window Target (%s): %s", d.Id(), err)
+		return fmt.Errorf("error updating SSM Maintenance Window Target (%s): %w", d.Id(), err)
 	}
 
 	return nil
@@ -207,8 +216,12 @@ func resourceAwsSsmMaintenanceWindowTargetDelete(d *schema.ResourceData, meta in
 	}
 
 	_, err := ssmconn.DeregisterTargetFromMaintenanceWindow(params)
+	if isAWSErr(err, ssm.ErrCodeDoesNotExistException, "") {
+		return nil
+	}
+
 	if err != nil {
-		return fmt.Errorf("error deregistering SSM Maintenance Window Target (%s): %s", d.Id(), err)
+		return fmt.Errorf("error deregistering SSM Maintenance Window Target (%s): %w", d.Id(), err)
 	}
 
 	return nil

diff --git a/aws/resource_aws_ssm_maintenance_window_target_test.go b/aws/resource_aws_ssm_maintenance_window_target_test.go
@@ -204,7 +204,28 @@ func TestAccAWSSSMMaintenanceWindowTarget_disappears(t *testing.T) {
 				Config: testAccAWSSSMMaintenanceWindowTargetBasicConfig(rName),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAWSSSMMaintenanceWindowTargetExists(resourceName, &maint),
-					testAccCheckAWSSSMMaintenanceWindowTargetDisappears(&maint),
+					testAccCheckResourceDisappears(testAccProvider, resourceAwsSsmMaintenanceWindowTarget(), resourceName),
+				),
+				ExpectNonEmptyPlan: true,
+			},
+		},
+	})
+}
+
+func TestAccAWSSSMMaintenanceWindowTarget_disappears_window(t *testing.T) {
+	var maint ssm.MaintenanceWindowTarget
+	rName := acctest.RandomWithPrefix("tf-acc-test")
+	resourceName := "aws_ssm_maintenance_window_target.test"
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAWSSSMMaintenanceWindowTargetDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAWSSSMMaintenanceWindowTargetBasicConfig(rName),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAWSSSMMaintenanceWindowTargetExists(resourceName, &maint),
+					testAccCheckResourceDisappears(testAccProvider, resourceAwsSsmMaintenanceWindow(), "aws_ssm_maintenance_window.test"),
 				),
 				ExpectNonEmptyPlan: true,
 			},
@@ -239,7 +260,7 @@ func testAccCheckAWSSSMMaintenanceWindowTargetExists(n string, mWindTarget *ssm.
 		}
 
 		for _, i := range resp.Targets {
-			if *i.WindowTargetId == rs.Primary.ID {
+			if aws.StringValue(i.WindowTargetId) == rs.Primary.ID {
 				*mWindTarget = *resp.Targets[0]
 				return nil
 			}
@@ -249,20 +270,6 @@ func testAccCheckAWSSSMMaintenanceWindowTargetExists(n string, mWindTarget *ssm.
 	}
 }
 
-func testAccCheckAWSSSMMaintenanceWindowTargetDisappears(mWindTarget *ssm.MaintenanceWindowTarget) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		conn := testAccProvider.Meta().(*AWSClient).ssmconn
-		input := &ssm.DeregisterTargetFromMaintenanceWindowInput{
-			WindowId:       mWindTarget.WindowId,
-			WindowTargetId: mWindTarget.WindowTargetId,
-		}
-
-		_, err := conn.DeregisterTargetFromMaintenanceWindow(input)
-
-		return err
-	}
-}
-
 func testAccCheckAWSSSMMaintenanceWindowTargetDestroy(s *terraform.State) error {
 	conn := testAccProvider.Meta().(*AWSClient).ssmconn