Merge pull request #19294 from gijzelaerr/issue18206_aws_object_lambdas

Implement object lambda access points for S3
hashicorp · Nov 16, 2021 · 98a2575 · 98a2575
2 parents 29bc382 + 332f720
commit 98a2575
Show file tree

Hide file tree

Showing 23 changed files with 2,308 additions and 246 deletions.
diff --git a/.changelog/19294.txt b/.changelog/19294.txt
@@ -0,0 +1,23 @@
+```release-note:new-resource
+aws_s3control_object_lambda_access_point
+```
+
+```release-note:new-resource
+aws_s3control_object_lambda_access_point_policy
+```
+
+```release-note:new-resource
+aws_s3control_access_point_policy
+```
+
+```release-note:bug
+aws_s3_access_point: `vpc_configuration.vpc_id` is _ForceNew_
+```
+
+```release-note:enhancement
+aws_s3_access_point: Add `alias` attribute
+```
+
+```release-note:enhancement
+aws_s3_access_point: Add `endpoints` attribute
+```
diff --git a/internal/provider/provider.go b/internal/provider/provider.go
@@ -1481,13 +1481,16 @@ func Provider() *schema.Provider {
 			"aws_s3_bucket_public_access_block":               s3.ResourceBucketPublicAccessBlock(),
 			"aws_s3_object_copy":                              s3.ResourceObjectCopy(),
 
-			"aws_s3_access_point":                            s3control.ResourceAccessPoint(),
-			"aws_s3_account_public_access_block":             s3control.ResourceAccountPublicAccessBlock(),
-			"aws_s3control_bucket":                           s3control.ResourceBucket(),
-			"aws_s3control_bucket_lifecycle_configuration":   s3control.ResourceBucketLifecycleConfiguration(),
-			"aws_s3control_bucket_policy":                    s3control.ResourceBucketPolicy(),
-			"aws_s3control_multi_region_access_point":        s3control.ResourceMultiRegionAccessPoint(),
-			"aws_s3control_multi_region_access_point_policy": s3control.ResourceMultiRegionAccessPointPolicy(),
+			"aws_s3_access_point":                             s3control.ResourceAccessPoint(),
+			"aws_s3control_access_point_policy":               s3control.ResourceAccessPointPolicy(),
+			"aws_s3_account_public_access_block":              s3control.ResourceAccountPublicAccessBlock(),
+			"aws_s3control_bucket":                            s3control.ResourceBucket(),
+			"aws_s3control_bucket_lifecycle_configuration":    s3control.ResourceBucketLifecycleConfiguration(),
+			"aws_s3control_bucket_policy":                     s3control.ResourceBucketPolicy(),
+			"aws_s3control_multi_region_access_point":         s3control.ResourceMultiRegionAccessPoint(),
+			"aws_s3control_multi_region_access_point_policy":  s3control.ResourceMultiRegionAccessPointPolicy(),
+			"aws_s3control_object_lambda_access_point":        s3control.ResourceObjectLambdaAccessPoint(),
+			"aws_s3control_object_lambda_access_point_policy": s3control.ResourceObjectLambdaAccessPointPolicy(),
 
 			"aws_s3outposts_endpoint": s3outposts.ResourceEndpoint(),
 

diff --git a/internal/service/s3/sweep.go b/internal/service/s3/sweep.go
@@ -33,6 +33,7 @@ func init() {
 		Dependencies: []string{
 			"aws_s3_access_point",
 			"aws_s3_bucket_object",
+			"aws_s3control_multi_region_access_point",
 		},
 	})
 }