Merge pull request #44335 from hashicorp/b-sweep-athena-database

sweeper: aws_athena_database

Author: gdavison

internal/service/athena/sweep.go

@@ -29,10 +29,7 @@ func RegisterSweepers() {
 		},
 	})
 
-	resource.AddTestSweepers("aws_athena_database", &resource.Sweeper{
-		Name: "aws_athena_database",
-		F:    sweepDatabases,
-	})
+	awsv2.Register("aws_athena_database", sweepDatabases)
 
 	resource.AddTestSweepers("aws_athena_workgroup", &resource.Sweeper{
 		Name: "aws_athena_workgroup",
@@ -103,7 +100,7 @@ func sweepDataCatalogs(region string) error {
 			name := aws.ToString(v.CatalogName)
 
 			if name == "AwsDataCatalog" {
-				log.Printf("[INFO] Skipping Athena Data Catalog %s", name)
+				log.Printf("[INFO] Skipping Athena Data Catalog %q", name)
 				continue
 			}
 
@@ -124,27 +121,16 @@ func sweepDataCatalogs(region string) error {
 	return nil
 }
 
-func sweepDatabases(region string) error {
-	ctx := sweep.Context(region)
-	client, err := sweep.SharedRegionalSweepClient(ctx, region)
-	if err != nil {
-		return fmt.Errorf("getting client: %w", err)
-	}
+func sweepDatabases(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepable, error) {
 	conn := client.AthenaClient(ctx)
-	input := &athena.ListDataCatalogsInput{}
-	sweepResources := make([]sweep.Sweepable, 0)
+	var sweepResources []sweep.Sweepable
 
-	pages := athena.NewListDataCatalogsPaginator(conn, input)
+	input := athena.ListDataCatalogsInput{}
+	pages := athena.NewListDataCatalogsPaginator(conn, &input)
 	for pages.HasMorePages() {
 		page, err := pages.NextPage(ctx)
-
-		if awsv2.SkipSweepError(err) {
-			log.Printf("[WARN] Skipping Athena Database sweep for %s: %s", region, err)
-			return nil
-		}
-
 		if err != nil {
-			return fmt.Errorf("error listing Athena Data Catalogs (%s): %w", region, err)
+			return nil, err
 		}
 
 		for _, v := range page.DataCatalogsSummary {
@@ -158,7 +144,11 @@ func sweepDatabases(region string) error {
 				page, err := pages.NextPage(ctx)
 
 				if err != nil {
-					continue
+					tflog.Warn(ctx, "Skipping resource", map[string]any{
+						"error":        err.Error(),
+						"catalog_name": catalogName,
+					})
+					break
 				}
 
 				for _, v := range page.DatabaseList {
@@ -180,13 +170,7 @@ func sweepDatabases(region string) error {
 		}
 	}
 
-	err = sweep.SweepOrchestrator(ctx, sweepResources)
-
-	if err != nil {
-		return fmt.Errorf("error sweeping Athena Databases (%s): %w", region, err)
-	}
-
-	return nil
+	return sweepResources, nil
 }
 
 func sweepWorkGroups(region string) error {