merge from remote

.circleci/enable_api.exp

@@ -1,6 +1,6 @@
 #!/usr/bin/expect
 spawn ./.circleci/api.sh
-expect "Please select from one of the below mentioned services:\r"
+expect "Select from one of the below mentioned services:\r"
 send -- "\033\[B\r"
 expect "Provide a friendly name for your resource to be used as a label for this category in the project:"
 send -- "myAPI\r"
@@ -13,20 +13,20 @@ send -- "\r"
 expect "Choose the function runtime that you want to use:"
 send -- "\r"
 expect "Choose the function template that you want to use:"
-send -- "k\r"
+send -- "1\r"
 expect "Choose a DynamoDB data source option"
 send -- "j\r"
-expect "Please provide a friendly name for your resource that will be used to label this category in the project:"
+expect "Provide a friendly name"
 send -- "\r"
-expect "Please provide table name:"
+expect "Provide table name"
 send -- "\r"
-expect "What would you like to name this column:"
+expect "What would you like to name this column"
 send -- "itemNo\r"
-expect "Please choose the data type:"
-send -- "j\r"
+expect "Choose the data type"
+send -- "number\r"
 expect "Would you like to add another column?"
 send -- "n\r"
-expect "Please choose partition key for the table:"
+expect "Choose partition key for the table"
 send -- "\r"
 expect "Do you want to add a sort key to your table?"
 send -- "n\r"
@@ -39,9 +39,9 @@ send -- "n\r"
 expect "Do you want to edit the local lambda function now?"
 send -- "n\r"
 expect "Restrict API access"
-send -- "n\r"
+send -- "n"
 expect "Do you want to add another path?"
-send -- "N\r"
+send -- "n"
 set timeout 70
 expect "Are you sure you want to continue?\r"
 send -- "Y\r"

.circleci/enable_auth.exp

@@ -1,12 +1,12 @@
 #!/usr/bin/expect
 spawn ./.circleci/auth.sh
-expect "Do you want to use default authentication and security configuration?\r"
-send -- "\r"
-expect "How do you want users to be able to sign in when using your Cognito User Pool?\r"
+expect "Do you want to use the default authentication and security configuration?"
 send -- "\r"
-expect "Do you want to configure advanced settings?\r"
+expect "How do you want users to be able to sign in?"
 send -- "\r"
+expect "Do you want to configure advanced settings?"
+send -- "N\r"
 set timeout 70
-expect "Are you sure you want to continue?\r"
+expect "Are you sure you want to continue?"
 send -- "Y\r"
 interact

.circleci/lint_pr.sh

@@ -0,0 +1,12 @@
+set -xeo pipefail
+# extract the PR number from the PR link
+PR_NUM=${CIRCLE_PULL_REQUEST##*/}
+
+if [ -z "$PR_NUM" ]; then
+  echo "Could not determine PR number. Cannot determine fork point for linting. Skipping linting."
+  exit
+fi
+
+# get PR file list, filter out removed files, filter only JS/TS files, then pass to the linter
+curl -fsSL https://api.github.com/repos/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PR_REPONAME/pulls/$PR_NUM/files | jq -r '.[] | select(.status!="removed") | .filename' | grep -E '\.(js|jsx|ts|tsx)$' || true | xargs yarn eslint
+set +x

.circleci/local_publish_helpers.sh

@@ -12,11 +12,93 @@ function startLocalRegistry {
     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")
+function setNpmTag {
+    if [ -z $NPM_TAG ]; then
+        if [[ "$CIRCLE_BRANCH" =~ ^tagged-release ]]; then
+            if [[ "$CIRCLE_BRANCH" =~ ^tagged-release-without-e2e-tests\/.* ]]; then
+                export NPM_TAG="${CIRCLE_BRANCH/tagged-release-without-e2e-tests\//}"
+            elif [[ "$CIRCLE_BRANCH" =~ ^tagged-release\/.* ]]; then
+                export NPM_TAG="${CIRCLE_BRANCH/tagged-release\//}"
+            fi
+        fi
+        if [[ "$CIRCLE_BRANCH" == "beta" ]]; then
+            export NPM_TAG="beta"
+        fi
+    else
+        echo "NPM tag was already set!"
+    fi
+    echo $NPM_TAG
+}
+
+function uploadPkgCli {
+    aws configure --profile=s3-uploader set aws_access_key_id $S3_ACCESS_KEY
+    aws configure --profile=s3-uploader set aws_secret_access_key $S3_SECRET_ACCESS_KEY
+    aws configure --profile=s3-uploader set aws_session_token $S3_AWS_SESSION_TOKEN
+    cd out/
+    export hash=$(git rev-parse HEAD | cut -c 1-12)
+    export version=$(./amplify-pkg-linux-x64 --version)
+
+    if [[ "$CIRCLE_BRANCH" == "release" ]] || [[ "$CIRCLE_BRANCH" == "beta" ]] || [[ "$CIRCLE_BRANCH" =~ ^tagged-release ]]; then
+        tar -czvf amplify-pkg-linux-arm64.tgz amplify-pkg-linux-arm64
+        tar -czvf amplify-pkg-linux-x64.tgz amplify-pkg-linux-x64
+        tar -czvf amplify-pkg-macos-x64.tgz amplify-pkg-macos-x64
+        tar -czvf amplify-pkg-win-x64.tgz amplify-pkg-win-x64.exe
+
+        aws --profile=s3-uploader s3 cp amplify-pkg-win-x64.tgz s3://aws-amplify-cli-do-not-delete/$(echo $version)/amplify-pkg-win-x64-$(echo $hash).tgz
+        aws --profile=s3-uploader s3 cp amplify-pkg-macos-x64.tgz s3://aws-amplify-cli-do-not-delete/$(echo $version)/amplify-pkg-macos-x64-$(echo $hash).tgz
+        aws --profile=s3-uploader s3 cp amplify-pkg-linux-arm64.tgz s3://aws-amplify-cli-do-not-delete/$(echo $version)/amplify-pkg-linux-arm64-$(echo $hash).tgz
+        aws --profile=s3-uploader s3 cp amplify-pkg-linux-x64.tgz s3://aws-amplify-cli-do-not-delete/$(echo $version)/amplify-pkg-linux-x64-$(echo $hash).tgz
+
+        if [ "0" -ne "$(aws s3 ls s3://aws-amplify-cli-do-not-delete/$(echo $version)/amplify-pkg-linux-x64 | egrep -v "amplify-pkg-linux-x64-.*" | wc -l)" ]; then
+            echo "Cannot overwrite existing file at s3://aws-amplify-cli-do-not-delete/$(echo $version)/amplify-pkg-linux-x64.tgz"
+            exit 1
+        fi
+
+        aws --profile=s3-uploader s3 cp amplify-pkg-win-x64.tgz s3://aws-amplify-cli-do-not-delete/$(echo $version)/amplify-pkg-win-x64.tgz
+        aws --profile=s3-uploader s3 cp amplify-pkg-macos-x64.tgz s3://aws-amplify-cli-do-not-delete/$(echo $version)/amplify-pkg-macos-x64.tgz
+        aws --profile=s3-uploader s3 cp amplify-pkg-linux-arm64.tgz s3://aws-amplify-cli-do-not-delete/$(echo $version)/amplify-pkg-linux-arm64.tgz
+        aws --profile=s3-uploader s3 cp amplify-pkg-linux-x64.tgz s3://aws-amplify-cli-do-not-delete/$(echo $version)/amplify-pkg-linux-x64.tgz
+
+    else
+        tar -czvf amplify-pkg-linux-x64.tgz amplify-pkg-linux-x64
+        aws --profile=s3-uploader s3 cp amplify-pkg-linux-x64.tgz s3://aws-amplify-cli-do-not-delete/$(echo $version)/amplify-pkg-linux-x64-$(echo $hash).tgz
+    fi
+
+    cd ..
 }
 
+function generatePkgCli {
+  cd pkg
+
+  # install package depedencies
+  cp ../yarn.lock ./
+  yarn --production
+
+  # Optimize package size
+  yarn rimraf **/*.d.ts **/*.js.map **/*.d.ts.map **/README.md **/readme.md **/Readme.md **/CHANGELOG.md **/changelog.md **/Changelog.md **/HISTORY.md **/history.md **/History.md
+
+  # Restore .d.ts files required by @aws-amplify/codegen-ui at runtime
+  cp ../node_modules/typescript/lib/*.d.ts node_modules/typescript/lib/
+
+  # Transpile code for packaging
+  npx babel node_modules --extensions '.js,.jsx,.es6,.es,.ts' --copy-files --include-dotfiles -d ../build/node_modules
+
+  # Include third party licenses
+  cp ../Third_Party_Licenses.txt ../build/node_modules
+
+  # Build pkg cli
+  cp package.json ../build/node_modules/package.json
+  if [[ "$CIRCLE_BRANCH" == "release" ]] || [[ "$CIRCLE_BRANCH" == "beta" ]] || [[ "$CIRCLE_BRANCH" =~ ^tagged-release ]]; then
+    npx pkg -t node14-macos-x64,node14-linux-x64,node14-linux-arm64,node14-win-x64 ../build/node_modules --out-path ../out
+  else
+    npx pkg -t node14-linux-x64,node14-win-x64 ../build/node_modules --out-path ../out
+    mv ../out/amplify-pkg-linux ../out/amplify-pkg-linux-x64
+    mv ../out/amplify-pkg-win.exe ../out/amplify-pkg-win-x64.exe
+  fi
+
+
+  cd ..
+}
 function unsetNpmRegistryUrl {
     # Restore the original NPM and Yarn registry URLs
     npm set registry "https://registry.npmjs.org/"
@@ -76,6 +158,8 @@ function retry {
     SLEEP_DURATION=5
     FIRST_RUN=true
     n=0
+    FAILED_TEST_REGEX_FILE="./amplify-e2e-reports/amplify-e2e-failed-test.txt"
+    rm -f $FAILED_TEST_REGEX_FILE
     until [ $n -ge $MAX_ATTEMPTS ]
     do
         echo "Attempting $@ with max retries $MAX_ATTEMPTS"
@@ -134,15 +218,20 @@ function setAwsAccountCredentials {
 }
 
 function runE2eTest {
+    FAILED_TEST_REGEX_FILE="./amplify-e2e-reports/amplify-e2e-failed-test.txt"
+
     if [ -z "$FIRST_RUN" ] || [ "$FIRST_RUN" == "true" ]; then
         startLocalRegistry "$(pwd)/.circleci/verdaccio.yaml"
         setNpmRegistryUrlToLocal
         changeNpmGlobalPath
-        npm install -g @aws-amplify/cli
-        npm install -g amplify-app
-        amplify -v
-        amplify-app --version
         cd $(pwd)/packages/amplify-e2e-tests
     fi
-    yarn run e2e --detectOpenHandles --maxWorkers=3 $TEST_SUITE
+
+    if [ -f  $FAILED_TEST_REGEX_FILE ]; then
+        # read the content of failed tests
+        failedTests=$(<$FAILED_TEST_REGEX_FILE)
+        yarn run e2e --detectOpenHandles --maxWorkers=3 $TEST_SUITE -t "$failedTests"
+    else
+        yarn run e2e --detectOpenHandles --maxWorkers=3 $TEST_SUITE
+    fi
 }

.eslint-dictionary.json

@@ -0,0 +1,122 @@
+[
+  "amazonaws",
+  "apigw",
+  "appsync",
+  "archiver",
+  "argv",
+  "arn",
+  "arns",
+  "authorizer",
+  "awscloudformation",
+  "axios",
+  "backend",
+  "bitwise",
+  "bool",
+  "callout",
+  "circleci",
+  "cloudformation",
+  "cloudfront",
+  "codegen",
+  "cognito",
+  "cors",
+  "creds",
+  "datasource",
+  "decrypt",
+  "dict",
+  "dotenv",
+  "durations",
+  "dynamodb",
+  "elasticsearch",
+  "enum",
+  "execa",
+  "extensibility",
+  "extentions",
+  "facebook",
+  "foreach",
+  "formatter",
+  "frontend",
+  "func",
+  "generatable",
+  "globals",
+  "gmail",
+  "graphql",
+  "gunzip",
+  "homedir",
+  "iam",
+  "igrantable",
+  "indicies",
+  "integtestFn",
+  "iops",
+  "iteratively",
+  "javascript",
+  "jsdoc",
+  "keyless",
+  "lerna",
+  "linux",
+  "lockfile",
+  "lstat",
+  "macos",
+  "mfas",
+  "minify",
+  "modelfieldmapimpl",
+  "modelgen",
+  "mtime",
+  "nock",
+  "nodejs",
+  "nodejs12",
+  "nodejs14",
+  "nullability",
+  "nullable",
+  "oauth",
+  "oidc",
+  "openid",
+  "opensearch",
+  "parens",
+  "pathname",
+  "pipelined",
+  "positionally",
+  "postauthorcd",
+  "promisify",
+  "qref",
+  "readdir",
+  "readme",
+  "readonly",
+  "rekognition",
+  "reqheaders",
+  "resolvers",
+  "rimraf",
+  "schemadeployer",
+  "schemas",
+  "searchable",
+  "serializable",
+  "serverless",
+  "signup",
+  "startable",
+  "stderr",
+  "stdin",
+  "stdout",
+  "sumerian",
+  "tablename",
+  "testother",
+  "testschemadeployer",
+  "textract",
+  "timestamps",
+  "totp",
+  "tsconfig",
+  "typename",
+  "uibuilder",
+  "uint",
+  "unauth",
+  "updateamplify",
+  "userpool",
+  "userposts",
+  "utf",
+  "utils",
+  "versioned",
+  "vscode",
+  "writeable",
+  "xamznone",
+  "xcode",
+  "yaml",
+  "yyyymmddhhmmss"
+]