Merge pull request #37130 from hashicorp/s-fixes

Sweeper fixes

.changelog/37130.txt

@@ -0,0 +1,4 @@
+
+```release-note:enhancement
+resource/aws_cloudwatch_event_target: Add `force_destroy` argument
+```

internal/service/events/rule.go

@@ -251,7 +251,7 @@ func resourceRuleUpdate(ctx context.Context, d *schema.ResourceData, meta interf
 	var diags diag.Diagnostics
 	conn := meta.(*conns.AWSClient).EventsClient(ctx)
 
-	if d.HasChangesExcept("tags", "tags_all") {
+	if d.HasChangesExcept("tags", "tags_all", "force_destroy") {
 		_, ruleName, err := ruleParseResourceID(d.Id())
 		if err != nil {
 			return sdkdiag.AppendFromErr(diags, err)
@@ -282,15 +282,14 @@ func resourceRuleDelete(ctx context.Context, d *schema.ResourceData, meta interf
 		Name: aws.String(ruleName),
 	}
 
-	forceDestroy := d.Get("force_destroy").(bool)
-	if forceDestroy {
-		input.Force = forceDestroy
-	}
-
 	if eventBusName != "" {
 		input.EventBusName = aws.String(eventBusName)
 	}
 
+	if v, ok := d.GetOk("force_destroy"); ok {
+		input.Force = v.(bool)
+	}
+
 	const (
 		timeout = 5 * time.Minute
 	)

internal/service/events/sweep.go

@@ -279,6 +279,7 @@ func sweepRules(region string) error {
 					r := resourceRule()
 					d := r.Data(nil)
 					d.SetId(ruleCreateResourceID(eventBusName, ruleName))
+					d.Set("force_destroy", true)
 
 					sweepResources = append(sweepResources, sweep.NewSweepResource(r, d, client))
 				}
@@ -357,6 +358,7 @@ func sweepTargets(region string) error {
 							d := r.Data(nil)
 							d.SetId(targetCreateResourceID(eventBusName, ruleName, targetID))
 							d.Set("event_bus_name", eventBusName)
+							d.Set("force_destroy", true)
 							d.Set("rule", ruleName)
 							d.Set("target_id", targetID)
 

internal/service/events/target.go

@@ -254,6 +254,11 @@ func resourceTarget() *schema.Resource {
 				ValidateFunc: validBusNameOrARN,
 				Default:      DefaultEventBusName,
 			},
+			"force_destroy": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+			},
 			"http_target": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -541,6 +546,7 @@ func resourceTargetRead(ctx context.Context, d *schema.ResourceData, meta interf
 
 	d.Set("arn", target.Arn)
 	d.Set("event_bus_name", eventBusName)
+	d.Set("force_destroy", d.Get("force_destroy").(bool))
 	d.Set("input", target.Input)
 	d.Set("input_path", target.InputPath)
 	d.Set("role_arn", target.RoleArn)
@@ -621,16 +627,18 @@ func resourceTargetUpdate(ctx context.Context, d *schema.ResourceData, meta inte
 	var diags diag.Diagnostics
 	conn := meta.(*conns.AWSClient).EventsClient(ctx)
 
-	input := expandPutTargetsInput(ctx, d)
+	if d.HasChangesExcept("force_destroy") {
+		input := expandPutTargetsInput(ctx, d)
 
-	output, err := conn.PutTargets(ctx, input)
+		output, err := conn.PutTargets(ctx, input)
 
-	if err == nil && output != nil {
-		err = putTargetsError(output.FailedEntries)
-	}
+		if err == nil && output != nil {
+			err = putTargetsError(output.FailedEntries)
+		}
 
-	if err != nil {
-		return sdkdiag.AppendErrorf(diags, "updating EventBridge Target (%s): %s", d.Id(), err)
+		if err != nil {
+			return sdkdiag.AppendErrorf(diags, "updating EventBridge Target (%s): %s", d.Id(), err)
+		}
 	}
 
 	return append(diags, resourceTargetRead(ctx, d, meta)...)
@@ -649,6 +657,10 @@ func resourceTargetDelete(ctx context.Context, d *schema.ResourceData, meta inte
 		input.EventBusName = aws.String(v.(string))
 	}
 
+	if v, ok := d.GetOk("force_destroy"); ok {
+		input.Force = v.(bool)
+	}
+
 	log.Printf("[DEBUG] Deleting EventBridge Target: %s", d.Id())
 	output, err := conn.RemoveTargets(ctx, input)