test: add test asserting partition is not empty

michaelhtm · michaelhtm · commit e61c6c6779f5 · 2025-07-30T16:07:56.000-07:00
diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,8 +1,8 @@
 ack_generate_info:
-  build_date: "2025-07-22T21:50:37Z"
-  build_hash: b2dc0f44e0b08f041de14c3944a5cc005ba97c8f
-  go_version: go1.24.5
-  version: v0.50.0
+  build_date: "2025-07-29T23:15:18Z"
+  build_hash: b3710e1809b937c18444149c91c7f1f3c47c407b
+  go_version: go1.24.4
+  version: v0.50.0-2-gb3710e1-dirty
 api_directory_checksum: 2108338a86d704419192e545c0bfb433bab8c836
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6
diff --git a/config/crd/bases/s3.services.k8s.aws_buckets.yaml b/config/crd/bases/s3.services.k8s.aws_buckets.yaml
@@ -1219,12 +1219,17 @@ spec:
                       OwnerAccountID is the AWS Account ID of the account that owns the
                       backend AWS service API resource.
                     type: string
+                  partition:
+                    description: Partition is the AWS partition in which the resource
+                      exists or will exist
+                    type: string
                   region:
                     description: Region is the AWS region in which the resource exists
                       or will exist.
                     type: string
                 required:
                 - ownerAccountID
+                - partition
                 - region
                 type: object
               conditions:
diff --git a/go.mod b/go.mod
@@ -94,3 +94,5 @@ require (
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
+
+replace github.com/aws-controllers-k8s/runtime => github.com/michaelhtm/ack-runtime v0.49.1-0.20250730215011-f7ca6ab251ea
diff --git a/go.sum b/go.sum
@@ -1,5 +1,3 @@
-github.com/aws-controllers-k8s/runtime v0.50.0 h1:6BXOBdnb+xw6uSMEDeALhTKc4veZR9NfXIsl5QJKZ8k=
-github.com/aws-controllers-k8s/runtime v0.50.0/go.mod h1:OkUJN+Ds799JLYZsMJrO2vDJ4snxUeHK2MgrQHbU+Qc=
 github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=
 github.com/aws/aws-sdk-go v1.49.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
 github.com/aws/aws-sdk-go-v2 v1.34.0 h1:9iyL+cjifckRGEVpRKZP3eIxVlL06Qk1Tk13vreaVQU=
@@ -117,6 +115,8 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/michaelhtm/ack-runtime v0.49.1-0.20250730215011-f7ca6ab251ea h1:hyMdoRxWLIS1ner6atIh2BeaKMxnRQhTXdzs2WDZBjs=
+github.com/michaelhtm/ack-runtime v0.49.1-0.20250730215011-f7ca6ab251ea/go.mod h1:OkUJN+Ds799JLYZsMJrO2vDJ4snxUeHK2MgrQHbU+Qc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
diff --git a/helm/crds/s3.services.k8s.aws_buckets.yaml b/helm/crds/s3.services.k8s.aws_buckets.yaml
@@ -1219,12 +1219,17 @@ spec:
                       OwnerAccountID is the AWS Account ID of the account that owns the
                       backend AWS service API resource.
                     type: string
+                  partition:
+                    description: Partition is the AWS partition in which the resource
+                      exists or will exist
+                    type: string
                   region:
                     description: Region is the AWS region in which the resource exists
                       or will exist.
                     type: string
                 required:
                 - ownerAccountID
+                - partition
                 - region
                 type: object
               conditions:
diff --git a/pkg/resource/bucket/hook.go b/pkg/resource/bucket/hook.go
@@ -15,7 +15,6 @@ package bucket
 
 import (
 	"context"
-	"fmt"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -29,19 +28,6 @@ import (
 	svcsdktypes "github.com/aws/aws-sdk-go-v2/service/s3/types"
 )
 
-// bucketARN returns the ARN of the S3 bucket with the given name.
-func bucketARN(bucketName string) string {
-	// TODO(a-hilaly): I know there could be other partitions, but I'm
-	// not sure how to determine at this level of abstraction. Probably
-	// something the SDK/runtime should handle. For now, we'll just use
-	// the `aws` partition.
-	//
-	// NOTE(a-hilaly): Other parts of ACK also use this default partition
-	// e.g the generated function `ARNFromName` also uses `aws` as the
-	// default partition.
-	return fmt.Sprintf("arn:aws:s3:::%s", bucketName)
-}
-
 var (
 	DefaultAccelerationStatus     = svcsdktypes.BucketAccelerateStatusSuspended
 	DefaultRequestPayer           = svcsdktypes.PayerBucketOwner
diff --git a/pkg/resource/bucket/identifiers.go b/pkg/resource/bucket/identifiers.go
diff --git a/pkg/resource/bucket/manager.go b/pkg/resource/bucket/manager.go
diff --git a/pkg/resource/bucket/manager_factory.go b/pkg/resource/bucket/manager_factory.go
diff --git a/pkg/resource/bucket/sdk.go b/pkg/resource/bucket/sdk.go
diff --git a/templates/hooks/bucket/sdk_read_many_post_set_output.go.tpl b/templates/hooks/bucket/sdk_read_many_post_set_output.go.tpl
@@ -3,5 +3,5 @@
 	}
 
 	// Set bucket ARN in the output
-	bucketARN := ackv1alpha1.AWSResourceName(bucketARN(*ko.Spec.Name))
+	bucketARN := ackv1alpha1.AWSResourceName(rm.ARNFromName(*ko.Spec.Name))
 	ko.Status.ACKResourceMetadata.ARN = &bucketARN
diff --git a/test/e2e/tests/test_bucket.py b/test/e2e/tests/test_bucket.py
@@ -24,7 +24,7 @@
 
 from acktest.resources import random_suffix_name
 from acktest.k8s import resource as k8s
-from acktest.aws.identity import get_region
+from acktest.aws.identity import get_region, get_account_id
 from acktest import adoption as adoption
 from acktest import tags as tags
 from e2e import service_marker, CRD_GROUP, CRD_VERSION, load_s3_resource
@@ -116,9 +116,9 @@ def basic_bucket(s3_client) -> Generator[Bucket, None, None]:
         assert k8s.get_resource_exists(bucket.ref)
         
         # assert bucket ARN is present in status
+        # hardcoding partition for now as the test infra is local
         bucket_k8s = bucket.resource_data = k8s.get_resource(bucket.ref)
-        assert "arn:aws:s3:::" + bucket.resource_name == bucket_k8s["status"]["ackResourceMetadata"]["arn"]
-
+        assert "arn:aws:s3:" + get_region() + ":" + get_account_id() + ":" + bucket.resource_name == bucket_k8s["status"]["ackResourceMetadata"]["arn"]
         exists = bucket_exists(s3_client, bucket)
         assert exists
     except:
@@ -344,4 +344,4 @@ def _update_assert_website(self, bucket: Bucket, s3_resource):
         latest = website
 
         assert desired["errorDocument"]["key"] == latest.error_document["Key"]
-        assert desired["indexDocument"]["suffix"] == latest.index_document["Suffix"]
+        assert desired["indexDocument"]["suffix"] == latest.index_document["Suffix"]

Original file line number	Diff line number	Diff line change
`@@ -94,3 +94,5 @@ require (`
`94`	`94`	`sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect`
`95`	`95`	`sigs.k8s.io/yaml v1.4.0 // indirect`
`96`	`96`	`)`
	`97`	`+`
	`98`	`+replace github.com/aws-controllers-k8s/runtime => github.com/michaelhtm/ack-runtime v0.49.1-0.20250730215011-f7ca6ab251ea`