Merge pull request #644 from aws-amplify/main

phani-srikar · web-flow · commit 21abb4469f89 · 2023-07-24T16:32:06.000-07:00
Release Codegen plugin - 7/24/23
diff --git a/.codebuild/build_windows.yml b/.codebuild/build_windows.yml
@@ -0,0 +1,11 @@
+version: 0.2
+env:
+  shell: powershell.exe
+phases:
+  build:
+    commands:
+      - yarn run production-build
+
+artifacts:
+  files:
+    - 'shared-scripts.sh'
diff --git a/.codebuild/e2e_workflow.yml b/.codebuild/e2e_workflow.yml
@@ -10,6 +10,12 @@ batch:
       buildspec: .codebuild/build_linux.yml
       env:
         compute-type: BUILD_GENERAL1_LARGE
+    - identifier: build_windows
+      buildspec: .codebuild/build_windows.yml
+      env:
+        type: WINDOWS_SERVER_2019_CONTAINER
+        compute-type: BUILD_GENERAL1_LARGE
+        image: $WINDOWS_IMAGE_2019
     - identifier: test
       buildspec: .codebuild/test.yml
       env:
@@ -37,6 +43,15 @@ batch:
           CLI_REGION: us-east-2
       depend-on:
         - publish_to_local_registry
+    - identifier: build_app_android
+      buildspec: .codebuild/run_android_modelgen_e2e_test.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          TEST_SUITE: src/__tests__/build-app-android.test.ts
+          CLI_REGION: us-east-2
+      depend-on:
+        - publish_to_local_registry
     - identifier: >-
         add_codegen_ios_configure_codegen_android_configure_codegen_js_graphql_codegen_android
       buildspec: .codebuild/run_e2e_tests.yml
@@ -100,7 +115,7 @@ batch:
         variables:
           TEST_SUITE: >-
             src/__tests__/push-codegen-ios.test.ts|src/__tests__/push-codegen-android.test.ts|src/__tests__/graphql-documents-generator.test.ts|src/__tests__/push-codegen-js.test.ts
-          CLI_REGION: ap-southeast-1
+          CLI_REGION: ap-northeast-1
       depend-on:
         - publish_to_local_registry
     - identifier: build_app_ts
@@ -109,16 +124,7 @@ batch:
         compute-type: BUILD_GENERAL1_LARGE
         variables:
           TEST_SUITE: src/__tests__/build-app-ts.test.ts
-          CLI_REGION: ap-southeast-2
-      depend-on:
-        - publish_to_local_registry
-    - identifier: build_app_android
-      buildspec: .codebuild/run_e2e_tests.yml
-      env:
-        compute-type: BUILD_GENERAL1_MEDIUM
-        variables:
-          TEST_SUITE: src/__tests__/build-app-android.test.ts
-          CLI_REGION: ap-northeast-1
+          CLI_REGION: ap-southeast-1
       depend-on:
         - publish_to_local_registry
     - identifier: cleanup_e2e_resources
diff --git a/.codebuild/e2e_workflow_base.yml b/.codebuild/e2e_workflow_base.yml
@@ -37,3 +37,12 @@ batch:
           CLI_REGION: us-east-2
       depend-on:
         - publish_to_local_registry
+    - identifier: build_app_android
+      buildspec: .codebuild/run_android_modelgen_e2e_test.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+        variables:
+          TEST_SUITE: src/__tests__/build-app-android.test.ts
+          CLI_REGION: us-east-2
+      depend-on:
+        - publish_to_local_registry
diff --git a/.codebuild/pr_workflow.yml b/.codebuild/pr_workflow.yml
@@ -8,6 +8,12 @@ batch:
   build-graph:
     - identifier: build_linux
       buildspec: .codebuild/build_linux.yml
+    - identifier: build_windows
+      buildspec: .codebuild/build_windows.yml
+      env:
+        type: WINDOWS_SERVER_2019_CONTAINER
+        compute-type: BUILD_GENERAL1_LARGE
+        image: $WINDOWS_IMAGE_2019
     - identifier: test
       buildspec: .codebuild/test.yml
       depend-on:
diff --git a/.codebuild/release_workflow.yml b/.codebuild/release_workflow.yml
@@ -8,6 +8,12 @@ batch:
   build-graph:
     - identifier: build_linux
       buildspec: .codebuild/build_linux.yml
+    - identifier: build_windows
+      buildspec: .codebuild/build_windows.yml
+      env:
+        type: WINDOWS_SERVER_2019_CONTAINER
+        compute-type: BUILD_GENERAL1_LARGE
+        image: $WINDOWS_IMAGE_2019
     - identifier: test
       buildspec: .codebuild/test.yml
       depend-on:
@@ -24,3 +30,4 @@ batch:
       buildspec: .codebuild/deploy.yml
       depend-on:
         - test
+        - build_windows
diff --git a/.codebuild/run_android_modelgen_e2e_test.yml b/.codebuild/run_android_modelgen_e2e_test.yml
@@ -0,0 +1,32 @@
+version: 0.2
+env:
+  shell: bash
+  variables:
+    AMPLIFY_DIR: /root/.npm-global/lib/node_modules/@aws-amplify/cli-internal/bin
+    AMPLIFY_PATH: /root/.npm-global/lib/node_modules/@aws-amplify/cli-internal/bin/amplify
+    CI: true
+    CODEBUILD: true
+    NODE_OPTIONS: --max-old-space-size=8096
+
+phases:
+  install:
+    commands:
+      - sudo apt update
+      - yes | sudo apt install android-sdk
+      - export ANDROID_HOME=/usr/lib/android-sdk
+      - yes | sudo apt install sdkmanager
+      # Review SDK licenses
+      - yes | sudo sdkmanager --licenses
+
+  build:
+    commands:
+      - source ./shared-scripts.sh && _runE2ETestsLinux
+  post_build:
+    commands:
+      - 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
diff --git a/.codebuild/scripts/lint_pr.sh b/.codebuild/scripts/lint_pr.sh
@@ -1,6 +1,8 @@
 set -xeo pipefail
 # extract the PR number from the PR link
 PR_NUM=${CODEBUILD_WEBHOOK_TRIGGER##*/}
+PROJECT_USERNAME=aws-amplify
+REPO_NAME=amplify-codegen
 
 if [ -z "$PR_NUM" ]; then
   echo "Could not determine PR number. Cannot determine fork point for linting. Skipping linting."
diff --git a/.codebuild/scripts/publish.sh b/.codebuild/scripts/publish.sh
@@ -1,5 +1,9 @@
 #!/bin/bash -e
 
+if [[ "$CODEBUILD_WEBHOOK_TRIGGER" == "pr/"* ]]; then
+  BRANCH_NAME=${CODEBUILD_WEBHOOK_BASE_REF##*/}
+fi
+
 if [ -z "$BRANCH_NAME" ]; then
   echo "BRANCH_NAME is missing"
   exit 1
diff --git a/.codebuild/scripts/run-ios-modelgen-e2e-test.sh b/.codebuild/scripts/run-ios-modelgen-e2e-test.sh
@@ -13,7 +13,7 @@ get_latest_run_id() {
     echo "$latest_run_id"
 }
 
-# Function to get the status of a workflow run
+# Function to get the status of a workflow run - can be queued or in_progress or completed
 get_run_status() {
     run_id="$1"
     run_status=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
@@ -24,6 +24,17 @@ get_run_status() {
     echo "$run_status"
 }
 
+# Function to get the status of a test run - can be success or failure
+get_test_status() {
+    run_id="$1"
+    test_status=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
+        -H "Accept: application/vnd.github+json" \
+        -H "X-GitHub-Api-Version: 2022-11-28" \
+        "https://api.github.com/repos/$REPO_OWNER/$REPO_NAME/actions/runs/$run_id" | \
+        jq -r '.conclusion')
+    echo "$test_status"
+}
+
 # Function to trigger a workflow dispatch event to run the e2e test
 trigger_workflow() {
     curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
@@ -40,24 +51,25 @@ main() {
     # Get the latest run ID and initial status
     latest_run_id=$(get_latest_run_id)
     echo "Latest run ID: $latest_run_id"
-    latest_status=$(get_run_status "$latest_run_id")
-    timeout=$((SECONDS + 600))  # 600 seconds = 10 minutes
+    run_status=$(get_run_status "$latest_run_id")
+    timeout=$((SECONDS + 1200))  # 1200 seconds = 20 minutes
 
     # Continuously check for status until completion
-    while [[ "$latest_status" != "completed"  && "$SECONDS" -lt "$timeout" ]]; do
-        echo "Test run status: $latest_status"
+    while [[ "$run_status" != "completed"  && "$SECONDS" -lt "$timeout" ]]; do
+        echo "Test run status: $run_status"
         sleep 10 # Wait before checking again
-        latest_status=$(get_run_status "$latest_run_id")
+        run_status=$(get_run_status "$latest_run_id")
     done
 
     # Check if the run completed within the specified duration
-    if [[ "$latest_status" != "completed" ]]; then
+    if [[ "$run_status" != "completed" ]]; then
         echo "The test run did not complete within the specified duration."
         exit 1
     fi
 
-    # Check if the run failed and throw an error if it did
-    if [[ "$latest_status" == "failure" ]]; then
+    test_status=$(get_test_status "$latest_run_id")
+    # Check if the test failed and throw an error if it did
+    if [[ "$test_status" != "success" ]]; then
         echo "The test run failed."
         exit 1
     else
diff --git a/.github/workflows/build-swift-modelgen.yml b/.github/workflows/build-swift-modelgen.yml
@@ -12,7 +12,7 @@ env:
 
 jobs:
   Build-Swift-Modelgen:
-    name: Analyze
+    name: Build
     runs-on: macos-13-xl
     permissions:
       actions: read
diff --git a/package.json b/package.json
@@ -69,7 +69,7 @@
     "packages/*"
   ],
   "devDependencies": {
-    "@aws-amplify/amplify-cli-core": "^4.0.6",
+    "@aws-amplify/amplify-cli-core": "^4.0.4",
     "@commitlint/cli": "^17.0.3",
     "@commitlint/config-conventional": "^17.0.3",
     "@commitlint/config-lerna-scopes": "^17.0.2",
@@ -113,6 +113,7 @@
     "execa": "^5.1.1"
   },
   "resolutions": {
+    "@aws-amplify/amplify-cli-core": "4.0.4",
     "minimist": "^1.2.6",
     "lodash": "^4.17.21",
     "node-fetch": "^2.6.7",
diff --git a/packages/amplify-codegen-e2e-core/src/init/android.ts b/packages/amplify-codegen-e2e-core/src/init/android.ts
@@ -25,4 +25,26 @@ export function androidBuild(cwd: string, settings: Object = {}): Promise<void>
       }
     });
   });
-}
+};
+
+export function acceptLicenses(cwd: string, settings: Object = {}): Promise<void> {
+  return new Promise((resolve, reject) => {
+    const s = { ...defaultSettings, ...settings };
+
+    const chain = spawn('sdkmanager', ['--licenses'], {
+      cwd,
+      stripColors: true,
+      disableCIDetection: s.disableCIDetection
+    })
+    .wait("Review licenses that have not been accepted (y/N)?")
+    .sendLine("y");
+
+    chain.run((err: Error) => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve();
+      }
+    });
+  });
+};
diff --git a/packages/amplify-codegen-e2e-tests/package.json b/packages/amplify-codegen-e2e-tests/package.json
@@ -17,7 +17,7 @@
   ],
   "private": true,
   "scripts": {
-    "e2e": "npm run setup-profile && jest --verbose",
+    "e2e": "npm run setup-profile && jest --verbose --forceExit",
     "setup-profile": "ts-node ./src/configure_tests.ts",
     "clean-e2e-resources": "ts-node ./src/cleanup-e2e-resources.ts",
     "clean-cb-e2e-resources": "ts-node ./src/cleanup-cb-e2e-resources.ts"
diff --git a/packages/amplify-codegen-e2e-tests/src/__tests__/build-app-android.test.ts b/packages/amplify-codegen-e2e-tests/src/__tests__/build-app-android.test.ts
@@ -1,10 +1,10 @@
 import {
   initProjectWithQuickstart,
   DEFAULT_ANDROID_CONFIG,
-  addApiWithBlankSchemaAndConflictDetection,
   updateApiSchemaWithText,
   generateModels,
   androidBuild,
+  acceptLicenses
 } from '@aws-amplify/amplify-codegen-e2e-core';
 const { schemas } = require('@aws-amplify/graphql-schema-test-library');
 import { existsSync, writeFileSync, readdirSync, rmSync } from 'fs';
@@ -21,6 +21,7 @@ describe('build app - Android', () => {
   beforeAll(async () => {
     await initProjectWithQuickstart(projectRoot, { ...config });
     apiName = readdirSync(path.join(projectRoot, 'amplify', 'backend', 'api'))[0];
+    await acceptLicenses(projectRoot);
   });
 
   afterAll(async () => {
diff --git a/packages/amplify-codegen/src/codegen-config/index.js b/packages/amplify-codegen/src/codegen-config/index.js
@@ -43,6 +43,7 @@ function getCodegenConfig(projectPath) {
     : path.dirname(path.dirname(includeFiles));
 
   const { generatedFileName } = cfg.amplifyExtension || {};
+  const { maxDepth } = cfg.amplifyExtension || {};
 
   return {
     getGeneratedQueriesPath: function() {
@@ -62,6 +63,12 @@ function getCodegenConfig(projectPath) {
         return;
       }
       return path.normalize(generatedFileName);
+    },
+    getQueryMaxDepth: function() {
+      if (!maxDepth || !Number(maxDepth)) {
+        return;
+      }
+      return Number(maxDepth);
     }
   }
 }
diff --git a/packages/amplify-codegen/tests/codegen-config/getCodegenConfig.test.js b/packages/amplify-codegen/tests/codegen-config/getCodegenConfig.test.js
@@ -57,6 +57,13 @@ describe('get codegen configuration', () => {
     expect(getConfigReturn.getGeneratedFragmentsPath()).toEqual(path.join('src', 'graphql', 'fragments'));
   });
 
+  it('returns correct maxDepth as a Number', () => {
+    fs.existsSync = jest.fn().mockReturnValue(true);
+    graphQLConfig.getGraphQLConfig = jest.fn().mockReturnValue(MOCK_CODEGEN_CONFIG);
+    const getConfigReturn = getCodegenConfig(MOCK_PROJECT_ROOT);
+    expect(getConfigReturn.getQueryMaxDepth()).toEqual(4);
+  });
+
   it('uses the includes property if the generated documents path does not exist', () => {
     const configWithoutDocumentsPath = { ...MOCK_CODEGEN_CONFIG };
     delete configWithoutDocumentsPath.config.extensions.amplify.docsFilePath;
@@ -93,4 +100,13 @@ describe('get codegen configuration', () => {
     const getConfigReturn = getCodegenConfig(MOCK_PROJECT_ROOT);
     expect(getConfigReturn.getGeneratedTypesPath()).toBeUndefined();
   });
+
+  it('returns undefined if maxDepth does not exist', () => {
+    const configWithoutMaxDepth = { ...MOCK_CODEGEN_CONFIG };
+    delete configWithoutMaxDepth.config.extensions.amplify.maxDepth;
+    fs.existsSync = jest.fn().mockReturnValue(true);
+    graphQLConfig.getGraphQLConfig = jest.fn().mockReturnValue(configWithoutMaxDepth);
+    const getConfigReturn = getCodegenConfig(MOCK_PROJECT_ROOT);
+    expect(getConfigReturn.getQueryMaxDepth()).toBeUndefined();
+  });
 });
diff --git a/scripts/split-e2e-tests-codebuild.ts b/scripts/split-e2e-tests-codebuild.ts
@@ -21,11 +21,10 @@ const REPO_ROOT = join(__dirname, '..');
 const TEST_TIMINGS_PATH = join(REPO_ROOT, 'scripts', 'cci', 'test-timings.data.json');
 const CODEBUILD_CONFIG_BASE_PATH = join(REPO_ROOT, '.codebuild', 'e2e_workflow_base.yml');
 const CODEBUILD_GENERATE_CONFIG_PATH = join(REPO_ROOT, '.codebuild', 'e2e_workflow.yml');
-const RUN_SOLO = [
-  'src/__tests__/build-app-android.test.ts',
-];
+const RUN_SOLO = [];
 const EXCLUDE_TESTS = [
   'src/__tests__/build-app-swift.test.ts',
+  'src/__tests__/build-app-android.test.ts',
 ];
 
 export function loadConfigBase() {
@@ -166,7 +165,7 @@ const splitTests = (
         tmp.env.variables.USE_PARENT_ACCOUNT = 1;
       }
       if (j.runSolo) {
-        tmp.env['compute-type'] = 'BUILD_GENERAL1_MEDIUM';
+        tmp.env['compute-type'] = 'BUILD_GENERAL1_LARGE';
       }
       result.push(tmp);
     }
diff --git a/scripts/test-swift-modelgen.sh b/scripts/test-swift-modelgen.sh
diff --git a/scripts/view-test-artifacts.sh b/scripts/view-test-artifacts.sh
diff --git a/shared-scripts.sh b/shared-scripts.sh
diff --git a/yarn.lock b/yarn.lock
