r/aws_cloudfront_origin_access_control: add sweeper

internal/service/cloudfront/list.go

@@ -108,3 +108,20 @@ func ListResponseHeadersPoliciesPages(conn *cloudfront.CloudFront, input *cloudf
 	}
 	return nil
 }
+
+func ListOriginAccessControlsPages(conn *cloudfront.CloudFront, input *cloudfront.ListOriginAccessControlsInput, fn func(*cloudfront.ListOriginAccessControlsOutput, bool) bool) error {
+	for {
+		output, err := conn.ListOriginAccessControls(input)
+		if err != nil {
+			return err
+		}
+
+		lastPage := aws.StringValue(output.OriginAccessControlList.NextMarker) == ""
+		if !fn(output, lastPage) || lastPage {
+			break
+		}
+
+		input.Marker = output.OriginAccessControlList.NextMarker
+	}
+	return nil
+}

internal/service/cloudfront/sweep.go

@@ -4,6 +4,7 @@
 package cloudfront
 
 import (
+	"context"
 	"fmt"
 	"log"
 
@@ -58,6 +59,14 @@ func init() {
 		F:    sweepMonitoringSubscriptions,
 	})
 
+	resource.AddTestSweepers("aws_cloudfront_origin_access_control", &resource.Sweeper{
+		Name: "aws_cloudfront_origin_access_control",
+		F:    sweepOriginAccessControls,
+		Dependencies: []string{
+			"aws_cloudfront_distribution",
+		},
+	})
+
 	resource.AddTestSweepers("aws_cloudfront_origin_request_policy", &resource.Sweeper{
 		Name: "aws_cloudfront_origin_request_policy",
 		F:    sweepOriginRequestPolicies,
@@ -640,3 +649,60 @@ func sweepResponseHeadersPolicies(region string) error {
 
 	return nil
 }
+
+func sweepOriginAccessControls(region string) error {
+	client, err := sweep.SharedRegionalSweepClient(region)
+	if err != nil {
+		return fmt.Errorf("error getting client: %s", err)
+	}
+	conn := client.(*conns.AWSClient).CloudFrontConn
+	input := &cloudfront.ListOriginAccessControlsInput{}
+	sweepResources := make([]*sweep.SweepResource, 0)
+
+	err = ListOriginAccessControlsPages(conn, input, func(page *cloudfront.ListOriginAccessControlsOutput, lastPage bool) bool {
+		if page == nil {
+			return !lastPage
+		}
+
+		for _, v := range page.OriginAccessControlList.Items {
+			id := aws.StringValue(v.Id)
+
+			output, err := findOriginAccessControlByID(context.Background(), conn, id)
+
+			if tfresource.NotFound(err) {
+				continue
+			}
+
+			if err != nil {
+				log.Printf("[WARN] %s", err)
+				continue
+			}
+
+			r := ResourceOriginAccessControl()
+			d := r.Data(nil)
+			d.SetId(id)
+			d.Set("etag", output.ETag)
+
+			sweepResources = append(sweepResources, sweep.NewSweepResource(r, d, client))
+		}
+
+		return !lastPage
+	})
+
+	if sweep.SkipSweepError(err) {
+		log.Printf("[WARN] Skipping CloudFront Origin Access Control sweep for %s: %s", region, err)
+		return nil
+	}
+
+	if err != nil {
+		return fmt.Errorf("error listing CloudFront Origin Access Controls (%s): %w", region, err)
+	}
+
+	err = sweep.SweepOrchestrator(sweepResources)
+
+	if err != nil {
+		return fmt.Errorf("error sweeping CloudFront Origin Access Controls (%s): %w", region, err)
+	}
+
+	return nil
+}