Merge pull request #655 from aws-amplify/dx-improvements

phani-srikar · web-flow · commit b6113bd526ed · 2023-08-01T13:01:30.000-07:00
feat: some ops improvements
diff --git a/.codebuild/e2e_workflow.yml b/.codebuild/e2e_workflow.yml
@@ -41,6 +41,7 @@ batch:
         variables:
           TEST_SUITE: src/__tests__/build-app-swift.test.ts
           CLI_REGION: us-east-2
+      debug-session: true
       depend-on:
         - publish_to_local_registry
     - identifier: build_app_android
@@ -50,6 +51,7 @@ batch:
         variables:
           TEST_SUITE: src/__tests__/build-app-android.test.ts
           CLI_REGION: us-east-2
+      debug-session: true
       depend-on:
         - publish_to_local_registry
     - identifier: >-
diff --git a/.codebuild/e2e_workflow_base.yml b/.codebuild/e2e_workflow_base.yml
@@ -41,6 +41,7 @@ batch:
         variables:
           TEST_SUITE: src/__tests__/build-app-swift.test.ts
           CLI_REGION: us-east-2
+      debug-session: true
       depend-on:
         - publish_to_local_registry
     - identifier: build_app_android
@@ -50,5 +51,6 @@ batch:
         variables:
           TEST_SUITE: src/__tests__/build-app-android.test.ts
           CLI_REGION: us-east-2
+      debug-session: true
       depend-on:
         - publish_to_local_registry
diff --git a/.codebuild/release_workflow.yml b/.codebuild/release_workflow.yml
@@ -18,10 +18,6 @@ batch:
       buildspec: .codebuild/test.yml
       depend-on:
         - build_linux
-    - identifier: lint
-      buildspec: .codebuild/lint.yml
-      depend-on:
-        - build_linux
     - identifier: verify_api_extract
       buildspec: .codebuild/verify_api_extract.yml
       depend-on:
diff --git a/.codebuild/run_android_modelgen_e2e_test.yml b/.codebuild/run_android_modelgen_e2e_test.yml
@@ -20,6 +20,8 @@ phases:
 
   build:
     commands:
+      - source ./shared-scripts.sh && _setupE2ETestsLinux
+      - codebuild-breakpoint
       - source ./shared-scripts.sh && _runE2ETestsLinux
   post_build:
     commands:
diff --git a/.codebuild/run_e2e_tests.yml b/.codebuild/run_e2e_tests.yml
@@ -11,6 +11,8 @@ env:
 phases:
   build:
     commands:
+      - source ./shared-scripts.sh && _setupE2ETestsLinux
+      - codebuild-breakpoint
       - source ./shared-scripts.sh && _runE2ETestsLinux
   post_build:
     commands:
diff --git a/.codebuild/run_ios_modelgen_e2e_test.yml b/.codebuild/run_ios_modelgen_e2e_test.yml
@@ -10,7 +10,12 @@ env:
 phases:
   build:
     commands:
+      - source ./shared-scripts.sh && _setupE2ETestsLinux
+      - codebuild-breakpoint
       - source ./shared-scripts.sh && _runE2ETestsLinux
+      - unset AWS_ACCESS_KEY_ID
+      - unset AWS_SECRET_ACCESS_KEY
+      - unset AWS_SESSION_TOKEN
       - export PATH_TO_MODELS=$CODEBUILD_SRC_DIR/packages/amplify-codegen-e2e-tests/test-apps/swift/amplify/generated
       - cd $PATH_TO_MODELS && zip -r models.zip models
       - aws s3 cp $PATH_TO_MODELS/models.zip s3://$ARTIFACT_BUCKET_NAME/models.zip
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,4 @@ test.out.log
 package-lock.json
 .idea
 scripts/.env
+.codebuild/debug_workflow.yml
diff --git a/package.json b/package.json
@@ -33,12 +33,15 @@
     "refresh-lockfile": "rimraf yarn.lock && yarn",
     "extract-api": "lerna run extract-api",
     "verify-api-extract": "yarn extract-api && ./scripts/verify-extract-api.sh",
-    "trigger-release": "source ./scripts/cloud-release.sh && release",
+    "trigger-release": "source ./scripts/cloud-release.sh && triggerRelease",
+    "trigger-tag-release": "source ./scripts/cloud-release.sh && triggerTagRelease",
     "view-test-artifact": "./scripts/view-test-artifacts.sh",
     "cleanup-stale-resources": "source ./scripts/cloud-utils.sh && cleanupStaleResources",
     "cloud-e2e": "source scripts/cloud-utils.sh && cloudE2E",
     "cloud-e2e-beta": "source scripts/cloud-utils.sh && cloudE2EBeta",
-    "split-e2e-tests": "yarn ts-node ./scripts/split-e2e-tests.ts && git add .codebuild/e2e_workflow.yml"
+    "split-e2e-tests": "yarn ts-node ./scripts/split-e2e-tests.ts && git add .codebuild/e2e_workflow.yml",
+    "view-test-artifacts": "yarn ts-node ./scripts/view-test-artifacts.ts",
+    "cloud-e2e-debug": "source scripts/cloud-utils.sh && cloudE2EDebug"
   },
   "bugs": {
     "url": "https://github.com/aws-amplify/amplify-codegen/issues"
@@ -71,11 +74,16 @@
     "@commitlint/config-conventional": "^17.0.3",
     "@commitlint/config-lerna-scopes": "^17.0.2",
     "@microsoft/api-extractor": "^7.33.5",
+    "@types/cli-progress": "3.11.0",
+    "@types/fs-extra": "^8.0.1",
+    "@types/glob": "^7.2.0",
     "@types/jest": "^27.0.0",
     "@types/js-yaml": "^4.0.0",
     "@typescript-eslint/eslint-plugin": "^4.0.0",
     "@typescript-eslint/parser": "^4.0.0",
     "amplify-headless-interface": "^1.13.1",
+    "aws-sdk": "2.1414.0",
+    "cli-progress": "3.12.0",
     "cmd-shim": "^3.0.3",
     "codecov": "^3.7.0",
     "commitizen": "^4.2.4",
@@ -92,6 +100,7 @@
     "eslint-plugin-prettier": "^3.1.2",
     "eslint-plugin-react": "^7.21.5",
     "eslint-plugin-spellcheck": "^0.0.17",
+    "execa": "^5.1.1",
     "glob": "^7.1.6",
     "graphql-transformer-core": "^8.0.0",
     "husky": "^3.0.3",
@@ -106,8 +115,7 @@
     "rimraf": "^3.0.0",
     "ts-jest": "^27.0.0",
     "ts-node": "^8.10.1",
-    "typescript": "4.7.4",
-    "execa": "^5.1.1"
+    "typescript": "4.7.4"
   },
   "resolutions": {
     "@aws-amplify/amplify-cli-core": "4.0.4",
diff --git a/scripts/cloud-release.sh b/scripts/cloud-release.sh
@@ -4,8 +4,19 @@ export RELEASE_ROLE_NAME=CodebuildDeveloper
 export RELEASE_PROFILE_NAME=AmplifyAPIPluginRelease
 export RELEASE_PROJECT_NAME=amplify-codegen-release-workflow
 
-function release {
+function triggerRelease {
+  triggerProjectBatch $RELEASE_ACCOUNT_PROD $RELEASE_ROLE_NAME "${RELEASE_PROFILE_NAME}Prod" $RELEASE_PROJECT_NAME "release"
+}
+
+function triggerTagRelease {
   branch_name=$(git branch --show-current)
-  echo "Running release workflow from branch ${branch_name}"
+  echo "Running tag release workflow from branch ${branch_name}"
+
+  git fetch origin
+  if [ $(git rev-parse HEAD) != $(git rev-parse origin/${branch_name}) ]
+  then
+    echo "You have local commits on branch ${branch_name} that are not pushed to origin. Push them before running the tag release workflow."
+    exit 1
+  fi
   triggerProjectBatch $RELEASE_ACCOUNT_PROD $RELEASE_ROLE_NAME "${RELEASE_PROFILE_NAME}Prod" $RELEASE_PROJECT_NAME $branch_name
 }
diff --git a/scripts/cloud-utils.sh b/scripts/cloud-utils.sh
@@ -85,3 +85,52 @@ function cleanupStaleResources {
   TARGET_BRANCH=$CURR_BRANCH
   triggerProject $E2E_ACCOUNT_PROD $CLEANUP_ROLE_NAME $CLEANUP_PROFILE_NAME $CLEANUP_PROJECT_NAME $TARGET_BRANCH
 }
+
+function triggerProjectBatchWithDebugSession {
+  account_number=$1
+  role_name=$2
+  profile_name=$3
+  project_name=$4
+  target_branch=$5
+  authenticate $account_number $role_name $profile_name
+  echo AWS Account: $account_number
+  echo Project: $project_name 
+  echo Target Branch: $target_branch
+  debug_spec=$(cat .codebuild/debug_workflow.yml)
+  RESULT=$(aws codebuild start-build-batch --region=$REGION --profile="${profile_name}" --project-name $project_name --source-version=$target_branch \
+    --debug-session-enabled \
+    --buildspec-override "$debug_spec" \
+    --environment-variables-override name=BRANCH_NAME,value=$target_branch,type=PLAINTEXT \
+    --query 'buildBatch.id' --output text)
+  echo "https://$REGION.console.aws.amazon.com/codesuite/codebuild/$account_number/projects/$project_name/batch/$RESULT?region=$REGION"
+}
+
+function cloudE2EDebug {
+  echo Generating the debug E2E buildspec
+  if [ $# -eq 0 ]; then
+    echo "Please provide the batch build id of codebuild"
+    exit 1
+  fi
+  generatedDebugSpecForFailedTests $1
+  echo Running Prod E2E Test Suite
+  E2E_ROLE_NAME=CodebuildDeveloper
+  E2E_PROFILE_NAME=AmplifyAPIE2EProd
+  E2E_PROJECT_NAME=amplify-codegen-e2e-workflow
+  TARGET_BRANCH=$CURR_BRANCH
+  triggerProjectBatchWithDebugSession $E2E_ACCOUNT_PROD $E2E_ROLE_NAME $E2E_PROFILE_NAME $E2E_PROJECT_NAME $TARGET_BRANCH
+}
+
+function generatedDebugSpecForFailedTests {
+  # Get temporary access for the account
+  E2E_ROLE_NAME=CodebuildDeveloper
+  E2E_PROFILE_NAME=AmplifyAPIE2EProd
+  authenticate $E2E_ACCOUNT_PROD $E2E_ROLE_NAME "$E2E_PROFILE_NAME"
+  local batch_build_id=$1
+  echo "Getting failed test suites"
+  failed_tests=$(aws codebuild batch-get-build-batches --profile="$E2E_PROFILE_NAME" --ids "$batch_build_id" --region us-east-1 --query 'buildBatches[0].buildGroups' | jq -c '.[] | select(.currentBuildSummary.buildStatus == "FAILED").identifier')
+  if [ -z "$failed_tests" ]; then
+    echo "No failed tests found in batch $1"
+    exit 0
+  fi
+  echo $failed_tests | xargs yarn ts-node ./scripts/split-e2e-tests.ts --debug
+}
diff --git a/scripts/split-e2e-tests.ts b/scripts/split-e2e-tests.ts
@@ -21,18 +21,20 @@ const REPO_ROOT = join(__dirname, '..');
 const TEST_TIMINGS_PATH = join(REPO_ROOT, 'scripts', '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 CODEBUILD_DEBUG_CONFIG_PATH = join (REPO_ROOT, '.codebuild', 'debug_workflow.yml');
 const RUN_SOLO = [];
 const EXCLUDE_TESTS = [
   'src/__tests__/build-app-swift.test.ts',
   'src/__tests__/build-app-android.test.ts',
 ];
+const DEBUG_FLAG = '--debug';
 
 export function loadConfigBase() {
   return yaml.load(fs.readFileSync(CODEBUILD_CONFIG_BASE_PATH, 'utf8'));
 }
-export function saveConfig(config: any): void {
+export function saveConfig(config: any, outputPath: string): void {
   const output = ['# auto generated file. DO NOT EDIT manually', yaml.dump(config, { noRefs: true })];
-  fs.writeFileSync(CODEBUILD_GENERATE_CONFIG_PATH, output.join('\n'));
+  fs.writeFileSync(outputPath, output.join('\n'));
 }
 export function loadTestTimings(): { timingData: { test: string; medianRuntime: number }[] } {
   return JSON.parse(fs.readFileSync(TEST_TIMINGS_PATH, 'utf-8'));
@@ -174,6 +176,7 @@ const splitTests = (
 };
 
 function main(): void {
+  const filteredTests = process.argv.slice(2);
   const configBase: any = loadConfigBase();
   const baseBuildGraph = configBase.batch['build-graph'];
   const splitE2ETests = splitTests(
@@ -189,19 +192,30 @@ function main(): void {
     (testSuites) => testSuites.filter((ts) => !EXCLUDE_TESTS.includes(ts)),
   );
 
+  let outputPath = CODEBUILD_GENERATE_CONFIG_PATH;
   let allBuilds = [...splitE2ETests];
+  if (filteredTests.length > 0) {
+    allBuilds = allBuilds.filter(build => filteredTests.includes(build.identifier));
+    if (filteredTests.includes(DEBUG_FLAG)) {
+      allBuilds = allBuilds.map(build => {
+        return { ...build, 'debug-session': true}
+      });
+      outputPath = CODEBUILD_DEBUG_CONFIG_PATH;
+    }
+  }
   const cleanupResources = {
     identifier: 'cleanup_e2e_resources',
     buildspec: '.codebuild/cleanup_e2e_resources.yml',
     env: {
       'compute-type': 'BUILD_GENERAL1_MEDIUM'
     },
-    'depend-on': [allBuilds[0].identifier]
+    'depend-on': allBuilds.length > 0 ? [allBuilds[0].identifier] : ['publish_to_local_registry'],
   }
   console.log(`Total number of splitted jobs: ${allBuilds.length}`)
   let currentBatch = [...baseBuildGraph, ...allBuilds, cleanupResources];
   configBase.batch['build-graph'] = currentBatch;
-  saveConfig(configBase);
+  saveConfig(configBase, outputPath);
+  console.log(`Successfully generated the buildspec at ${outputPath}`);
 }
 
 main();
diff --git a/scripts/view-test-artifacts.ts b/scripts/view-test-artifacts.ts
diff --git a/shared-scripts.sh b/shared-scripts.sh
diff --git a/yarn.lock b/yarn.lock
