Merge pull request crossplane-contrib#595 from ytsarev/s3-bucket-cann…

…ed-acls S3: BucketACL: Enable canned ACL support
gtn3010 · Mar 8, 2023 · 747b963 · 747b963
2 parents 3e8a8c0 + 5eca6df
commit 747b963
Show file tree

Hide file tree

Showing 17 changed files with 56 additions and 12 deletions.
diff --git a/apis/s3/v1beta1/zz_bucketacl_types.go b/apis/s3/v1beta1/zz_bucketacl_types.go
diff --git a/apis/s3/v1beta1/zz_generated.deepcopy.go b/apis/s3/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/s3/v1beta1/zz_generated_terraformed.go b/apis/s3/v1beta1/zz_generated_terraformed.go
diff --git a/config/s3/config.go b/config/s3/config.go
@@ -32,7 +32,9 @@ func Configure(p *config.Provider) {
 	})
 
 	p.AddResourceConfigurator("aws_s3_bucket_acl", func(r *config.Resource) {
-		config.MoveToStatus(r.TerraformResource, "acl")
+		r.LateInitializer = config.LateInitializer{
+			IgnoredFields: []string{"acl", "access_control_policy"},
+		}
 	})
 
 	p.AddResourceConfigurator("aws_s3_bucket_metrics", func(r *config.Resource) {

diff --git a/examples-generated/cloudfront/distribution.yaml b/examples-generated/cloudfront/distribution.yaml
@@ -130,6 +130,7 @@ metadata:
   name: b-acl
 spec:
   forProvider:
+    acl: private
     bucketSelector:
       matchLabels:
         testing.upbound.io/example-name: b

diff --git a/examples-generated/cloudwatch/metricstream.yaml b/examples-generated/cloudwatch/metricstream.yaml
@@ -125,6 +125,7 @@ metadata:
   name: bucket-acl
 spec:
   forProvider:
+    acl: private
     bucketSelector:
       matchLabels:
         testing.upbound.io/example-name: bucket

diff --git a/examples-generated/codepipeline/codepipeline.yaml b/examples-generated/codepipeline/codepipeline.yaml
@@ -132,6 +132,7 @@ metadata:
   name: codepipeline-bucket-acl
 spec:
   forProvider:
+    acl: private
     bucketSelector:
       matchLabels:
         testing.upbound.io/example-name: codepipeline_bucket

diff --git a/examples-generated/firehose/deliverystream.yaml b/examples-generated/firehose/deliverystream.yaml
@@ -127,6 +127,7 @@ metadata:
   name: bucket-acl
 spec:
   forProvider:
+    acl: private
     bucketSelector:
       matchLabels:
         testing.upbound.io/example-name: bucket

diff --git a/examples-generated/fsx/datarepositoryassociation.yaml b/examples-generated/fsx/datarepositoryassociation.yaml
@@ -72,6 +72,7 @@ metadata:
   name: example
 spec:
   forProvider:
+    acl: private
     bucketSelector:
       matchLabels:
         testing.upbound.io/example-name: example

diff --git a/examples-generated/kafka/cluster.yaml b/examples-generated/kafka/cluster.yaml
@@ -162,6 +162,7 @@ metadata:
   name: bucket-acl
 spec:
   forProvider:
+    acl: private
     bucketSelector:
       matchLabels:
         testing.upbound.io/example-name: bucket

diff --git a/examples-generated/s3/bucket.yaml b/examples-generated/s3/bucket.yaml
@@ -26,6 +26,7 @@ metadata:
   name: example
 spec:
   forProvider:
+    acl: private
     bucketSelector:
       matchLabels:
         testing.upbound.io/example-name: b

diff --git a/examples-generated/s3/bucketacl.yaml b/examples-generated/s3/bucketacl.yaml
@@ -8,6 +8,7 @@ metadata:
   name: example-bucket-acl
 spec:
   forProvider:
+    acl: private
     bucketSelector:
       matchLabels:
         testing.upbound.io/example-name: example

diff --git a/examples-generated/s3/bucketlogging.yaml b/examples-generated/s3/bucketlogging.yaml
@@ -59,6 +59,7 @@ metadata:
   name: example
 spec:
   forProvider:
+    acl: private
     bucketSelector:
       matchLabels:
         testing.upbound.io/example-name: example
@@ -76,6 +77,7 @@ metadata:
   name: log-bucket-acl
 spec:
   forProvider:
+    acl: log-delivery-write
     bucketSelector:
       matchLabels:
         testing.upbound.io/example-name: log_bucket

diff --git a/examples-generated/s3/bucketreplicationconfiguration.yaml b/examples-generated/s3/bucketreplicationconfiguration.yaml
@@ -165,6 +165,7 @@ metadata:
   name: source-bucket-acl
 spec:
   forProvider:
+    acl: private
     bucketSelector:
       matchLabels:
         testing.upbound.io/example-name: source

diff --git a/examples-generated/s3/bucketversioning.yaml b/examples-generated/s3/bucketversioning.yaml
@@ -42,6 +42,7 @@ metadata:
   name: example
 spec:
   forProvider:
+    acl: private
     bucketSelector:
       matchLabels:
         testing.upbound.io/example-name: example

diff --git a/examples/s3/bucketacl-canned.yaml b/examples/s3/bucketacl-canned.yaml
@@ -0,0 +1,27 @@
+apiVersion: s3.aws.upbound.io/v1beta1
+kind: BucketACL
+metadata:
+  annotations:
+    meta.upbound.io/example-id: s3/v1beta1/bucketacl-canned
+  name: example
+spec:
+  forProvider:
+    region: us-west-1
+    bucketSelector:
+      matchLabels:
+        testing.upbound.io/example-name: s3-canned
+    acl: private
+---
+apiVersion: s3.aws.upbound.io/v1beta1
+kind: Bucket
+metadata:
+  annotations:
+    meta.upbound.io/example-id: s3/v1beta1/bucketacl-canned
+  name: ${Rand.RFC1123Subdomain}-canned
+  labels:
+    testing.upbound.io/example-name: s3-canned
+spec:
+  forProvider:
+    region: us-west-1
+    tags:
+      Name: SampleBucketCannedAcl
diff --git a/package/crds/s3.aws.upbound.io_bucketacls.yaml b/package/crds/s3.aws.upbound.io_bucketacls.yaml
@@ -124,6 +124,9 @@ spec:
                       - owner
                       type: object
                     type: array
+                  acl:
+                    description: Canned ACL to apply to the bucket.
+                    type: string
                   bucket:
                     description: Name of the bucket.
                     type: string
@@ -409,9 +412,6 @@ spec:
                           type: array
                       type: object
                     type: array
-                  acl:
-                    description: Canned ACL to apply to the bucket.
-                    type: string
                   id:
                     description: The bucket, expected_bucket_owner (if configured),
                       and acl (if configured) separated by commas (,).