Support Directory Buckets (#205)

Issue #, if available: aws-controllers-k8s/community#2658: Support S3 Express directory buckets.

Description of changes:
Updates changes from previous [PR](#204) by @Itai-Melamed

- Add e2e test for validating creation, updating put fields, tagging, and deletion for directory buckets
- Fix issue applying bucket policy to directory bucket due to ConfirmRemoveSelfBucketAccess not being supported for directory buckets

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Author: knottnt

.gitignore

@@ -2,6 +2,7 @@
 *.swp
 *~
 .idea
+.vscode
 /docs/site
 bin
 build

ATTRIBUTION.md

@@ -24,6 +24,7 @@ License version 2.0, we include the full text of the package's License below.
 * `github.com/aws/aws-sdk-go`
 * `github.com/aws/aws-sdk-go-v2`
 * `github.com/aws/aws-sdk-go-v2/service/s3`
+* `github.com/aws/aws-sdk-go-v2/service/s3control`
 * `github.com/aws/smithy-go`
 * `github.com/go-logr/logr`
 * `github.com/pkg/errors`
@@ -1691,7 +1692,10 @@ License Identifier: Apache-2.0
 
 Subdependencies:
 * `github.com/aws/smithy-go`
-* `github.com/jmespath/go-jmespath`
+
+#### github.com/aws/smithy-go
+
+License Identifier: Apache-2.0
 
 ### github.com/aws/aws-sdk-go-v2/service/s3
 
@@ -1709,7 +1713,9 @@ Subdependencies:
 * `github.com/aws/aws-sdk-go-v2/service/internal/s3shared`
 * `github.com/aws/smithy-go`
 
+#### github.com/aws/aws-sdk-go-v2
 
+License Identifier: Apache-2.0
 
 #### github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream
 
@@ -1735,6 +1741,17 @@ License Identifier: Apache-2.0
 
 License Identifier: Apache-2.0
 
+### github.com/aws/aws-sdk-go-v2/service/s3control
+
+License Identifier: Apache-2.0
+
+Subdependencies:
+* `github.com/aws/aws-sdk-go-v2`
+* `github.com/aws/aws-sdk-go-v2/internal/configsources`
+* `github.com/aws/aws-sdk-go-v2/internal/endpoints/v2`
+* `github.com/aws/aws-sdk-go-v2/service/internal/s3shared`
+* `github.com/aws/smithy-go`
+
 
 
 

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2026-01-07T18:48:15Z"
+  build_date: "2026-01-14T10:41:47Z"
   build_hash: e743d683160cf0f58a4864e052cdcb0927335ca7
   go_version: go1.25.5
   version: v0.57.0
-api_directory_checksum: 2108338a86d704419192e545c0bfb433bab8c836
+api_directory_checksum: 8a79c5d90ef817140c340896677c51d4d61b1aec
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6
 generator_config_info:
-  file_checksum: 00a96da29786586c7a3a59666d5546468e616b48
+  file_checksum: 9d5be04dbe64f87f04bbad86fb082d702a42b030
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/generator.yaml

@@ -12,8 +12,6 @@ ignore:
     - "VersioningConfiguration.MFADelete"
     # This subfield struct has no members...
     - "NotificationConfiguration.EventBridgeConfiguration"
-    - CreateBucketInput.CreateBucketConfiguration.Location
-    - CreateBucketInput.CreateBucketConfiguration.Bucket
     - LoggingEnabled.TargetObjectKeyFormat
 resources:
   Bucket:
@@ -36,6 +34,10 @@ resources:
         from:
           operation: PutBucketCors
           path: CORSConfiguration
+      CreateBucketConfiguration.Bucket.Type:
+        go_tag: json:"type,omitempty"
+      CreateBucketConfiguration.Location.Type:
+        go_tag: json:"type,omitempty"
       Encryption:
         from:
           operation: PutBucketEncryption
@@ -115,6 +117,8 @@ resources:
         template_path: hooks/bucket/sdk_read_many_post_set_output.go.tpl
       sdk_create_post_build_request:
         template_path: hooks/bucket/sdk_create_post_build_request.go.tpl
+    find_operation:
+      custom_method_name: customFindBucket
     update_operation:
       custom_method_name: customUpdateBucket
     renames:

apis/v1alpha1/types.go

@@ -171,6 +171,34 @@ spec:
               createBucketConfiguration:
                 description: The configuration information for the bucket.
                 properties:
+                  bucket:
+                    description: |-
+                      Specifies the information about the bucket that will be created. For more
+                      information about directory buckets, see Directory buckets (https://docs.aws.amazon.com/AmazonS3/latest/userguide/directory-buckets-overview.html)
+                      in the Amazon S3 User Guide.
+
+                      This functionality is only supported by directory buckets.
+                    properties:
+                      dataRedundancy:
+                        type: string
+                      type:
+                        type: string
+                    type: object
+                  location:
+                    description: |-
+                      Specifies the location where the bucket will be created.
+
+                      For directory buckets, the location type is Availability Zone or Local Zone.
+                      For more information about directory buckets, see Directory buckets (https://docs.aws.amazon.com/AmazonS3/latest/userguide/directory-buckets-overview.html)
+                      in the Amazon S3 User Guide.
+
+                      This functionality is only supported by directory buckets.
+                    properties:
+                      name:
+                        type: string
+                      type:
+                        type: string
+                    type: object
                   locationConstraint:
                     type: string
                 type: object

apis/v1alpha1/zz_generated.deepcopy.go

@@ -6,7 +6,8 @@
       "Effect": "Allow",
       "Action": [
         "s3:*",
-        "s3-object-lambda:*"
+        "s3-object-lambda:*",
+        "s3express:*"
       ],
       "Resource": "*"
     },

config/crd/bases/s3.services.k8s.aws_buckets.yaml

@@ -12,8 +12,6 @@ ignore:
     - "VersioningConfiguration.MFADelete"
     # This subfield struct has no members...
     - "NotificationConfiguration.EventBridgeConfiguration"
-    - CreateBucketInput.CreateBucketConfiguration.Location
-    - CreateBucketInput.CreateBucketConfiguration.Bucket
     - LoggingEnabled.TargetObjectKeyFormat
 resources:
   Bucket:
@@ -36,6 +34,10 @@ resources:
         from:
           operation: PutBucketCors
           path: CORSConfiguration
+      CreateBucketConfiguration.Bucket.Type:
+        go_tag: json:"type,omitempty"
+      CreateBucketConfiguration.Location.Type:
+        go_tag: json:"type,omitempty"
       Encryption:
         from:
           operation: PutBucketEncryption
@@ -115,6 +117,8 @@ resources:
         template_path: hooks/bucket/sdk_read_many_post_set_output.go.tpl
       sdk_create_post_build_request:
         template_path: hooks/bucket/sdk_create_post_build_request.go.tpl
+    find_operation:
+      custom_method_name: customFindBucket
     update_operation:
       custom_method_name: customUpdateBucket
     renames:

config/iam/recommended-inline-policy

@@ -7,9 +7,10 @@ toolchain go1.24.1
 require (
 	github.com/aws-controllers-k8s/runtime v0.57.0
 	github.com/aws/aws-sdk-go v1.49.0
-	github.com/aws/aws-sdk-go-v2 v1.34.0
+	github.com/aws/aws-sdk-go-v2 v1.36.6
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.74.1
-	github.com/aws/smithy-go v1.22.2
+	github.com/aws/aws-sdk-go-v2/service/s3control v1.60.1
+	github.com/aws/smithy-go v1.22.4
 	github.com/go-logr/logr v1.4.2
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/pflag v1.0.5
@@ -25,14 +26,14 @@ require (
 	github.com/aws/aws-sdk-go-v2/config v1.28.6 // indirect
 	github.com/aws/aws-sdk-go-v2/credentials v1.17.47 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.29 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.29 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.37 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.37 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.29 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.3 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.10 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.10 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.18 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sso v1.24.7 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.33.2 // indirect