Resolve storage output typing issues (#2696)

* created config v4

* update to 1.4

* add test and change zod schema

* changeset

* added storage section to custom outputs

* zod schema update

* updated storage test

* Potential fix for code scanning alert no. 339: Incorrect suffix check

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

* added section to custom outputs storage

* moved jsonschema to dev deps

* jsonschema dep

* update to paths finding

* update backwards compatibility test

* updated messaging

* hopefully fix outputs compatibility test

* final PR feedback

---------

Co-authored-by: Vieltojarvi <[email protected]>
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

Author: 3 people

.changeset/all-mugs-stop.md

@@ -0,0 +1,8 @@
+---
+'@aws-amplify/integration-tests': patch
+'@aws-amplify/backend': patch
+'@aws-amplify/seed': patch
+'@aws-amplify/backend-cli': patch
+---
+
+updated tests and changed client config to v1.4

.changeset/polite-cases-move.md

@@ -0,0 +1,6 @@
+---
+'@aws-amplify/backend-output-schemas': minor
+'@aws-amplify/client-config': minor
+---
+
+client config v1.4 and loosen zod typing for storage

package-lock.json

@@ -10,13 +10,14 @@ const storageAccessActionEnum = z.enum([
 
 const pathSchema = z.record(
   z.string(),
-  z.object({
-    guest: z.array(storageAccessActionEnum).optional(),
-    authenticated: z.array(storageAccessActionEnum).optional(),
-    groups: z.array(storageAccessActionEnum).optional(),
-    entity: z.array(storageAccessActionEnum).optional(),
-    resource: z.array(storageAccessActionEnum).optional(),
-  }),
+  z.intersection(
+    z.object({
+      guest: z.array(storageAccessActionEnum),
+      authenticated: z.array(storageAccessActionEnum),
+      resource: z.array(storageAccessActionEnum),
+    }),
+    z.record(z.string(), z.array(storageAccessActionEnum)),
+  ),
 );
 
 const bucketSchema = z.object({

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

@@ -196,7 +196,7 @@ void describe('Backend', () => {
     const backend = new BackendFactory({}, rootStack);
     const clientConfigPartial: DeepPartialAmplifyGeneratedConfigs<ClientConfig> =
       {
-        version: '1.3',
+        version: '1.4',
         custom: {
           someCustomOutput: 'someCustomOutputValue',
         },

packages/backend/src/backend_factory.test.ts

@@ -33,7 +33,7 @@ const rootStackTypeIdentifier = 'root';
 
 // Client config version that is used by `backend.addOutput()`
 const DEFAULT_CLIENT_CONFIG_VERSION_FOR_BACKEND_ADD_OUTPUT =
-  ClientConfigVersionOption.V1_3;
+  ClientConfigVersionOption.V1_4;
 
 /**
  * Factory that collects and instantiates all the Amplify backend constructs

packages/backend/src/backend_factory.ts

@@ -59,11 +59,11 @@ void describe('Custom outputs accumulator', () => {
     );
 
     const configPart1: DeepPartialAmplifyGeneratedConfigs<ClientConfig> = {
-      version: '1.3',
+      version: '1.4',
       custom: { output1: 'val1' },
     };
     const configPart2: DeepPartialAmplifyGeneratedConfigs<ClientConfig> = {
-      version: '1.3',
+      version: '1.4',
       custom: { output2: 'val2' },
     };
     accumulator.addOutput(configPart1);
@@ -115,7 +115,7 @@ void describe('Custom outputs accumulator', () => {
 
     assert.throws(
       () =>
-        accumulator.addOutput({ version: '1.3', custom: { output1: 'val1' } }),
+        accumulator.addOutput({ version: '1.4', custom: { output1: 'val1' } }),
       (error: AmplifyUserError) => {
         assert.strictEqual(
           error.message,

packages/backend/src/engine/custom_outputs_accumulator.test.ts

@@ -74,7 +74,7 @@ void describe('generate outputs command', () => {
     assert.equal(generateClientConfigMock.mock.callCount(), 1);
     assert.deepEqual(
       generateClientConfigMock.mock.calls[0].arguments[1],
-      '1.3', // default version
+      '1.4', // default version
     );
     assert.deepEqual(
       generateClientConfigMock.mock.calls[0].arguments[2],
@@ -95,7 +95,7 @@ void describe('generate outputs command', () => {
           namespace: 'app_id',
           type: 'branch',
         },
-        '1.3',
+        '1.4',
         '/foo/bar',
         undefined,
       ],
@@ -113,7 +113,7 @@ void describe('generate outputs command', () => {
         {
           stackName: 'stack_name',
         },
-        '1.3',
+        '1.4',
         '/foo/bar',
         undefined,
       ],
@@ -131,7 +131,7 @@ void describe('generate outputs command', () => {
         {
           stackName: 'stack_name',
         },
-        '1.3',
+        '1.4',
         'foo/bar',
         undefined,
       ],
@@ -149,7 +149,7 @@ void describe('generate outputs command', () => {
         {
           stackName: 'stack_name',
         },
-        '1.3',
+        '1.4',
         'foo/bar',
         ClientConfigFormat.DART,
       ],

packages/cli/src/commands/generate/outputs/generate_outputs_command.test.ts

@@ -328,15 +328,15 @@ void describe('sandbox command', () => {
     );
   });
 
-  void it('sandbox creates an empty client config file if one does not already exist for version 1.3', async (contextual) => {
+  void it('sandbox creates an empty client config file if one does not already exist for version 1.4', async (contextual) => {
     contextual.mock.method(fs, 'existsSync', () => false);
     const writeFileMock = contextual.mock.method(fsp, 'writeFile', () => true);
-    await commandRunner.runCommand('sandbox --outputs-version 1.3');
+    await commandRunner.runCommand('sandbox --outputs-version 1.4');
     assert.equal(sandboxStartMock.mock.callCount(), 1);
     assert.equal(writeFileMock.mock.callCount(), 1);
     assert.deepStrictEqual(
       writeFileMock.mock.calls[0].arguments[1],
-      `{\n  "version": "1.3"\n}`,
+      `{\n  "version": "1.4"\n}`,
     );
     assert.deepStrictEqual(
       writeFileMock.mock.calls[0].arguments[0],

packages/cli/src/commands/sandbox/sandbox_command.test.ts

@@ -24,7 +24,7 @@ void describe('sandbox_event_handler_factory', () => {
   } as unknown as ClientConfigGeneratorAdapter;
   const clientConfigLifecycleHandler = new ClientConfigLifecycleHandler(
     clientConfigGeneratorAdapterMock,
-    '1.3',
+    '1.4',
     'test-out',
     ClientConfigFormat.JSON,
   );
@@ -80,7 +80,7 @@ void describe('sandbox_event_handler_factory', () => {
         namespace: 'test',
         name: 'name',
       },
-      '1.3',
+      '1.4',
       'test-out',
       'json',
     ]);
@@ -192,7 +192,7 @@ void describe('sandbox_event_handler_factory', () => {
         namespace: 'test',
         name: 'name',
       },
-      '1.3',
+      '1.4',
       'test-out',
       'json',
     ]);