merge cb into dev branch

.circleci/config.yml

@@ -67,7 +67,8 @@ jobs:
       - restore_cache:
           key: >-
             amplify-cli-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
-      - run: yarn run production-build
+      - run: yarn --immutable
+      - run: yarn production-build
       - save_cache:
           key: >-
             amplify-cli-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
@@ -167,7 +168,7 @@ jobs:
             source .circleci/local_publish_helpers.sh
             amplify -v
             cd packages/amplify-console-integration-tests
-            retry yarn run console-integration --no-cache --maxWorkers=4
+            retry yarn console-integration --no-cache --maxWorkers=4
           name: Run Amplify Console integration tests
           no_output_timeout: 90m
       - run:

.circleci/local_publish_helpers.sh

@@ -57,7 +57,7 @@ function generatePkgCli {
 
   # install package depedencies
   cp ../yarn.lock ./
-  yarn --production
+  yarn workspaces focus --production
 
   # Optimize package size
   find . \
@@ -143,17 +143,17 @@ function verifyPkgCli {
 function unsetNpmRegistryUrl {
     # Restore the original NPM and Yarn registry URLs
     npm set registry "https://registry.npmjs.org/"
-    yarn config set registry "https://registry.npmjs.org/"
+    yarn config set npmRegistryServer "https://registry.npmjs.org/"
 }
 
 function unsetSudoNpmRegistryUrl {
     # Restore the original NPM and Yarn registry URLs
     sudo npm set registry "https://registry.npmjs.org/"
-    sudo yarn config set registry "https://registry.npmjs.org/"
+    sudo yarn config set npmRegistryServer "https://registry.npmjs.org/"
 }
 
 function changeNpmGlobalPath {
-    mkdir -p ~/.npm-global
+    mkdir -p ~/.npm-global/{bin,lib}
     npm config set prefix '~/.npm-global'
     export PATH=~/.npm-global/bin:$PATH
 }
@@ -167,13 +167,13 @@ function changeSudoNpmGlobalPath {
 function setNpmRegistryUrlToLocal {
     # Set registry to local registry
     npm set registry "$custom_registry_url"
-    yarn config set registry "$custom_registry_url"
+    yarn config set npmRegistryServer "$custom_registry_url"
 }
 
 function setSudoNpmRegistryUrlToLocal {
     # Set registry to local registry
     sudo npm set registry "$custom_registry_url"
-    sudo yarn config set registry "$custom_registry_url"
+    sudo yarn config set npmRegistryServer "$custom_registry_url"
 }
 
 function useChildAccountCredentials {
@@ -267,16 +267,45 @@ function setAwsAccountCredentials {
         useChildAccountCredentials
     fi
 }
-
 function runE2eTest {
     FAILED_TEST_REGEX_FILE="./amplify-e2e-reports/amplify-e2e-failed-test.txt"
 
     if [ -f  $FAILED_TEST_REGEX_FILE ]; then
         # read the content of failed tests
         failedTests=$(<$FAILED_TEST_REGEX_FILE)
-        yarn run e2e --forceExit --no-cache --maxWorkers=4 $TEST_SUITE -t "$failedTests"
+        yarn e2e --forceExit --no-cache --maxWorkers=4 $TEST_SUITE -t "$failedTests"
+    else
+        yarn e2e --forceExit --no-cache --maxWorkers=4 $TEST_SUITE
+    fi
+}
+
+function runE2eTestCb {
+    _setupCoverage
+    FAILED_TEST_REGEX_FILE="./amplify-e2e-reports/amplify-e2e-failed-test.txt"
+
+    if [ -f  $FAILED_TEST_REGEX_FILE ]; then
+        # read the content of failed tests
+        failedTests=$(<$FAILED_TEST_REGEX_FILE)
+        NODE_V8_COVERAGE=$E2E_TEST_COVERAGE_DIR yarn e2e --forceExit --no-cache --maxWorkers=4 $TEST_SUITE -t "$failedTests"
     else
-        yarn run e2e --forceExit --no-cache --maxWorkers=4 $TEST_SUITE
+        NODE_V8_COVERAGE=$E2E_TEST_COVERAGE_DIR yarn e2e --forceExit --no-cache --maxWorkers=4 $TEST_SUITE
+    fi
+}
+
+function _setupCoverage {
+    _teardownCoverage
+    echo "Setup Coverage ($E2E_TEST_COVERAGE_DIR)"
+    if [ ! -d $E2E_TEST_COVERAGE_DIR ]
+    then
+        mkdir -p $E2E_TEST_COVERAGE_DIR
+    fi
+}
+
+function _teardownCoverage {
+    if [ -d $E2E_TEST_COVERAGE_DIR ]
+    then
+        echo "Teardown Coverage ($E2E_TEST_COVERAGE_DIR)"
+        rm -r $E2E_TEST_COVERAGE_DIR
     fi
 }
 

.circleci/publish-codebuild.sh

@@ -1,11 +1,23 @@
 #!/bin/bash -e
+export BRANCH_NAME="$(git symbolic-ref HEAD --short 2>/dev/null)"
+if [ "$BRANCH_NAME" = "" ] ; then
+  BRANCH_NAME="$(git rev-parse HEAD | xargs git name-rev | cut -d' ' -f2 | sed 's/remotes\/origin\///g')";
+fi
+git checkout $BRANCH_NAME
+echo "fetching tags"
+git fetch --tags https://github.com/aws-amplify/amplify-cli
 
 # lerna has a bug (https://github.com/lerna/lerna/issues/1066) where failed publishes do not set the exit code properly
 # this causes the script to keep running even after failed publishes
 # this function forces failed publishes to exit on failure
 function lernaPublishExitOnFailure {
   # exit on failure
   set -e
+  if [[ "$LOCAL_PUBLISH_TO_LATEST" == "true" ]]; then
+    # registy URL update changes .yarnrc.yml file
+    git update-index --assume-unchanged .yarnrc.yml
+  fi
+
   # run lerna publish with the args that were passed to this function
   # duplicate stdout to a temp file
   # grep the temp file for the lerna err token and return exit 1 if found (-v option inverts grep exit code)
@@ -34,13 +46,13 @@ else
   git config --global user.name $GITHUB_USER
 fi
 
-if [[ "$CIRCLE_BRANCH" =~ ^tagged-release ]]; then
-  if [[ "$CIRCLE_BRANCH" =~ ^tagged-release-without-e2e-tests\/.* ]]; then
+if [[ "$BRANCH_NAME" =~ ^tagged-release ]]; then
+  if [[ "$BRANCH_NAME" =~ ^tagged-release-without-e2e-tests\/.* ]]; then
     # Remove tagged-release-without-e2e-tests/
-    export NPM_TAG="${CIRCLE_BRANCH/tagged-release-without-e2e-tests\//}"
-  elif [[ "$CIRCLE_BRANCH" =~ ^tagged-release\/.* ]]; then
+    export NPM_TAG="${BRANCH_NAME/tagged-release-without-e2e-tests\//}"
+  elif [[ "$BRANCH_NAME" =~ ^tagged-release\/.* ]]; then
     # Remove tagged-release/
-    export NPM_TAG="${CIRCLE_BRANCH/tagged-release\//}"
+    export NPM_TAG="${BRANCH_NAME/tagged-release\//}"
   fi
   if [ -z "$NPM_TAG" ]; then
     echo "Tag name is missing. Name your branch with either tagged-release/<tag-name> or tagged-release-without-e2e-tests/<tag-name>"
@@ -56,7 +68,7 @@ if [[ "$CIRCLE_BRANCH" =~ ^tagged-release ]]; then
   fi
 
 # @latest release
-elif [[ "$CIRCLE_BRANCH" == "release" ]]; then
+elif [[ "$BRANCH_NAME" == "release" ]]; then
   # create release commit and release tags
   npx lerna version --exact --conventional-commits --conventional-graduate --yes --no-push --include-merged-tags --message "chore(release): Publish latest [ci skip]"
 
@@ -70,7 +82,7 @@ elif [[ "$CIRCLE_BRANCH" == "release" ]]; then
   fi
 
   # push release commit
-  git push origin "$CIRCLE_BRANCH"
+  git push origin "$BRANCH_NAME"
 
   # push release tags
   git tag --points-at HEAD | xargs git push origin
@@ -88,33 +100,33 @@ elif [[ "$CIRCLE_BRANCH" == "release" ]]; then
   git push origin hotfix
 
 # release candidate or local publish for testing / building binary
-elif [[ "$CIRCLE_BRANCH" =~ ^run-e2e-with-rc\/.* ]] || [[ "$CIRCLE_BRANCH" =~ ^release_rc\/.* ]] || [[ "$LOCAL_PUBLISH_TO_LATEST" == "true" ]]; then
+elif [[ "$BRANCH_NAME" =~ ^run-e2e-with-rc\/.* ]] || [[ "$BRANCH_NAME" =~ ^release_rc\/.* ]] || [[ "$LOCAL_PUBLISH_TO_LATEST" == "true" ]]; then
 
   # force @aws-amplify/cli-internal to be versioned in case this pipeline run does not have any commits that modify the CLI packages
   if [[ "$LOCAL_PUBLISH_TO_LATEST" == "true" ]]; then
     force_publish_local_args="--force-publish '@aws-amplify/cli-internal'"
   fi
   # create release commit and release tags
-  git checkout "${CODEBUILD_WEBHOOK_TRIGGER#branch/*}" && npx lerna version --preid=rc.$CODEBUILD_RESOLVED_SOURCE_VERSION --exact --conventional-prerelease --conventional-commits --yes --no-push --include-merged-tags --message "chore(release): Publish rc [ci skip]" $(echo $force_publish_local_args) --no-commit-hooks
+  npx lerna version --preid=rc.$(git rev-parse --short HEAD) --exact --conventional-prerelease --conventional-commits --yes --no-push --include-merged-tags --message "chore(release): Publish rc [ci skip]" $(echo $force_publish_local_args) --no-commit-hooks
 
 
   # if publishing locally to verdaccio
   if [[ "$LOCAL_PUBLISH_TO_LATEST" == "true" ]]; then
     # publish to verdaccio with no dist tag (default to latest)
-    lernaPublishExitOnFailure from-package --git-head $CODEBUILD_RESOLVED_SOURCE_VERSION --yes --no-push
+    lernaPublishExitOnFailure from-git --yes --no-push
     echo "Published packages to verdaccio"
     echo "Exiting without pushing release commit or release tags"
     exit 0
   fi
 
   # publish versions that were just computed
-  lernaPublishExitOnFailure from-package --git-head $CODEBUILD_RESOLVED_SOURCE_VERSION --yes --no-push --dist-tag rc
+  lernaPublishExitOnFailure from-git --yes --no-push --dist-tag rc
 
   # push release commit
-  git push origin "${CODEBUILD_WEBHOOK_TRIGGER#branch/*}"
+  git push origin "$BRANCH_NAME"
 
   # push release tags
   git tag --points-at HEAD | xargs git push origin
 else
-  echo "branch name" "${CODEBUILD_WEBHOOK_TRIGGER#branch/*}" "did not match any branch publish rules. Skipping publish"
+  echo "branch name" "$BRANCH_NAME" "did not match any branch publish rules. Skipping publish"
 fi

.circleci/publish.sh

@@ -9,6 +9,12 @@ function lernaPublishExitOnFailure {
   # run lerna publish with the args that were passed to this function
   # duplicate stdout to a temp file
   # grep the temp file for the lerna err token and return exit 1 if found (-v option inverts grep exit code)
+
+  if [[ "$LOCAL_PUBLISH_TO_LATEST" == "true" ]]; then
+    # registy URL update changes .yarnrc.yml file
+    git update-index --assume-unchanged .yarnrc.yml
+  fi
+
   npx lerna publish "$@" | tee /tmp/publish-results && grep -qvz "lerna ERR!" < /tmp/publish-results
 }
 

.circleci/scan_artifacts.ts

@@ -17,10 +17,10 @@ export const hasMatchingContentInFolder = (patterns: string[], folder: string, e
     return true;
   } catch (e) {
     // When there is no match exit code is set to 1
-    if (e.exitCode === 1) {
+    if ((e as { exitCode: number })?.exitCode === 1) {
       return false;
     }
-    if (e.message.includes('No such file or directory')) {
+    if ((e as { message: string })?.message?.includes('No such file or directory')) {
       console.log('No artifacts found at:', folder);
       return false;
     }
@@ -30,7 +30,7 @@ export const hasMatchingContentInFolder = (patterns: string[], folder: string, e
 
 const main = () => {
   const envVarNameWithCredentialValues = (process.env.ENV_VAR_WITH_SECRETS || '').split(',').map((v) => v.trim());
-  const values = envVarNameWithCredentialValues.map((v) => process.env[v]).filter(Boolean);
+  const values = envVarNameWithCredentialValues.map((v) => process.env[v]).filter((item): item is string => !!item);
   if (values.length) {
     for (let folder of ARTIFACT_STORAGE_PATH_ALLOW_LIST) {
       if (folder.startsWith('~/')) {

.circleci/validate_cdk_version.ts

@@ -2,12 +2,12 @@ import { exec } from 'child_process';
 
 // @aws-cdk/core indicates CDK v1.
 exec('yarn why @aws-cdk/core', (err, stdout, stderr) => {
-  const cdkV1AbsenceIndicator = "We couldn't find a match";
-  if (stdout.toString().includes(cdkV1AbsenceIndicator) || stderr.toString().includes(cdkV1AbsenceIndicator)) {
-    console.log('Success! CDK V1 not found');
-  } else {
+  const cdkV1PresenceIndicator = '@aws-cdk/core';
+  if (stdout.toString().includes(cdkV1PresenceIndicator) || stderr.toString().includes(cdkV1PresenceIndicator)) {
     console.log('Failure! Found CDK V1 references');
     console.log(stdout.toString());
     process.exit(1);
+  } else {
+    console.log('Success! CDK V1 not found');
   }
 });

.eslint-dictionary.json

@@ -214,6 +214,7 @@
   "jsconfig",
   "jsdoc",
   "json2xml",
+  "junit",
   "jwks",
   "keyless",
   "keyphrase",
@@ -431,6 +432,7 @@
   "wildcard",
   "winston",
   "workspace",
+  "workspaces",
   "writeable",
   "xamznone",
   "xcconfig",
@@ -439,8 +441,6 @@
   "xray",
   "yaml",
   "yarnrc",
-  "ulid",
-  "urlencoded",
   "yesno",
   "yyyymmddhhmmss",
   "zoneinfo"

.eslintrc.js

@@ -38,6 +38,7 @@ module.exports = {
     },
   },
   rules: {
+    '@typescript-eslint/switch-exhaustiveness-check': 'error',
     '@typescript-eslint/no-var-requires': 'off',
     '@typescript-eslint/no-floating-promises': 'error',
     '@typescript-eslint/no-misused-promises': 'error',

.gitattributes

@@ -0,0 +1,3 @@
+/.yarn/releases/** binary
+/.yarn/plugins/** binary
+/scripts/.yarn/releases/** binary

.github/CODEOWNERS

@@ -1,6 +1,15 @@
 # Amplify CLI Team owns the full repo by default.
+
 * @aws-amplify/amplify-cli
 
 # Add Data team folks focused on GQL transform/codegen to ownership for packages which will be migrated, in addition to the existing cli team.
+
 /packages/amplify-graphiql-explorer @aws-amplify/amplify-cli @aws-amplify/amplify-data-buildtime
 /packages/amplify-velocity-template @aws-amplify/amplify-cli @aws-amplify/amplify-data-buildtime
+
+# Add folks focused on reviewing changes to CI/CD scripts/buildspecs
+
+/.circleci/ @aws-amplify/amplify-cli-admins 
+/scripts/ @aws-amplify/amplify-cli-admins 
+/shared-scripts.sh @aws-amplify/amplify-cli-admins 
+/codebuild_specs/ @aws-amplify/amplify-cli-admins 

.gitignore

@@ -1,7 +1,15 @@
+.yarn/*
+.bin/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
 **/.DS_Store
 .circleci/generated_config.yml
 scripts/cci-job.data.json
 scripts/cci-test.data.json
+scripts/.yarn/*
 artifacts/cci-workflow-results.json
 artifacts/cci-workflow-results.html
 build

.vscode/settings.json

@@ -15,5 +15,11 @@
   },
   "prettier.requireConfig": true,
   "prettier.configPath": "./.prettierrc",
-  "prettier.prettierPath": "../node_modules/prettier"
+  "search.exclude": {
+    "**/.yarn": true,
+    "**/.pnp.*": true
+  },
+  "typescript.enablePromptUseWorkspaceTsdk": true,
+  "prettier.prettierPath": "../node_modules/prettier",
+  "jest.jestCommandLine": "./node_modules/.bin/jest"
 }