feat: storage category codegen

.eslint-dictionary.json

@@ -21,6 +21,7 @@
   "amplifymeta",
   "amplifyrc",
   "amplifytools",
+  "ampx",
   "ansi",
   "apigateway",
   "apigw",
@@ -434,6 +435,7 @@
   "venv",
   "verificationbucket",
   "versioned",
+  "versioning",
   "vert",
   "virtualenv",
   "vpc",

packages/amplify-gen1-codegen-auth-adapter/src/auth_render_adapter.test.ts

@@ -175,6 +175,144 @@ void describe('auth codegen', () => {
         });
       });
     });
+    void it('contains oidc login if OIDC identityProvider type is passed', () => {
+      const result = getAuthDefinition({
+        userPool: {},
+        identityProvidersDetails: [
+          { ProviderType: IdentityProviderTypeType.OIDC, ProviderName: 'OIDC_1', ProviderDetails: { oidc_issuer: 'https://example.com' } },
+          { ProviderType: IdentityProviderTypeType.OIDC, ProviderName: 'OIDC_2', ProviderDetails: { oidc_issuer: 'https://example.com' } },
+        ],
+      });
+      assert(result.loginOptions?.oidcLogin);
+    });
+    void it('contains SAML login if SAML identityProvider type is passed', () => {
+      const result = getAuthDefinition({
+        userPool: {},
+        identityProvidersDetails: [
+          {
+            ProviderType: IdentityProviderTypeType.SAML,
+            ProviderName: 'SAML_1',
+            ProviderDetails: { metadataContent: 'https://example.com' },
+          },
+        ],
+      });
+      assert(result.loginOptions?.samlLogin);
+    });
+  });
+  void describe('OIDC and SAML providers', () => {
+    void describe('OIDC', () => {
+      void it('contains name and issuerUrl if OIDC identityProviderDetails is passed', () => {
+        const result = getAuthDefinition({
+          userPool: {},
+          identityProvidersDetails: [
+            {
+              ProviderType: IdentityProviderTypeType.OIDC,
+              ProviderName: 'OIDC_1',
+              ProviderDetails: {
+                oidc_issuer: 'https://example.com',
+                authorize_url: 'https://example.com',
+                token_url: 'https://example.com',
+                attributes_url: 'https://example.com',
+                jwks_uri: 'https://example.com',
+              },
+            },
+            {
+              ProviderType: IdentityProviderTypeType.OIDC,
+              ProviderName: 'OIDC_2',
+              ProviderDetails: { oidc_issuer: 'https://example.com' },
+            },
+          ],
+        });
+        assert.deepEqual(result.loginOptions?.oidcLogin, [
+          {
+            endpoints: {
+              authorization: 'https://example.com',
+              token: 'https://example.com',
+              userInfo: 'https://example.com',
+              jwksUri: 'https://example.com',
+            },
+            issuerUrl: 'https://example.com',
+            name: 'OIDC_1',
+          },
+          { issuerUrl: 'https://example.com', name: 'OIDC_2' },
+        ]);
+      });
+      void it('contains attributeMapping if AttributeMapping is passed', () => {
+        const result = getAuthDefinition({
+          userPool: {},
+          identityProvidersDetails: [
+            {
+              ProviderType: IdentityProviderTypeType.OIDC,
+              ProviderName: 'OIDC_1',
+              ProviderDetails: { oidc_issuer: 'https://example.com' },
+              AttributeMapping: { name: 'name', phone_number: 'phone_number' },
+            },
+            {
+              ProviderType: IdentityProviderTypeType.OIDC,
+              ProviderName: 'OIDC_2',
+              ProviderDetails: { oidc_issuer: 'https://example.com' },
+              AttributeMapping: { name: 'name', phone_number: 'phone_number' },
+            },
+          ],
+        });
+        assert.deepEqual(result.loginOptions?.oidcLogin, [
+          { issuerUrl: 'https://example.com', name: 'OIDC_1', attributeMapping: { fullname: 'name', phoneNumber: 'phone_number' } },
+          { issuerUrl: 'https://example.com', name: 'OIDC_2', attributeMapping: { fullname: 'name', phoneNumber: 'phone_number' } },
+        ]);
+      });
+    });
+    void describe('SAML', () => {
+      void it('contains metadataType URL if SAML identityProviderDetails and metadataURL is passed', () => {
+        const result = getAuthDefinition({
+          userPool: {},
+          identityProvidersDetails: [
+            {
+              ProviderType: IdentityProviderTypeType.SAML,
+              ProviderName: 'SAML_1',
+              ProviderDetails: { metadataURL: 'https://example.com' },
+            },
+          ],
+        });
+        assert.deepEqual(result.loginOptions?.samlLogin, {
+          metadata: { metadataContent: 'https://example.com', metadataType: 'URL' },
+          name: 'SAML_1',
+        });
+      });
+      void it('contains metadataType FILE if SAML identityProviderDetails and metadataContent is passed', () => {
+        const result = getAuthDefinition({
+          userPool: {},
+          identityProvidersDetails: [
+            {
+              ProviderType: IdentityProviderTypeType.SAML,
+              ProviderName: 'SAML_1',
+              ProviderDetails: { metadataContent: 'https://example.com' },
+            },
+          ],
+        });
+        assert.deepEqual(result.loginOptions?.samlLogin, {
+          metadata: { metadataContent: 'https://example.com', metadataType: 'FILE' },
+          name: 'SAML_1',
+        });
+      });
+      void it('contains attributeMapping if AttributeMapping is passed', () => {
+        const result = getAuthDefinition({
+          userPool: {},
+          identityProvidersDetails: [
+            {
+              ProviderType: IdentityProviderTypeType.SAML,
+              ProviderName: 'SAML_1',
+              ProviderDetails: { metadataContent: 'https://example.com' },
+              AttributeMapping: { name: 'name', phone_number: 'phone_number' },
+            },
+          ],
+        });
+        assert.deepEqual(result.loginOptions?.samlLogin, {
+          attributeMapping: { fullname: 'name', phoneNumber: 'phone_number' },
+          metadata: { metadataContent: 'https://example.com', metadataType: 'FILE' },
+          name: 'SAML_1',
+        });
+      });
+    });
   });
   void describe('callback URLs and logout URLs', () => {
     void it('contains callback urls if callbackURLs array is passed', () => {
@@ -204,7 +342,7 @@ void describe('auth codegen', () => {
       for (const key in defaultPasswordPolicy) {
         const typedKey = key as keyof PasswordPolicyType;
         const testValue = defaultPasswordPolicy[typedKey];
-        void it(`does not explicitly override the value for ${typedKey} when set to the default value of ${testValue}`, () => {
+        void it(`does explicitly override the value for ${typedKey} when set to the default value of ${testValue}`, () => {
           const result = getAuthDefinition({
             userPool: {
               Policies: {
@@ -214,7 +352,7 @@ void describe('auth codegen', () => {
               },
             },
           });
-          assert(!(`Policies.PasswordPolicy.${typedKey}` in result.userPoolOverrides!));
+          assert(`Policies.PasswordPolicy.${typedKey}` in result.userPoolOverrides!);
         });
       }
     });
@@ -462,7 +600,7 @@ void describe('auth codegen', () => {
       const result = getAuthDefinition({
         userPool: { Name: 'test' },
       });
-      assert.deepEqual(result.userPoolOverrides, { UserPoolName: 'test', UsernameAttributes: [] });
+      assert.deepEqual(result.userPoolOverrides, { userPoolName: 'test', usernameAttributes: [] });
     });
   });
 });

packages/amplify-gen1-codegen-auth-adapter/src/auth_render_adapter.ts

@@ -64,9 +64,6 @@ const getPasswordPolicyOverrides = (passwordPolicy: Partial<PasswordPolicyType>)
   for (const key of Object.keys(passwordPolicy)) {
     const typedKey: keyof PasswordPolicyType = key as keyof PasswordPolicyType;
     if (passwordPolicy[typedKey] !== undefined) {
-      if (passwordPolicy[typedKey] === DEFAULT_PASSWORD_SETTINGS[typedKey]) {
-        continue;
-      }
       policyOverrides[passwordOverridePath(typedKey)] = passwordPolicy[typedKey];
     }
   }
@@ -78,12 +75,12 @@ const getUserPoolOverrides = (userPool: UserPoolType): Partial<PolicyOverrides>
   Object.assign(userPoolOverrides, getPasswordPolicyOverrides(userPool.Policies?.PasswordPolicy ?? {}));
   if (userPool.Name) {
     const userNamePolicy: Partial<PolicyOverrides> = {
-      UserPoolName: userPool.Name,
+      userPoolName: userPool.Name,
     };
     Object.assign(userPoolOverrides, userNamePolicy);
   }
   if (userPool.UsernameAttributes === undefined || userPool.UsernameAttributes.length === 0) {
-    userPoolOverrides.UsernameAttributes = [];
+    userPoolOverrides.usernameAttributes = [];
   }
   return userPoolOverrides;
 };

packages/amplify-gen1-codegen-storage-adapter/API.md

@@ -4,13 +4,15 @@
 
 ```ts
 
+import { Lambda } from '@aws-amplify/amplify-gen2-codegen';
 import { StorageRenderParameters } from '@aws-amplify/amplify-gen2-codegen';
+import { StorageTriggerEvent } from '@aws-amplify/amplify-gen2-codegen';
 
 // @public (undocumented)
 export type CLIV1Permission = 'READ' | 'CREATE_AND_UPDATE' | 'DELETE';
 
 // @public (undocumented)
-export const getStorageDefinition: ({ bucketName, cliInputs }: StorageInputs) => StorageRenderParameters;
+export const getStorageDefinition: ({ bucketName, cliInputs, triggers }: StorageInputs) => StorageRenderParameters;
 
 // @public (undocumented)
 export type StorageCLIInputsJSON = {
@@ -28,6 +30,7 @@ export type StorageCLIInputsJSON = {
 export type StorageInputs = {
     bucketName: string;
     cliInputs: StorageCLIInputsJSON;
+    triggers?: Partial<Record<StorageTriggerEvent, Lambda>>;
 };
 
 // (No @packageDocumentation comment for this package)

packages/amplify-gen1-codegen-storage-adapter/src/gen1_storage_codegen_adapter.ts

@@ -1,13 +1,15 @@
-import { StorageRenderParameters } from '@aws-amplify/amplify-gen2-codegen';
+import { StorageTriggerEvent, Lambda, StorageRenderParameters } from '@aws-amplify/amplify-gen2-codegen';
 import { StorageCLIInputsJSON, getStorageAccess } from './storage_access';
 
 export type StorageInputs = {
   bucketName: string;
   cliInputs: StorageCLIInputsJSON;
+  triggers?: Partial<Record<StorageTriggerEvent, Lambda>>;
 };
-export const getStorageDefinition = ({ bucketName, cliInputs }: StorageInputs): StorageRenderParameters => {
+export const getStorageDefinition = ({ bucketName, cliInputs, triggers }: StorageInputs): StorageRenderParameters => {
   return {
     accessPatterns: getStorageAccess(cliInputs),
     storageIdentifier: bucketName,
+    triggers: triggers ?? {},
   };
 };

packages/amplify-gen2-codegen/API.md

@@ -4,6 +4,8 @@
 
 ```ts
 
+import { BucketAccelerateStatus } from '@aws-sdk/client-s3';
+import { BucketVersioningStatus } from '@aws-sdk/client-s3';
 import { EnvironmentResponse } from '@aws-sdk/client-lambda';
 import { PasswordPolicyType } from '@aws-sdk/client-cognito-identity-provider';
 import { Runtime } from '@aws-sdk/client-lambda';
@@ -218,16 +220,22 @@ export type StandardAttributes = Partial<Record<Attribute, StandardAttribute>>;
 
 // @public (undocumented)
 export interface StorageRenderParameters {
+    // (undocumented)
+    accelerateConfiguration?: BucketAccelerateStatus;
     // (undocumented)
     accessPatterns?: AccessPatterns;
     // (undocumented)
     bucketEncryptionAlgorithm?: string;
     // (undocumented)
+    dynamoDB?: string;
+    // (undocumented)
     lambdas?: S3TriggerDefinition[];
     // (undocumented)
     storageIdentifier?: string;
     // (undocumented)
     triggers?: Partial<Record<StorageTriggerEvent, Lambda>>;
+    // (undocumented)
+    versioningConfiguration?: BucketVersioningStatus;
 }
 
 // @public (undocumented)

packages/amplify-gen2-codegen/package.json

@@ -39,7 +39,8 @@
   "dependencies": {
     "@aws-amplify/auth-construct": "^1.1.5",
     "@aws-sdk/client-cognito-identity-provider": "^3.592.0",
-    "@aws-sdk/client-lambda": "^3.637.0",
+    "@aws-sdk/client-lambda": "^3.651.1",
+    "@aws-sdk/client-s3": "^3.651.1",
     "aws-cdk-lib": "^2.127.0",
     "typescript": "^5.4.5"
   },