Revert "feat: Multi bucket support" (#1837)

* Revert "feat: Multi bucket support (#1742)"

This reverts commit d8b43d2.

* add changeset

.changeset/eleven-crews-remain.md

@@ -0,0 +1,2 @@
+---
+---

packages/backend-output-schemas/API.md

@@ -275,29 +275,24 @@ 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<{
@@ -396,7 +391,6 @@ export const unifiedBackendOutputSchema: z.ZodObject<{
         payload: {
             bucketName: string;
             storageRegion: string;
-            buckets?: string | undefined;
         };
     } | undefined;
     "AWS::Amplify::Function"?: {
@@ -461,7 +455,6 @@ export const unifiedBackendOutputSchema: z.ZodObject<{
         payload: {
             bucketName: string;
             storageRegion: string;
-            buckets?: string | undefined;
         };
     } | undefined;
     "AWS::Amplify::Function"?: {
@@ -691,29 +684,24 @@ 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,16 +1,9 @@
 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,7 +8,6 @@
 
 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';
@@ -38,7 +37,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: DeepPartial<BackendOutputEntry>) => void;
+    appendToBackendOutputList: (keyName: string, backendOutputEntry: BackendOutputEntry) => void;
 }
 
 // (No @packageDocumentation comment for this package)

packages/backend-output-storage/src/stack_metadata_output_storage_strategy.test.ts

@@ -16,18 +16,17 @@ void describe('StackMetadataBackendOutputStorageStrategy', () => {
       outputStorage.addBackendOutputEntry('TestStorageOutput', {
         version: '1',
         payload: {
-          bucketName: 'test-bucket',
-          storageRegion: 'us-west-2',
+          something: 'special',
         },
       });
 
       const template = Template.fromStack(stack);
-      template.hasOutput('bucketName', { Value: 'test-bucket' });
+      template.hasOutput('something', { Value: 'special' });
       template.templateMatches({
         Metadata: {
           TestStorageOutput: {
             version: '1',
-            stackOutputs: ['bucketName', 'storageRegion'],
+            stackOutputs: ['something'],
           },
         },
       });
@@ -42,8 +41,7 @@ void describe('StackMetadataBackendOutputStorageStrategy', () => {
       outputStorage.addBackendOutputEntry('TestStorageOutput', {
         version: '44',
         payload: {
-          bucketName: 'test-bucket',
-          storageRegion: 'us-west-2',
+          something: 'special',
         },
       });
 
@@ -63,19 +61,17 @@ void describe('StackMetadataBackendOutputStorageStrategy', () => {
       outputStorage.appendToBackendOutputList('TestStorageOutput', {
         version: '1',
         payload: {
-          buckets: 'test-bucket',
+          something: 'special',
         },
       });
 
       const template = Template.fromStack(stack);
-      template.hasOutput('buckets', {
-        Value: JSON.stringify(['test-bucket']),
-      });
+      template.hasOutput('something', { Value: JSON.stringify(['special']) });
       template.templateMatches({
         Metadata: {
           TestStorageOutput: {
             version: '1',
-            stackOutputs: ['buckets'],
+            stackOutputs: ['something'],
           },
         },
       });
@@ -90,93 +86,57 @@ void describe('StackMetadataBackendOutputStorageStrategy', () => {
       outputStorage.appendToBackendOutputList('TestStorageOutput', {
         version: '1',
         payload: {
-          buckets: JSON.stringify({
-            name: 'test-bucket',
-            bucketName: 'test-bucket',
-            storageRegion: 'us-west-2',
-          }),
-        },
-      });
-      outputStorage.addBackendOutputEntry('TestStorageOutput', {
-        version: '1',
-        payload: {
-          bucketName: 'test-bucket-two',
-          storageRegion: 'us-west-2',
+          something: 'special',
         },
       });
       outputStorage.appendToBackendOutputList('TestStorageOutput', {
         version: '1',
         payload: {
-          buckets: JSON.stringify({
-            name: 'test-bucket-two',
-            bucketName: 'test-bucket-two',
-            storageRegion: 'us-west-2',
-          }),
+          something: 'otherSpecial',
         },
       });
       const template = Template.fromStack(stack);
-      template.hasOutput('buckets', {
-        Value: JSON.stringify([
-          '{"name":"test-bucket","bucketName":"test-bucket","storageRegion":"us-west-2"}',
-          '{"name":"test-bucket-two","bucketName":"test-bucket-two","storageRegion":"us-west-2"}',
-        ]),
+      template.hasOutput('something', {
+        Value: JSON.stringify(['special', 'otherSpecial']),
       });
       template.templateMatches({
         Metadata: {
           TestStorageOutput: {
             version: '1',
-            stackOutputs: ['buckets', 'bucketName', 'storageRegion'],
+            stackOutputs: ['something'],
           },
         },
       });
     });
 
-    void it('appends a cdk token to an existing list in stack output with two buckets', () => {
+    void it('appends a cdk token to an existing list in stack output', () => {
       const testToken = Token.asString('testToken');
       const app = new App();
       const stack = new Stack(app);
       const outputStorage = new StackMetadataBackendOutputStorageStrategy(
         stack
       );
-      outputStorage.addBackendOutputEntry('TestStorageOutput', {
-        version: '1',
-        payload: {
-          bucketName: testToken,
-          storageRegion: 'us-west-2',
-        },
-      });
       outputStorage.appendToBackendOutputList('TestStorageOutput', {
         version: '1',
         payload: {
-          buckets: JSON.stringify({
-            name: testToken,
-            bucketName: testToken,
-            storageRegion: 'us-west-2',
-          }),
+          something: 'special',
         },
       });
       outputStorage.appendToBackendOutputList('TestStorageOutput', {
         version: '1',
         payload: {
-          buckets: JSON.stringify({
-            name: 'test-bucket-two',
-            bucketName: 'test-bucket-two',
-            storageRegion: 'us-west-2',
-          }),
+          something: testToken,
         },
       });
       const template = Template.fromStack(stack);
-      template.hasOutput('buckets', {
-        Value: JSON.stringify([
-          '{"name":"testToken","bucketName":"testToken","storageRegion":"us-west-2"}',
-          '{"name":"test-bucket-two","bucketName":"test-bucket-two","storageRegion":"us-west-2"}',
-        ]),
+      template.hasOutput('something', {
+        Value: JSON.stringify(['special', 'testToken']),
       });
       template.templateMatches({
         Metadata: {
           TestStorageOutput: {
             version: '1',
-            stackOutputs: ['buckets', 'bucketName', 'storageRegion'],
+            stackOutputs: ['something'],
           },
         },
       });
@@ -191,7 +151,7 @@ void describe('StackMetadataBackendOutputStorageStrategy', () => {
       outputStorage.appendToBackendOutputList('TestStorageOutput', {
         version: '1',
         payload: {
-          buckets: 'test-bucket',
+          something: 'special',
         },
       });
 
@@ -200,8 +160,7 @@ void describe('StackMetadataBackendOutputStorageStrategy', () => {
           outputStorage.appendToBackendOutputList('TestStorageOutput', {
             version: '2',
             payload: {
-              bucketName: 'test-bucket',
-              storageRegion: 'us-west-2',
+              something: 'otherSpecial',
             },
           }),
         {