Merge pull request #39696 from hashicorp/td-sweep-elbv2-truststore

sweeper/aws_lb_trust_store: Adds sweeper

internal/service/appstream/sweep.go

@@ -11,7 +11,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/appstream"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-provider-aws/internal/sweep"
-	"github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv1"
+	"github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
@@ -67,7 +67,7 @@ func sweepDirectoryConfigs(region string) error {
 		return !lastPage
 	})
 
-	if awsv1.SkipSweepError(err) {
+	if awsv2.SkipSweepError(err) {
 		log.Printf("[WARN] Skipping AppStream Directory Config sweep for %s: %s", region, err)
 		return nil
 	}
@@ -115,7 +115,7 @@ func sweepFleets(region string) error {
 		return !lastPage
 	})
 
-	if awsv1.SkipSweepError(err) {
+	if awsv2.SkipSweepError(err) {
 		log.Printf("[WARN] Skipping AppStream Fleet sweep for %s: %s", region, err)
 		return nil
 	}
@@ -163,7 +163,7 @@ func sweepImageBuilders(region string) error {
 		return !lastPage
 	})
 
-	if awsv1.SkipSweepError(err) {
+	if awsv2.SkipSweepError(err) {
 		log.Printf("[WARN] Skipping AppStream Image Builder sweep for %s: %s", region, err)
 		return nil
 	}
@@ -211,7 +211,7 @@ func sweepStacks(region string) error {
 		return !lastPage
 	})
 
-	if awsv1.SkipSweepError(err) {
+	if awsv2.SkipSweepError(err) {
 		log.Printf("[WARN] Skipping AppStream Stack sweep for %s: %s", region, err)
 		return nil
 	}

internal/service/autoscalingplans/sweep.go

@@ -11,7 +11,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/autoscalingplans"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-provider-aws/internal/sweep"
-	"github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv1"
+	"github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
@@ -53,7 +53,7 @@ func sweepScalingPlans(region string) error {
 		return !lastPage
 	})
 
-	if awsv1.SkipSweepError(err) {
+	if awsv2.SkipSweepError(err) {
 		log.Printf("[WARN] Skipping Auto Scaling Scaling Plan sweep for %s: %s", region, err)
 		return nil
 	}

internal/service/elbv2/sweep.go

@@ -4,14 +4,17 @@
 package elbv2
 
 import (
+	"context"
 	"fmt"
 	"log"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/sweep"
 	"github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2"
+	"github.com/hashicorp/terraform-provider-aws/internal/sweep/sdk"
 )
 
 func RegisterSweepers() {
@@ -37,6 +40,8 @@ func RegisterSweepers() {
 		Name: "aws_lb_listener",
 		F:    sweepListeners,
 	})
+
+	awsv2.Register("aws_lb_trust_store", sweepTrustStore)
 }
 
 func sweepLoadBalancers(region string) error {
@@ -176,3 +181,27 @@ func sweepListeners(region string) error {
 
 	return nil
 }
+
+func sweepTrustStore(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepable, error) {
+	conn := client.ELBV2Client(ctx)
+
+	var sweepResources []sweep.Sweepable
+	r := resourceTrustStore()
+
+	pages := elasticloadbalancingv2.NewDescribeTrustStoresPaginator(conn, &elasticloadbalancingv2.DescribeTrustStoresInput{})
+	for pages.HasMorePages() {
+		page, err := pages.NextPage(ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		for _, trustStore := range page.TrustStores {
+			d := r.Data(nil)
+			d.SetId(aws.ToString(trustStore.TrustStoreArn))
+
+			sweepResources = append(sweepResources, sdk.NewSweepResource(r, d, client))
+		}
+	}
+
+	return sweepResources, nil
+}

internal/service/iam/sweep.go

@@ -22,7 +22,6 @@ import (
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/errs"
 	"github.com/hashicorp/terraform-provider-aws/internal/sweep"
-	"github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv1"
 	"github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2"
 	"github.com/hashicorp/terraform-provider-aws/internal/sweep/sdk"
 	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
@@ -42,7 +41,7 @@ func RegisterSweepers() {
 		"aws_iam_role",
 	)
 
-	awsv1.Register("aws_iam_openid_connect_provider", sweepOpenIDConnectProvider)
+	awsv2.Register("aws_iam_openid_connect_provider", sweepOpenIDConnectProvider)
 
 	resource.AddTestSweepers("aws_iam_policy", &resource.Sweeper{
 		Name: "aws_iam_policy",
@@ -87,11 +86,11 @@ func RegisterSweepers() {
 		F: sweepRoles,
 	})
 
-	awsv1.Register("aws_iam_saml_provider", sweepSAMLProvider)
+	awsv2.Register("aws_iam_saml_provider", sweepSAMLProvider)
 
-	awsv1.Register("aws_iam_service_specific_credential", sweepServiceSpecificCredentials)
+	awsv2.Register("aws_iam_service_specific_credential", sweepServiceSpecificCredentials)
 
-	awsv1.Register("aws_iam_signing_certificate", sweepSigningCertificates)
+	awsv2.Register("aws_iam_signing_certificate", sweepSigningCertificates)
 
 	resource.AddTestSweepers("aws_iam_server_certificate", &resource.Sweeper{
 		Name: "aws_iam_server_certificate",

internal/service/sqs/sweep.go

@@ -9,11 +9,11 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/sqs"
 	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/sweep"
-	"github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv1"
+	"github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2"
 )
 
 func RegisterSweepers() {
-	awsv1.Register("aws_sqs_queue", sweepQueues,
+	awsv2.Register("aws_sqs_queue", sweepQueues,
 		"aws_autoscaling_group",
 		"aws_cloudwatch_event_rule",
 		"aws_elastic_beanstalk_environment",