feat: Multi bucket support

.changeset/sharp-penguins-impress.md

@@ -0,0 +1,11 @@
+---
+'@aws-amplify/deployed-backend-client': minor
+'@aws-amplify/backend-output-schemas': minor
+'@aws-amplify/backend-output-storage': minor
+'@aws-amplify/backend-storage': minor
+'@aws-amplify/client-config': minor
+'@aws-amplify/plugin-types': minor
+'@aws-amplify/backend': minor
+---
+
+support adding more than one bucket

packages/backend-output-schemas/API.md

@@ -275,24 +275,29 @@ export const unifiedBackendOutputSchema: z.ZodObject<{
         payload: z.ZodObject<{
             bucketName: z.ZodString;
             storageRegion: z.ZodString;
+            buckets: z.ZodOptional<z.ZodString>;
         }, "strip", z.ZodTypeAny, {
             bucketName: string;
             storageRegion: string;
+            buckets?: string | undefined;
         }, {
             bucketName: string;
             storageRegion: string;
+            buckets?: string | undefined;
         }>;
     }, "strip", z.ZodTypeAny, {
         version: "1";
         payload: {
             bucketName: string;
             storageRegion: string;
+            buckets?: string | undefined;
         };
     }, {
         version: "1";
         payload: {
             bucketName: string;
             storageRegion: string;
+            buckets?: string | undefined;
         };
     }>]>>;
     "AWS::Amplify::Custom": z.ZodOptional<z.ZodDiscriminatedUnion<"version", [z.ZodObject<{
@@ -391,6 +396,7 @@ export const unifiedBackendOutputSchema: z.ZodObject<{
         payload: {
             bucketName: string;
             storageRegion: string;
+            buckets?: string | undefined;
         };
     } | undefined;
     "AWS::Amplify::Function"?: {
@@ -455,6 +461,7 @@ export const unifiedBackendOutputSchema: z.ZodObject<{
         payload: {
             bucketName: string;
             storageRegion: string;
+            buckets?: string | undefined;
         };
     } | undefined;
     "AWS::Amplify::Function"?: {
@@ -684,24 +691,29 @@ export const versionedStorageOutputSchema: z.ZodDiscriminatedUnion<"version", [z
     payload: z.ZodObject<{
         bucketName: z.ZodString;
         storageRegion: z.ZodString;
+        buckets: z.ZodOptional<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
         bucketName: string;
         storageRegion: string;
+        buckets?: string | undefined;
     }, {
         bucketName: string;
         storageRegion: string;
+        buckets?: string | undefined;
     }>;
 }, "strip", z.ZodTypeAny, {
     version: "1";
     payload: {
         bucketName: string;
         storageRegion: string;
+        buckets?: string | undefined;
     };
 }, {
     version: "1";
     payload: {
         bucketName: string;
         storageRegion: string;
+        buckets?: string | undefined;
     };
 }>]>;
 

packages/backend-output-schemas/src/storage/v1.ts

@@ -1,9 +1,16 @@
 import { z } from 'zod';
 
+const bucketSchema = z.object({
+  name: z.string(),
+  bucketName: z.string(),
+  storageRegion: z.string(),
+});
+
 export const storageOutputSchema = z.object({
   version: z.literal('1'),
   payload: z.object({
     bucketName: z.string(),
     storageRegion: z.string(),
+    buckets: z.string(z.array(bucketSchema)).optional(), // JSON serialized array of bucketSchema
   }),
 });

packages/backend-output-storage/API.md

@@ -8,6 +8,7 @@
 
 import { BackendOutputEntry } from '@aws-amplify/plugin-types';
 import { BackendOutputStorageStrategy } from '@aws-amplify/plugin-types';
+import { DeepPartial } from '@aws-amplify/plugin-types';
 import * as _os from 'os';
 import { PackageJsonReader } from '@aws-amplify/platform-core';
 import { Stack } from 'aws-cdk-lib';
@@ -37,7 +38,7 @@ export type Platform = 'Mac' | 'Windows' | 'Linux' | 'Other';
 export class StackMetadataBackendOutputStorageStrategy implements BackendOutputStorageStrategy<BackendOutputEntry> {
     constructor(stack: Stack);
     addBackendOutputEntry: (keyName: string, backendOutputEntry: BackendOutputEntry) => void;
-    appendToBackendOutputList: (keyName: string, backendOutputEntry: BackendOutputEntry) => void;
+    appendToBackendOutputList: (keyName: string, backendOutputEntry: DeepPartial<BackendOutputEntry>) => void;
 }
 
 // (No @packageDocumentation comment for this package)