Merge pull request #3297 from aws-amplify/main

Prep data release

Author: ShadowCat567

dependency_licenses.txt

@@ -6,27 +6,27 @@
     ]
   },
   "bundled": {
-    "@aws-amplify/ai-constructs": "^1.2.4",
+    "@aws-amplify/ai-constructs": "^1.5.3",
     "@aws-amplify/backend-output-schemas": "^1.0.0",
     "@aws-amplify/backend-output-storage": "^1.0.0",
-    "@aws-amplify/graphql-auth-transformer": "4.2.2",
-    "@aws-amplify/graphql-conversation-transformer": "1.1.10",
-    "@aws-amplify/graphql-default-value-transformer": "3.1.12",
-    "@aws-amplify/graphql-directives": "2.7.0",
-    "@aws-amplify/graphql-function-transformer": "3.1.14",
-    "@aws-amplify/graphql-generation-transformer": "1.2.2",
-    "@aws-amplify/graphql-http-transformer": "3.0.17",
-    "@aws-amplify/graphql-index-transformer": "3.0.17",
-    "@aws-amplify/graphql-maps-to-transformer": "4.0.17",
-    "@aws-amplify/graphql-model-transformer": "3.2.2",
-    "@aws-amplify/graphql-predictions-transformer": "3.0.17",
-    "@aws-amplify/graphql-relational-transformer": "3.1.9",
-    "@aws-amplify/graphql-searchable-transformer": "3.0.17",
-    "@aws-amplify/graphql-sql-transformer": "0.4.17",
-    "@aws-amplify/graphql-transformer": "2.3.2",
-    "@aws-amplify/graphql-transformer-core": "3.4.2",
-    "@aws-amplify/graphql-transformer-interfaces": "4.2.5",
-    "@aws-amplify/graphql-validate-transformer": "1.1.2",
+    "@aws-amplify/graphql-auth-transformer": "4.2.3",
+    "@aws-amplify/graphql-conversation-transformer": "1.1.11",
+    "@aws-amplify/graphql-default-value-transformer": "3.1.13",
+    "@aws-amplify/graphql-directives": "2.7.1",
+    "@aws-amplify/graphql-function-transformer": "3.1.15",
+    "@aws-amplify/graphql-generation-transformer": "1.2.3",
+    "@aws-amplify/graphql-http-transformer": "3.0.18",
+    "@aws-amplify/graphql-index-transformer": "3.0.18",
+    "@aws-amplify/graphql-maps-to-transformer": "4.0.18",
+    "@aws-amplify/graphql-model-transformer": "3.3.0",
+    "@aws-amplify/graphql-predictions-transformer": "3.0.18",
+    "@aws-amplify/graphql-relational-transformer": "3.1.10",
+    "@aws-amplify/graphql-searchable-transformer": "3.0.18",
+    "@aws-amplify/graphql-sql-transformer": "0.4.18",
+    "@aws-amplify/graphql-transformer": "2.3.3",
+    "@aws-amplify/graphql-transformer-core": "3.4.3",
+    "@aws-amplify/graphql-transformer-interfaces": "4.2.6",
+    "@aws-amplify/graphql-validate-transformer": "1.1.3",
     "@aws-amplify/platform-core": "^1.0.0",
     "@aws-amplify/plugin-types": "^1.0.0",
     "@aws-crypto/crc32": "5.2.0",
@@ -112,7 +112,7 @@
     "graceful-fs": "^4.2.0",
     "graphql": "^15.5.0",
     "graphql-mapping-template": "5.0.2",
-    "graphql-transformer-common": "5.1.2",
+    "graphql-transformer-common": "5.1.3",
     "hjson": "^3.2.2",
     "immer": "^9.0.12",
     "is-buffer": "~1.1.6",
@@ -134,7 +134,7 @@
     "zod": "^3.22.2"
   },
   "dependencies": {
-    "@aws-amplify/graphql-api-construct": "1.20.0",
+    "@aws-amplify/graphql-api-construct": "1.20.1",
     "aws-cdk-lib": "^2.187.0",
     "constructs": "^10.3.0"
   },
@@ -1375,6 +1375,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_dsql": {
+          "targets": {
+            "dotnet": {
+              "package": "Amazon.CDK.AWS.DSQL"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.dsql"
+            },
+            "python": {
+              "module": "aws_cdk.aws_dsql"
+            }
+          }
+        },
         "aws-cdk-lib.aws_dynamodb": {
           "targets": {
             "dotnet": {
@@ -4108,6 +4121,6 @@
     }
   },
   "types": {},
-  "version": "1.16.0",
-  "fingerprint": "70ZYr20/P49DYsGeCTZalWTrkNFkgnaynL80XG4us6w="
+  "version": "1.16.1",
+  "fingerprint": "OuvqXjsCW35ZIYVFFnyK5qGSezz23bufN1/EmytUUmQ="
 }

packages/amplify-data-construct/.jsii

@@ -161,7 +161,7 @@
     "zod"
   ],
   "dependencies": {
-    "@aws-amplify/ai-constructs": "^1.2.4",
+    "@aws-amplify/ai-constructs": "^1.5.3",
     "@aws-amplify/backend-output-schemas": "^1.0.0",
     "@aws-amplify/backend-output-storage": "^1.0.0",
     "@aws-amplify/graphql-api-construct": "1.20.1",
@@ -292,7 +292,7 @@
   "devDependencies": {
     "@types/fs-extra": "^8.0.1",
     "@types/node": "^20.0.0",
-    "aws-cdk-lib": "2.187.0",
+    "aws-cdk-lib": "2.189.1",
     "constructs": "10.3.0",
     "jsii": "^5.4.23",
     "jsii-pacmak": "^1.84.0",

packages/amplify-data-construct/package.json

@@ -1,13 +1,17 @@
 import { AssumeRoleCommand, STSClient } from '@aws-sdk/client-sts';
 import { fromContainerMetadata } from '@aws-sdk/credential-providers';
-import { generateRandomShortId, TEST_PROFILE_NAME } from './index';
 import * as ini from 'ini';
 import * as fs from 'fs-extra';
 import { pathManager } from '@aws-amplify/amplify-cli-core';
-const refreshCredentials = async (roleArn: string) => {
+import { generateRandomShortId, TEST_PROFILE_NAME } from './index';
+
+const refreshCredentials = async (roleArn: string, useCurrentCreds: boolean = false) => {
+  let credentials = undefined;
+  if (!useCurrentCreds) {
+    credentials = fromContainerMetadata();
+  }
   const client = new STSClient({
-    // Use CodeBuild role to assume test account role. I.e. don't read credentials from process.env
-    credentials: fromContainerMetadata(),
+    credentials,
   });
   const sessionName = `testSession${generateRandomShortId()}`;
   const command = new AssumeRoleCommand({
@@ -29,9 +33,15 @@ const refreshCredentials = async (roleArn: string) => {
   await fs.writeFile(pathManager.getAWSCredentialsFilePath(), ini.stringify(credentialsContents));
 };
 
-const tryRefreshCredentials = async (roleArn: string) => {
+/**
+ * Refresh the parent account. If child account is available, refresh that as well.
+ */
+const tryRefreshCredentials = async (parentRoleArn: string, childRoleArn?: string) => {
   try {
-    await refreshCredentials(roleArn);
+    await refreshCredentials(parentRoleArn);
+    if (childRoleArn) {
+      await refreshCredentials(childRoleArn, true);
+    }
     console.log('Test profile credentials refreshed');
   } catch (e) {
     console.error('Test profile credentials request failed');
@@ -54,16 +64,24 @@ export const tryScheduleCredentialRefresh = () => {
     return;
   }
 
-  if (!process.env.USE_PARENT_ACCOUNT) {
-    throw new Error('Credentials rotator supports only tests running in parent account at this time');
-  }
+  if (process.env.USE_PARENT_ACCOUNT) {
+    // Attempts to refresh credentials in background every 10 minutes.
+    setInterval(() => {
+      void tryRefreshCredentials(process.env.TEST_ACCOUNT_ROLE);
+    }, 10 * 60 * 1000);
 
-  // Attempts to refresh credentials in background every 15 minutes.
-  setInterval(() => {
-    void tryRefreshCredentials(process.env.TEST_ACCOUNT_ROLE);
-  }, 15 * 60 * 1000);
+    console.log('Test profile credentials refresh was scheduled for parent account');
+    return;
+  } else if (process.env.CHILD_ACCOUNT_ROLE) {
+    // Attempts to refresh credentials in background every 10 minutes.
+    setInterval(() => {
+      void tryRefreshCredentials(process.env.TEST_ACCOUNT_ROLE, process.env.CHILD_ACCOUNT_ROLE);
+    }, 10 * 60 * 1000);
 
-  isRotationBackgroundTaskAlreadyScheduled = true;
+    console.log('Test profile credentials refresh was scheduled for child account');
+  } else {
+    throw new Error('Credentials rotator could not find any role to rotate credentials for');
+  }
 
-  console.log('Test profile credentials refresh was scheduled');
+  isRotationBackgroundTaskAlreadyScheduled = true;
 };

packages/amplify-e2e-core/src/utils/credentials-rotator.ts

@@ -12,6 +12,7 @@ import {
   initJSProjectWithProfile,
   setupRDSInstanceAndData,
   sleep,
+  tryScheduleCredentialRefresh,
   updateAuthAddUserGroups,
 } from 'amplify-category-api-e2e-core';
 import { existsSync, writeFileSync, removeSync } from 'fs-extra';
@@ -79,6 +80,7 @@ export const testOIDCFieldAuth = (engine: ImportedRDSType): void => {
       console.log(sqlCreateStatements(engine));
       projRoot = await createNewProjectDir(projName);
       await setupAmplifyProject();
+      tryScheduleCredentialRefresh();
     });
 
     afterAll(async () => {

packages/amplify-e2e-tests/src/rds-v2-tests-common/rds-auth-oidc-fields.ts

@@ -22,7 +22,7 @@
     "build-tests": "tsc --build tsconfig.tests.json"
   },
   "dependencies": {
-    "@aws-amplify/auth-construct": "^1.0.0",
+    "@aws-amplify/auth-construct": "1.8.0",
     "@aws-amplify/core": "^2.1.0",
     "@aws-amplify/graphql-api-construct": "1.20.1",
     "@aws-sdk/client-appsync": "3.624.0",
@@ -52,7 +52,7 @@
     "@aws-amplify/graphql-transformer-interfaces": "4.2.6",
     "@aws-amplify/graphql-validate-transformer": "1.1.3",
     "@types/node": "^20.0.0",
-    "aws-cdk-lib": "2.187.0",
+    "aws-cdk-lib": "2.189.1",
     "constructs": "10.3.0",
     "ts-node": "^8.10.2"
   },

packages/amplify-graphql-api-construct-tests/package.json

@@ -1 +1 @@
-export const authConstructDependency = '@aws-amplify/auth-construct@^1.0.0';
+export const authConstructDependency = '@aws-amplify/auth-construct@1.8.0';

packages/amplify-graphql-api-construct-tests/src/__tests__/additional-dependencies.ts

@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { createNewProjectDir, deleteProjectDir, deleteProject } from 'amplify-category-api-e2e-core';
+import { createNewProjectDir, deleteProjectDir, deleteProject, tryScheduleCredentialRefresh } from 'amplify-category-api-e2e-core';
 import { initCDKProject, cdkDeploy, cdkDestroy, createGen1ProjectForMigration, deleteDDBTables } from '../../commands';
 import { graphql } from '../../graphql-request';
 import { TestDefinition, writeStackConfig, writeTestDefinitions, writeOverrides } from '../../utils';
@@ -14,6 +14,10 @@ describe('Many-to-many Migration', () => {
   let gen2ProjFolderName: string;
   let dataSourceMapping: Record<string, string>;
 
+  beforeAll(() => {
+    tryScheduleCredentialRefresh();
+  });
+
   beforeEach(async () => {
     gen1ProjFolderName = 'mtmmigrationgen1';
     gen2ProjFolderName = 'mtmmigrationgen2';

packages/amplify-graphql-api-construct-tests/src/__tests__/migration/many-to-many-migration.test.ts

@@ -1,5 +1,5 @@
 import * as path from 'path';
-import { createNewProjectDir, deleteProjectDir, deleteProject } from 'amplify-category-api-e2e-core';
+import { createNewProjectDir, deleteProjectDir, deleteProject, tryScheduleCredentialRefresh } from 'amplify-category-api-e2e-core';
 import { CloudFormationClient, ListStacksCommand, DescribeStackEventsCommand, StackEvent } from '@aws-sdk/client-cloudformation';
 import { initCDKProject, cdkDeploy, cdkDestroy, createGen1ProjectForMigration, deleteDDBTables } from '../../commands';
 import { TestDefinition, writeStackConfig, writeTestDefinitions, writeOverrides } from '../../utils';
@@ -15,6 +15,7 @@ describe('Migration table import validation', () => {
   let dataSourceMapping: Record<string, string>;
 
   beforeAll(async () => {
+    tryScheduleCredentialRefresh();
     gen1ProjFolderName = 'validategen1';
     gen1ProjRoot = await createNewProjectDir(gen1ProjFolderName);
 

packages/amplify-graphql-api-construct-tests/src/__tests__/migration/migration-validation.test.ts

@@ -5,6 +5,7 @@ import { TestOptions } from '../utils/sql-test-config-helper';
 import { DURATION_1_HOUR } from '../utils/duration-constants';
 import { testGraphQLAPI } from '../sql-tests-common/sql-models';
 import { sqlCreateStatements } from '../sql-tests-common/tests-sources/sql-models/provider';
+import { tryScheduleCredentialRefresh } from 'amplify-category-api-e2e-core';
 
 jest.setTimeout(DURATION_1_HOUR);