Merge pull request #668 from aws-amplify/main

Release Amplify Codegen 08-15-2023
aws-amplify · Aug 15, 2023 · d284bdb · d284bdb
2 parents 612fd61 + cb28b9b
commit d284bdb
Show file tree

Hide file tree

Showing 20 changed files with 424 additions and 347 deletions.
diff --git a/.codebuild/cleanup_e2e_resources.yml b/.codebuild/cleanup_e2e_resources.yml
@@ -8,4 +8,8 @@ env:
 phases:
   build:
     commands:
-      - source ./shared-scripts.sh && _cleanupE2EResources
+      - source ./shared-scripts.sh && _cleanupE2EResources
+artifacts:
+  files:
+    - '**/*'
+  base-directory: $CODEBUILD_SRC_DIR/packages/amplify-codegen-e2e-tests/amplify-e2e-reports
diff --git a/.codebuild/cleanup_workflow.yml b/.codebuild/cleanup_workflow.yml
@@ -9,4 +9,8 @@ phases:
   build:
     commands:
       - yarn production-build
-      - cd packages/amplify-codegen-e2e-tests && yarn clean-e2e-resources
+      - cd packages/amplify-codegen-e2e-tests && yarn clean-e2e-resources
+artifacts:
+  files:
+    - '**/*'
+  base-directory: $CODEBUILD_SRC_DIR/packages/amplify-codegen-e2e-tests/amplify-e2e-reports
diff --git a/.codebuild/run_android_modelgen_e2e_test.yml b/.codebuild/run_android_modelgen_e2e_test.yml
@@ -25,10 +25,11 @@ phases:
       - source ./shared-scripts.sh && _runE2ETestsLinux
   post_build:
     commands:
+      - source ./shared-scripts.sh && _unassumeTestAccountCredentials
       - aws sts get-caller-identity
       - source ./shared-scripts.sh && _scanArtifacts
 
 artifacts:
   files:
-    - $CODEBUILD_SRC_DIR/packages/amplify-codegen-e2e-tests/amplify-e2e-reports/*
-  discard-paths: yes
+    - '**/*'
+  base-directory: $CODEBUILD_SRC_DIR/packages/amplify-codegen-e2e-tests/amplify-e2e-reports
diff --git a/.codebuild/run_e2e_tests.yml b/.codebuild/run_e2e_tests.yml
@@ -16,10 +16,11 @@ phases:
       - source ./shared-scripts.sh && _runE2ETestsLinux
   post_build:
     commands:
+      - source ./shared-scripts.sh && _unassumeTestAccountCredentials
       - aws sts get-caller-identity
       - source ./shared-scripts.sh && _scanArtifacts
 
 artifacts:
   files:
-    - $CODEBUILD_SRC_DIR/packages/amplify-codegen-e2e-tests/amplify-e2e-reports/*
-  discard-paths: yes
+    - '**/*'
+  base-directory: $CODEBUILD_SRC_DIR/packages/amplify-codegen-e2e-tests/amplify-e2e-reports
diff --git a/.codebuild/run_ios_modelgen_e2e_test.yml b/.codebuild/run_ios_modelgen_e2e_test.yml
@@ -28,5 +28,5 @@ phases:
 
 artifacts:
   files:
-    - $CODEBUILD_SRC_DIR/packages/amplify-codegen-e2e-tests/amplify-e2e-reports/*
-  discard-paths: yes
+    - '**/*'
+  base-directory: $CODEBUILD_SRC_DIR/packages/amplify-codegen-e2e-tests/amplify-e2e-reports
diff --git a/package.json b/package.json
@@ -70,7 +70,7 @@
     "packages/*"
   ],
   "devDependencies": {
-    "@aws-amplify/amplify-cli-core": "^4.0.4",
+    "@aws-amplify/amplify-cli-core": "^4.2.4-rc.43f73ab268.0",
     "@commitlint/cli": "^17.0.3",
     "@commitlint/config-conventional": "^17.0.3",
     "@commitlint/config-lerna-scopes": "^17.0.2",
@@ -119,7 +119,7 @@
     "typescript": "4.7.4"
   },
   "resolutions": {
-    "@aws-amplify/amplify-cli-core": "4.0.4",
+    "@aws-amplify/amplify-cli-core": "4.2.4-rc.43f73ab268.0",
     "minimist": "^1.2.6",
     "lodash": "^4.17.21",
     "node-fetch": "^2.6.7",

diff --git a/packages/amplify-codegen-e2e-core/package.json b/packages/amplify-codegen-e2e-core/package.json
@@ -39,7 +39,7 @@
     "@types/ini": "^1.3.31"
   },
   "peerDependencies": {
-    "@aws-amplify/amplify-cli-core": "^4.0.0",
+    "@aws-amplify/amplify-cli-core": "^4.2.4-rc.43f73ab268.0",
     "amplify-headless-interface": "^1.13.1",
     "graphql-transformer-core": "^8.0.0"
   }

diff --git a/packages/amplify-codegen-e2e-core/src/nexpect-reporter.js b/packages/amplify-codegen-e2e-core/src/nexpect-reporter.js
@@ -60,8 +60,10 @@ class AmplifyCLIExecutionReporter {
 
   onRunComplete(contexts, results) {
     const { publicPath = process.cwd(), filename = 'jest_html_reporters.html', logoImgPath } = this._options;
+    const runIdx = process.env['RUN_INDEX'] ?? '0';
     const logoImg = logoImgPath ? imgToBase64(logoImgPath) : undefined;
-    fs.ensureDirSync(publicPath);
+    const reportPath = path.join(publicPath, runIdx);
+    fs.ensureDirSync(reportPath);
 
     const processedResults = results.testResults.map(result => {
       const resultCopy = { ...result };
@@ -73,7 +75,7 @@ class AmplifyCLIExecutionReporter {
 
           const recordingWithPath = recordings.map(r => {
             const castFile = `${uuid.v4()}.cast`;
-            const castFilePath = path.join(publicPath, castFile);
+            const castFilePath = path.join(reportPath, castFile);
             fs.writeFileSync(castFilePath, r.recording);
             const rCopy = { ...r };
             delete rCopy.recording;
@@ -98,7 +100,7 @@ class AmplifyCLIExecutionReporter {
     resultsWithRecordings._reporterOptions = { ...this._options, logoImg, customInfos: {} };
     const data = JSON.stringify(resultsWithRecordings);
 
-    const filePath = path.resolve(publicPath, filename);
+    const filePath = path.resolve(reportPath, filename);
     // const filePathMock = path.resolve(publicPath, `devMock.json`);
     // fs.writeFileSync(filePathMock, data);
     const htmlTemplate = fs.readFileSync(localTemplatePath, 'utf-8');

diff --git a/packages/amplify-codegen-e2e-tests/package.json b/packages/amplify-codegen-e2e-tests/package.json
@@ -41,7 +41,7 @@
     "ts-node": "^8.10.1"
   },
   "peerDependencies": {
-    "@aws-amplify/amplify-cli-core": "^4.0.0",
+    "@aws-amplify/amplify-cli-core": "^4.2.4-rc.43f73ab268.0",
     "graphql-transformer-core": "^8.0.0"
   },
   "jest": {

diff --git a/packages/amplify-codegen-e2e-tests/src/cleanup-e2e-resources.ts b/packages/amplify-codegen-e2e-tests/src/cleanup-e2e-resources.ts
@@ -20,7 +20,7 @@ const AWS_REGIONS_TO_RUN_TESTS = [
   'ap-southeast-2',
 ];
 
-const reportPath = path.normalize(path.join(__dirname, '..', 'amplify-e2e-reports', 'stale-resources.json'));
+const reportPathDir = path.normalize(path.join(__dirname, '..', 'amplify-e2e-reports'));
 
 const MULTI_JOB_APP = '<Amplify App reused by multiple apps>';
 const ORPHAN = '<orphan>';
@@ -546,7 +546,8 @@ const deleteCfnStack = async (account: AWSAccountInfo, accountIndex: number, sta
   }
 };
 
-const generateReport = (jobs: _.Dictionary<ReportEntry>): void => {
+const generateReport = (jobs: _.Dictionary<ReportEntry>, accountIdx: number): void => {
+  const reportPath = path.join(reportPathDir, `stale-resources-${accountIdx}.json`);
   fs.ensureFileSync(reportPath);
   fs.writeFileSync(reportPath, JSON.stringify(jobs, null, 4));
 };
@@ -688,7 +689,7 @@ const cleanupAccount = async (account: AWSAccountInfo, accountIndex: number, fil
   const allResources = await mergeResourcesByCCIJob(apps, stacks, buckets, orphanBuckets, orphanIamRoles);
   const staleResources = _.pickBy(allResources, filterPredicate);
 
-  generateReport(staleResources);
+  generateReport(staleResources, accountIndex);
   await deleteResources(account, accountIndex, staleResources);
   console.log(`${generateAccountInfo(account, accountIndex)} Cleanup done!`);
 };

diff --git a/packages/amplify-codegen/src/commands/models.js b/packages/amplify-codegen/src/commands/models.js
@@ -108,6 +108,7 @@ Amplify Flutter versions prior to 0.6.0 are no longer supported by codegen. Plea
   const transformerVersion = readNumericFeatureFlag('graphQLTransformer.transformerVersion');
   const respectPrimaryKeyAttributesOnConnectionField = readFeatureFlag('graphQLTransformer.respectPrimaryKeyAttributesOnConnectionField');
   const generateModelsForLazyLoadAndCustomSelectionSet = readFeatureFlag('codegen.generateModelsForLazyLoadAndCustomSelectionSet');
+  const improvePluralization = readFeatureFlag('graphQLTransformer.improvePluralization');
 
   let isTimestampFieldsAdded = readFeatureFlag('codegen.addTimestampFields');
 
@@ -125,6 +126,7 @@ Amplify Flutter versions prior to 0.6.0 are no longer supported by codegen. Plea
       usePipelinedTransformer,
       transformerVersion,
       respectPrimaryKeyAttributesOnConnectionField,
+      improvePluralization,
       generateModelsForLazyLoadAndCustomSelectionSet,
       codegenVersion: packageVersion,
       overrideOutputDir, // This needs to live under `config` in order for the GraphQL types to work out.

diff --git a/...c-modelgen-plugin/src/__tests__/visitors/__snapshots__/appsync-swift-visitor.test.ts.snap b/...c-modelgen-plugin/src/__tests__/visitors/__snapshots__/appsync-swift-visitor.test.ts.snap
@@ -63,7 +63,8 @@ extension Post {
   public static let schema = defineSchema { model in
     let post = Post.keys
     
-    model.pluralName = \\"Posts\\"
+    model.listPluralName = \\"Posts\\"
+    model.syncPluralName = \\"Posts\\"
     
     model.attributes(
       .index(fields: [\\"id\\", \\"title\\"], name: nil),
@@ -175,7 +176,8 @@ extension Comment {
   public static let schema = defineSchema { model in
     let comment = Comment.keys
     
-    model.pluralName = \\"Comments\\"
+    model.listPluralName = \\"Comments\\"
+    model.syncPluralName = \\"Comments\\"
     
     model.attributes(
       .index(fields: [\\"id\\", \\"content\\"], name: nil),
@@ -285,7 +287,8 @@ extension ModelCompositePk {
   public static let schema = defineSchema { model in
     let modelCompositePk = ModelCompositePk.keys
     
-    model.pluralName = \\"ModelCompositePks\\"
+    model.listPluralName = \\"ModelCompositePks\\"
+    model.syncPluralName = \\"ModelCompositePks\\"
     
     model.attributes(
       .index(fields: [\\"id\\", \\"dob\\"], name: nil),
@@ -385,7 +388,8 @@ extension ModelExplicitCustomPk {
   public static let schema = defineSchema { model in
     let modelExplicitCustomPk = ModelExplicitCustomPk.keys
     
-    model.pluralName = \\"ModelExplicitCustomPks\\"
+    model.listPluralName = \\"ModelExplicitCustomPks\\"
+    model.syncPluralName = \\"ModelExplicitCustomPks\\"
     
     model.attributes(
       .index(fields: [\\"userId\\"], name: nil),
@@ -480,7 +484,8 @@ extension ModelExplicitDefaultPk {
   public static let schema = defineSchema { model in
     let modelExplicitDefaultPk = ModelExplicitDefaultPk.keys
     
-    model.pluralName = \\"ModelExplicitDefaultPks\\"
+    model.listPluralName = \\"ModelExplicitDefaultPks\\"
+    model.syncPluralName = \\"ModelExplicitDefaultPks\\"
     
     model.attributes(
       .index(fields: [\\"id\\"], name: nil),
@@ -569,7 +574,8 @@ extension ModelImplicitDefaultPk {
   public static let schema = defineSchema { model in
     let modelImplicitDefaultPk = ModelImplicitDefaultPk.keys
     
-    model.pluralName = \\"ModelImplicitDefaultPks\\"
+    model.listPluralName = \\"ModelImplicitDefaultPks\\"
+    model.syncPluralName = \\"ModelImplicitDefaultPks\\"
     
     model.attributes(
       .primaryKey(fields: [modelImplicitDefaultPk.id])
@@ -703,7 +709,8 @@ extension Project {
   public static let schema = defineSchema { model in
     let project = Project.keys
     
-    model.pluralName = \\"Projects\\"
+    model.listPluralName = \\"Projects\\"
+    model.syncPluralName = \\"Projects\\"
     
     model.attributes(
       .index(fields: [\\"projectId\\", \\"name\\"], name: nil),
@@ -841,7 +848,8 @@ extension Team {
   public static let schema = defineSchema { model in
     let team = Team.keys
     
-    model.pluralName = \\"Teams\\"
+    model.listPluralName = \\"Teams\\"
+    model.syncPluralName = \\"Teams\\"
     
     model.attributes(
       .index(fields: [\\"teamId\\", \\"name\\"], name: nil),
@@ -983,7 +991,8 @@ extension ListContainer {
   public static let schema = defineSchema { model in
     let listContainer = ListContainer.keys
     
-    model.pluralName = \\"ListContainers\\"
+    model.listPluralName = \\"ListContainers\\"
+    model.syncPluralName = \\"ListContainers\\"
     
     model.fields(
       .id(),
@@ -1122,7 +1131,8 @@ extension Todo {
   public static let schema = defineSchema { model in
     let todo = Todo.keys
     
-    model.pluralName = \\"Todos\\"
+    model.listPluralName = \\"Todos\\"
+    model.syncPluralName = \\"Todos\\"
     
     model.fields(
       .id(),
@@ -1247,7 +1257,8 @@ extension task {
   public static let schema = defineSchema { model in
     let task = task.keys
     
-    model.pluralName = \\"tasks\\"
+    model.listPluralName = \\"tasks\\"
+    model.syncPluralName = \\"tasks\\"
     
     model.fields(
       .id(),