chore: merges main branch to extOverrides

.circleci/exec

@@ -0,0 +1,3 @@
+#/bin/bash
+
+exec "$@"

.circleci/local_publish_helpers.sh

@@ -4,51 +4,142 @@ custom_registry_url=http://localhost:4873
 default_verdaccio_package=verdaccio@5.1.2
 
 function startLocalRegistry {
-  # Start local registry
-  tmp_registry_log=`mktemp`
-  echo "Registry output file: $tmp_registry_log"
-  (cd && nohup npx ${VERDACCIO_PACKAGE:-$default_verdaccio_package} -c $1 &>$tmp_registry_log &)
-  # Wait for Verdaccio to boot
-  grep -q 'http address' <(tail -f $tmp_registry_log)
+    # Start local registry
+    tmp_registry_log=$(mktemp)
+    echo "Registry output file: $tmp_registry_log"
+    (cd && nohup npx ${VERDACCIO_PACKAGE:-$default_verdaccio_package} -c $1 &>$tmp_registry_log &)
+    # Wait for Verdaccio to boot
+    grep -q 'http address' <(tail -f $tmp_registry_log)
 }
 
 function loginToLocalRegistry {
-  # Login so we can publish packages
-  (cd && npx npm-auth-to-token@1.0.0 -u user -p password -e user@example.com -r "$custom_registry_url")
+    # Login so we can publish packages
+    (cd && npx npm-auth-to-token@1.0.0 -u user -p password -e user@example.com -r "$custom_registry_url")
 }
 
 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/"
+    # Restore the original NPM and Yarn registry URLs
+    npm set registry "https://registry.npmjs.org/"
+    yarn config set registry "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/"
+    # 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/"
 }
 
 function changeNpmGlobalPath {
-  mkdir -p ~/.npm-global
-  npm config set prefix '~/.npm-global'
-  export PATH=~/.npm-global/bin:$PATH
+    mkdir -p ~/.npm-global
+    npm config set prefix '~/.npm-global'
+    export PATH=~/.npm-global/bin:$PATH
 }
 
 function changeSudoNpmGlobalPath {
-  mkdir -p ~/.npm-global-sudo
-  npm config set prefix '~/.npm-global-sudo'
-  export PATH=~/.npm-global/bin:$PATH
+    mkdir -p ~/.npm-global-sudo
+    npm config set prefix '~/.npm-global-sudo'
+    export PATH=~/.npm-global/bin:$PATH
 }
 
 function setNpmRegistryUrlToLocal {
-  # Set registry to local registry
-  npm set registry "$custom_registry_url"
-  yarn config set registry "$custom_registry_url"
+    # Set registry to local registry
+    npm set registry "$custom_registry_url"
+    yarn config set registry "$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"
+    # Set registry to local registry
+    sudo npm set registry "$custom_registry_url"
+    sudo yarn config set registry "$custom_registry_url"
+}
+
+function useChildAccountCredentials {
+    if [ -z "$USE_PARENT_ACCOUNT" ]; then
+        export AWS_PAGER=""
+        export ORGANIZATION_SIZE=$(aws organizations list-accounts | jq '.Accounts | length')
+        export CREDS=$(aws sts assume-role --role-arn arn:aws:iam::$(aws organizations list-accounts | jq -c -r ".Accounts [$(($RANDOM % $ORGANIZATION_SIZE))].Id"):role/OrganizationAccountAccessRole --role-session-name testSession$((1 + $RANDOM % 10000)) --duration-seconds 3600)
+        if [ -z $(echo $CREDS | jq -c -r '.AssumedRoleUser.Arn') ]; then
+            echo "Unable to assume child account role. Falling back to parent AWS account"
+        else
+            echo "Using account credentials for $(echo $CREDS | jq -c -r '.AssumedRoleUser.Arn')"
+            export AWS_ACCESS_KEY_ID=$(echo $CREDS | jq -c -r ".Credentials.AccessKeyId")
+            export AWS_SECRET_ACCESS_KEY=$(echo $CREDS | jq -c -r ".Credentials.SecretAccessKey")
+            export AWS_SESSION_TOKEN=$(echo $CREDS | jq -c -r ".Credentials.SessionToken")
+        fi
+    else
+        echo "Using parent account credentials."
+    fi
+}
+
+function retry {
+    MAX_ATTEMPTS=2
+    SLEEP_DURATION=5
+    n=0
+    until [ $n -ge $MAX_ATTEMPTS ]
+    do
+        echo "Attempting $@ with max retries $MAX_ATTEMPTS"
+        "$@" && break
+        n=$[$n+1]
+        echo "Attempt $n completed."
+        sleep $SLEEP_DURATION
+    done
+    if [ $n -ge $MAX_ATTEMPTS ]; then
+        echo "failed: ${@}" >&2
+        exit 1
+    fi
+
+    resetAwsAccountCredentials
+    aws cloudwatch put-metric-data --metric-name FlakyE2ETests --namespace amplify-cli-e2e-tests --unit Count --value $n --dimensions testFile=$TEST_SUITE
+    echo "Attempt $n succeeded."
+}
+
+function resetAwsAccountCredentials {
+    if [ -z "$AWS_ACCESS_KEY_ID_ORIG" ]; then
+        echo "AWS Access Key environment variable is already set"
+    else
+        export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID_ORIG
+    fi
+    if [ -z "$AWS_SECRET_ACCESS_KEY_ORIG" ]; then
+        echo "AWS Secret Access Key environment variable is already set"
+    else
+        export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY_ORIG
+    fi
+    if [ -z "$AWS_SESSION_TOKEN_ORIG" ]; then
+        echo "AWS Session Token environment variable is already set"
+    else
+        export AWS_SESSION_TOKEN=$AWS_SESSION_TOKEN_ORIG
+    fi
+}
+
+function setAwsAccountCredentials {
+    resetAwsAccountCredentials
+    export AWS_ACCESS_KEY_ID_ORIG=$AWS_ACCESS_KEY_ID
+    export AWS_SECRET_ACCESS_KEY_ORIG=$AWS_SECRET_ACCESS_KEY
+    export AWS_SESSION_TOKEN_ORIG=$AWS_SESSION_TOKEN
+    if [[ "$OSTYPE" == "msys" ]]; then
+        # windows provided by circleci has this OSTYPE
+        useChildAccountCredentials
+    else
+        echo "OSTYPE is $OSTYPE"
+        curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+        unzip -o awscliv2.zip >/dev/null
+        export PATH=$PATH:$(pwd)/aws/dist
+        useChildAccountCredentials
+    fi
+}
+
+function runE2eTest {
+    startLocalRegistry "$(pwd)/.circleci/verdaccio.yaml"
+    setNpmRegistryUrlToLocal
+    changeNpmGlobalPath
+    npm install -g @aws-amplify/cli
+    npm install -g amplify-app
+    amplify -v
+    amplify-app --version
+    setAwsAccountCredentials
+    cd $(pwd)/packages/amplify-e2e-tests
+    yarn run e2e --detectOpenHandles --maxWorkers=3 $TEST_SUITE
+    EXIT_CODE=$?
+    unsetNpmRegistryUrl
+    return $EXIT_CODE
 }

package.json

@@ -7,13 +7,14 @@
     "test": "lerna run test",
     "test-ci": "lerna run test --concurrency 1 -- --ci -i",
     "e2e": "lerna run e2e",
+    "cloud-e2e": "CURR_BRANCH=$(git branch | awk '/\\*/{printf \"%s\", $2}') && UPSTREAM_BRANCH=run-e2e/$USER/$CURR_BRANCH && git push $(git remote -v | grep aws-amplify/amplify-cli | head -n1 | awk '{print $1;}') $CURR_BRANCH:$UPSTREAM_BRANCH --no-verify --force-with-lease && echo \"\n\n 🏃 E2E test are running at:\nhttps://app.circleci.com/pipelines/github/aws-amplify/amplify-cli?branch=$UPSTREAM_BRANCH\"",
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx --quiet",
     "lint-fix": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
     "clean": "lerna run clean && lerna exec yarn rimraf tsconfig.tsbuildinfo && lerna clean --yes && yarn rimraf node_modules",
     "build": "lerna run build",
     "build-tests": "lerna run build-tests",
-    "production-build": "yarn --frozen-lockfile && lerna run build --concurrency 3 --stream",
-    "dev-build": "yarn && lerna run build",
+    "production-build": "yarn --frozen-lockfile --cache-folder ~/.cache/yarn && lerna run build --concurrency 3 --stream",
+    "dev-build": "yarn --cache-folder ~/.cache/yarn && lerna run build",
     "link-aa-dev": "cd packages/amplify-app && ln -s \"$(pwd)/bin/amplify-app\" \"$(yarn global bin)/amplify-app-dev\" && cd -",
     "rm-aa-dev-link": "rm -f \"$(yarn global bin)/amplify-app-dev\"",
     "link-dev": "cd packages/amplify-cli && ln -s \"$(pwd)/bin/amplify\" \"$(yarn global bin)/amplify-dev\" && cd -",

packages/amplify-app/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.0.13](https://github.com/aws-amplify/amplify-cli/compare/amplify-app@3.0.12...amplify-app@3.0.13) (2021-09-27)
+
+**Note:** Version bump only for package amplify-app
+
+
+
+
+
 ## [3.0.12](https://github.com/aws-amplify/amplify-cli/compare/amplify-app@3.0.11...amplify-app@3.0.12) (2021-09-18)
 
 **Note:** Version bump only for package amplify-app

packages/amplify-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amplify-app",
-  "version": "3.0.12",
+  "version": "3.0.13",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -30,8 +30,8 @@
   "dependencies": {
     "amplify-frontend-android": "2.15.4",
     "amplify-frontend-flutter": "0.4.4",
-    "amplify-frontend-ios": "2.20.14",
-    "amplify-frontend-javascript": "2.24.1",
+    "amplify-frontend-ios": "2.20.15",
+    "amplify-frontend-javascript": "2.24.2",
     "chalk": "^4.1.1",
     "execa": "^5.1.1",
     "fs-extra": "^8.1.0",

packages/amplify-category-analytics/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.21.22](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-analytics@2.21.21...amplify-category-analytics@2.21.22) (2021-09-27)
+
+**Note:** Version bump only for package amplify-category-analytics
+
+
+
+
+
 ## [2.21.21](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-analytics@2.21.20...amplify-category-analytics@2.21.21) (2021-09-18)
 
 **Note:** Version bump only for package amplify-category-analytics

packages/amplify-category-analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-analytics",
-  "version": "2.21.21",
+  "version": "2.21.22",
   "description": "amplify-cli analytics plugin",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "aws"
   ],
   "dependencies": {
-    "amplify-cli-core": "1.29.0",
+    "amplify-cli-core": "1.30.0",
     "fs-extra": "^8.1.0",
     "inquirer": "^7.3.3",
     "uuid": "^3.4.0"

packages/amplify-category-api/CHANGELOG.md

@@ -3,6 +3,27 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.32.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-api@2.31.23...amplify-category-api@2.32.0) (2021-09-27)
+
+
+### Bug Fixes
+
+* [#8223](https://github.com/aws-amplify/amplify-cli/issues/8223), conversion to typescript ([#8245](https://github.com/aws-amplify/amplify-cli/issues/8245)) ([096e6ca](https://github.com/aws-amplify/amplify-cli/commit/096e6ca19b94aa40ef249ea98d008380395afa16))
+
+
+### Features
+
+* Flag to allow schema changes that require table replacement ([#8144](https://github.com/aws-amplify/amplify-cli/issues/8144)) ([2d4e65a](https://github.com/aws-amplify/amplify-cli/commit/2d4e65acfd034d33c6fa8ac1f5f8582e7e3bc399))
+
+
+### Reverts
+
+* Revert "feat: Flag to allow schema changes that require table replacement (#8144)" (#8268) ([422dd04](https://github.com/aws-amplify/amplify-cli/commit/422dd04425c72aa7276e086d38ce4d5f4681f9f3)), closes [#8144](https://github.com/aws-amplify/amplify-cli/issues/8144) [#8268](https://github.com/aws-amplify/amplify-cli/issues/8268)
+
+
+
+
+
 ## [2.31.23](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-api@2.31.22...amplify-category-api@2.31.23) (2021-09-18)
 
 **Note:** Version bump only for package amplify-category-api

packages/amplify-category-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-api",
-  "version": "2.31.23",
+  "version": "2.32.0",
   "description": "amplify-cli api plugin",
   "repository": {
     "type": "git",
@@ -63,15 +63,15 @@
     "@aws-cdk/region-info": "~1.124.0",
     "@graphql-tools/merge": "^6.0.18",
     "@octokit/rest": "^18.0.9",
-    "amplify-cli-core": "1.29.0",
+    "amplify-cli-core": "1.30.0",
     "amplify-headless-interface": "1.10.0",
     "amplify-util-headless-input": "1.5.4",
     "chalk": "^4.1.1",
     "constructs": "^3.3.125",
     "fs-extra": "^8.1.0",
     "graphql": "^14.5.8",
-    "graphql-relational-schema-transformer": "2.18.6",
-    "graphql-transformer-core": "6.29.7",
+    "graphql-relational-schema-transformer": "2.18.7",
+    "graphql-transformer-core": "6.30.0",
     "inquirer": "^7.3.3",
     "js-yaml": "^4.0.0",
     "lodash": "^4.17.21",

packages/amplify-category-auth/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.38.2](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-auth@2.38.1...amplify-category-auth@2.38.2) (2021-09-27)
+
+
+### Bug Fixes
+
+* add missing await, fix import paths ([#8199](https://github.com/aws-amplify/amplify-cli/issues/8199)) ([51c4dd9](https://github.com/aws-amplify/amplify-cli/commit/51c4dd9c021d894fe2c06fc005e1e1960fe4529c))
+* **amplify-category-auth:** update front end config on pull ([#8173](https://github.com/aws-amplify/amplify-cli/issues/8173)) ([da2b008](https://github.com/aws-amplify/amplify-cli/commit/da2b0083add2f5b10520efade8628080a34c8791))
+
+
+
+
+
 ## [2.38.1](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-auth@2.38.0...amplify-category-auth@2.38.1) (2021-09-20)
 
 

packages/amplify-category-auth/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-auth",
-  "version": "2.38.1",
+  "version": "2.38.2",
   "description": "amplify-cli authentication plugin",
   "repository": {
     "type": "git",
@@ -23,10 +23,10 @@
     "test-watch": "jest --watch"
   },
   "dependencies": {
-    "amplify-cli-core": "1.29.0",
+    "amplify-cli-core": "1.30.0",
     "amplify-headless-interface": "1.10.0",
     "amplify-util-headless-input": "1.5.4",
-    "amplify-util-import": "1.5.12",
+    "amplify-util-import": "1.5.13",
     "aws-cdk": "~1.124.0",
     "aws-sdk": "^2.963.0",
     "chalk": "^4.1.1",

packages/amplify-category-function/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.35.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-function@2.34.7...amplify-category-function@2.35.0) (2021-09-27)
+
+
+### Features
+
+* Flag to allow schema changes that require table replacement ([#8144](https://github.com/aws-amplify/amplify-cli/issues/8144)) ([2d4e65a](https://github.com/aws-amplify/amplify-cli/commit/2d4e65acfd034d33c6fa8ac1f5f8582e7e3bc399))
+
+
+### Reverts
+
+* Revert "feat: Flag to allow schema changes that require table replacement (#8144)" (#8268) ([422dd04](https://github.com/aws-amplify/amplify-cli/commit/422dd04425c72aa7276e086d38ce4d5f4681f9f3)), closes [#8144](https://github.com/aws-amplify/amplify-cli/issues/8144) [#8268](https://github.com/aws-amplify/amplify-cli/issues/8268)
+
+
+
+
+
 ## [2.34.7](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-function@2.34.6...amplify-category-function@2.34.7) (2021-09-18)
 
 **Note:** Version bump only for package amplify-category-function

packages/amplify-category-function/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-function",
-  "version": "2.34.7",
+  "version": "2.35.0",
   "description": "amplify-cli function plugin",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     "aws"
   ],
   "dependencies": {
-    "amplify-cli-core": "1.29.0",
+    "amplify-cli-core": "1.30.0",
     "amplify-function-plugin-interface": "1.9.1",
     "archiver": "^5.3.0",
     "aws-sdk": "^2.963.0",
@@ -32,7 +32,7 @@
     "folder-hash": "^4.0.1",
     "fs-extra": "^8.1.0",
     "globby": "^11.0.3",
-    "graphql-transformer-core": "6.29.7",
+    "graphql-transformer-core": "6.30.0",
     "inquirer": "^7.3.3",
     "inquirer-datepicker": "^2.0.0",
     "jstreemap": "^1.28.2",