Merge pull request #24395 from jalavoy/main

Add Kafka support to IOT topic rules

.changelog/16087.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_iot_topic_rule: Add `http` and `error_action.http` arguments
+```

.changelog/19175.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_iot_topic_rule: Add `s3.canned_acl` and `error_action.s3.canned_acl` arguments
+```

.changelog/22337.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_iot_topic_rule: Add `timestream` and `error_action.timestream` arguments
+```

.changelog/24395.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_iot_topic_rule: Add `kafka` and `error_action.kafka` arguments
+```
+
+```release-note:new-resource
+aws_iot_topic_rule_destination
+```

internal/provider/provider.go

@@ -1548,6 +1548,7 @@ func Provider() *schema.Provider {
 			"aws_iot_thing_principal_attachment": iot.ResourceThingPrincipalAttachment(),
 			"aws_iot_thing_type":                 iot.ResourceThingType(),
 			"aws_iot_topic_rule":                 iot.ResourceTopicRule(),
+			"aws_iot_topic_rule_destination":     iot.ResourceTopicRuleDestination(),
 
 			"aws_msk_cluster":                  kafka.ResourceCluster(),
 			"aws_msk_configuration":            kafka.ResourceConfiguration(),

internal/service/ec2/sweep.go

@@ -208,6 +208,7 @@ func init() {
 			"aws_fsx_ontap_file_system",
 			"aws_fsx_openzfs_file_system",
 			"aws_fsx_windows_file_system",
+			"aws_iot_topic_rule_destination",
 			"aws_lambda_function",
 			"aws_lb",
 			"aws_memorydb_subnet_group",

internal/service/iot/find.go

@@ -1,6 +1,8 @@
 package iot
 
 import (
+	"context"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/iot"
 	"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
@@ -119,3 +121,105 @@ func FindThingGroupMembership(conn *iot.IoT, thingGroupName, thingName string) e
 
 	return nil
 }
+
+func FindTopicRuleByName(conn *iot.IoT, name string) (*iot.GetTopicRuleOutput, error) {
+	// GetTopicRule returns unhelpful errors such as
+	//	"An error occurred (UnauthorizedException) when calling the GetTopicRule operation: Access to topic rule 'xxxxxxxx' was denied"
+	// when querying for a rule that doesn't exist.
+	var rule *iot.TopicRuleListItem
+
+	err := conn.ListTopicRulesPages(&iot.ListTopicRulesInput{}, func(page *iot.ListTopicRulesOutput, lastPage bool) bool {
+		if page == nil {
+			return !lastPage
+		}
+
+		for _, v := range page.Rules {
+			if v == nil {
+				continue
+			}
+
+			if aws.StringValue(v.RuleName) == name {
+				rule = v
+
+				return false
+			}
+		}
+
+		return !lastPage
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	if rule == nil {
+		return nil, tfresource.NewEmptyResultError(name)
+	}
+
+	input := &iot.GetTopicRuleInput{
+		RuleName: aws.String(name),
+	}
+
+	output, err := conn.GetTopicRule(input)
+
+	if err != nil {
+		return nil, err
+	}
+
+	if output == nil {
+		return nil, tfresource.NewEmptyResultError(input)
+	}
+
+	return output, nil
+}
+
+func FindTopicRuleDestinationByARN(ctx context.Context, conn *iot.IoT, arn string) (*iot.TopicRuleDestination, error) {
+	// GetTopicRuleDestination returns unhelpful errors such as
+	//	"UnauthorizedException: Access to TopicRuleDestination 'arn:aws:iot:us-west-2:123456789012:ruledestination/vpc/f267138a-7383-4670-9e44-a7fe2f48af5e' was denied"
+	// when querying for a rule destination that doesn't exist.
+	var destination *iot.TopicRuleDestinationSummary
+
+	err := conn.ListTopicRuleDestinationsPages(&iot.ListTopicRuleDestinationsInput{}, func(page *iot.ListTopicRuleDestinationsOutput, lastPage bool) bool {
+		if page == nil {
+			return !lastPage
+		}
+
+		for _, v := range page.DestinationSummaries {
+			if v == nil {
+				continue
+			}
+
+			if aws.StringValue(v.Arn) == arn {
+				destination = v
+
+				return false
+			}
+		}
+
+		return !lastPage
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	if destination == nil {
+		return nil, tfresource.NewEmptyResultError(destination)
+	}
+
+	input := &iot.GetTopicRuleDestinationInput{
+		Arn: aws.String(arn),
+	}
+
+	output, err := conn.GetTopicRuleDestinationWithContext(ctx, input)
+
+	if err != nil {
+		return nil, err
+	}
+
+	if output == nil || output.TopicRuleDestination == nil {
+		return nil, tfresource.NewEmptyResultError(input)
+	}
+
+	return output.TopicRuleDestination, nil
+}

internal/service/iot/sweep.go

@@ -67,8 +67,14 @@ func init() {
 	})
 
 	resource.AddTestSweepers("aws_iot_topic_rule", &resource.Sweeper{
-		Name: "aws_iot_topic_rule",
-		F:    sweepTopicRules,
+		Name:         "aws_iot_topic_rule",
+		F:            sweepTopicRules,
+		Dependencies: []string{"aws_iot_topic_rule_destination"},
+	})
+
+	resource.AddTestSweepers("aws_iot_topic_rule_destination", &resource.Sweeper{
+		Name: "aws_iot_topic_rule_destination",
+		F:    sweepTopicRuleDestinations,
 	})
 }
 
@@ -523,3 +529,46 @@ func sweepThingGroups(region string) error {
 
 	return nil
 }
+
+func sweepTopicRuleDestinations(region string) error {
+	client, err := sweep.SharedRegionalSweepClient(region)
+	if err != nil {
+		return fmt.Errorf("error getting client: %w", err)
+	}
+	conn := client.(*conns.AWSClient).IoTConn
+	input := &iot.ListTopicRuleDestinationsInput{}
+	sweepResources := make([]*sweep.SweepResource, 0)
+
+	err = conn.ListTopicRuleDestinationsPages(input, func(page *iot.ListTopicRuleDestinationsOutput, lastPage bool) bool {
+		if page == nil {
+			return !lastPage
+		}
+
+		for _, v := range page.DestinationSummaries {
+			r := ResourceTopicRuleDestination()
+			d := r.Data(nil)
+			d.SetId(aws.StringValue(v.Arn))
+
+			sweepResources = append(sweepResources, sweep.NewSweepResource(r, d, client))
+		}
+
+		return !lastPage
+	})
+
+	if sweep.SkipSweepError(err) {
+		log.Printf("[WARN] Skipping IoT Topic Rule Destination sweep for %s: %s", region, err)
+		return nil
+	}
+
+	if err != nil {
+		return fmt.Errorf("error listing IoT Topic Rule Destinations (%s): %w", region, err)
+	}
+
+	err = sweep.SweepOrchestrator(sweepResources)
+
+	if err != nil {
+		return fmt.Errorf("error sweeping IoT Topic Rule Destinations (%s): %w", region, err)
+	}
+
+	return nil
+}