fix: add default expectedBucketOwner to S3 config

aws-amplify · Aug 21, 2024 · 4d46cd8 · 4d46cd8
1 parent 9fe293d
commit 4d46cd8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/packages/core/src/singleton/Storage/types.ts b/packages/core/src/singleton/Storage/types.ts
@@ -12,11 +12,14 @@ export interface BucketInfo {
 	bucketName: string;
 	/** Region of the bucket */
 	region: string;
+	/** Expected owner of the bucket */
+	expectedBucketOwner?: string;
 }
 export interface S3ProviderConfig {
 	S3: {
 		bucket?: string;
 		region?: string;
+		expectedBucketOwner?: string;
 		/**
 		 * Internal-only configuration for testing purpose. You should not use this.
 		 *

diff --git a/packages/storage/src/providers/s3/utils/resolveS3ConfigAndInput.ts b/packages/storage/src/providers/s3/utils/resolveS3ConfigAndInput.ts
@@ -67,14 +67,15 @@ export const resolveS3ConfigAndInput = async (
 	const {
 		bucket: defaultBucket,
 		region: defaultRegion,
+		expectedBucketOwner: defaultBucketOwner,
 		dangerouslyConnectToHttpEndpointForTesting,
 		buckets,
 	} = amplify.getConfig()?.Storage?.S3 ?? {};
 
 	const {
 		bucket = defaultBucket,
 		region = defaultRegion,
-		expectedBucketOwner,
+		expectedBucketOwner = defaultBucketOwner,
 	} = (apiOptions?.bucket && resolveBucketConfig(apiOptions, buckets)) || {};
 
 	assertValidationError(!!bucket, StorageValidationErrorCode.NoBucket);