Merge remote-tracking branch 'upstream/master' into param-bound

aws-amplify · May 20, 2021 · d0ad684 · d0ad684
2 parents 95ec526 + 572ddbd
commit d0ad684
Show file tree

Hide file tree

Showing 169 changed files with 5,388 additions and 611 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1135,30 +1135,22 @@ jobs:
     environment:
       TEST_SUITE: src/__tests__/function_5.test.ts
       CLI_REGION: ap-northeast-1
-  defer-init-push-amplify_e2e_tests:
-    working_directory: ~/repo
-    docker: *ref_1
-    resource_class: large
-    steps: *ref_4
-    environment:
-      TEST_SUITE: src/__tests__/defer-init-push.test.ts
-      CLI_REGION: ap-southeast-1
   configure-project-amplify_e2e_tests:
     working_directory: ~/repo
     docker: *ref_1
     resource_class: large
     steps: *ref_4
     environment:
       TEST_SUITE: src/__tests__/configure-project.test.ts
-      CLI_REGION: ap-southeast-2
+      CLI_REGION: ap-southeast-1
   api_4-amplify_e2e_tests:
     working_directory: ~/repo
     docker: *ref_1
     resource_class: large
     steps: *ref_4
     environment:
       TEST_SUITE: src/__tests__/api_4.test.ts
-      CLI_REGION: us-east-2
+      CLI_REGION: ap-southeast-2
   schema-iterative-update-4-amplify_e2e_tests_pkg_linux:
     working_directory: ~/repo
     docker: *ref_1
@@ -1839,16 +1831,6 @@ jobs:
       TEST_SUITE: src/__tests__/function_5.test.ts
       CLI_REGION: ap-northeast-1
     steps: *ref_5
-  defer-init-push-amplify_e2e_tests_pkg_linux:
-    working_directory: ~/repo
-    docker: *ref_1
-    resource_class: large
-    environment:
-      AMPLIFY_DIR: /home/circleci/repo/out
-      AMPLIFY_PATH: /home/circleci/repo/out/amplify-pkg-linux
-      TEST_SUITE: src/__tests__/defer-init-push.test.ts
-      CLI_REGION: ap-southeast-1
-    steps: *ref_5
   configure-project-amplify_e2e_tests_pkg_linux:
     working_directory: ~/repo
     docker: *ref_1
@@ -1857,7 +1839,7 @@ jobs:
       AMPLIFY_DIR: /home/circleci/repo/out
       AMPLIFY_PATH: /home/circleci/repo/out/amplify-pkg-linux
       TEST_SUITE: src/__tests__/configure-project.test.ts
-      CLI_REGION: ap-southeast-2
+      CLI_REGION: ap-southeast-1
     steps: *ref_5
   api_4-amplify_e2e_tests_pkg_linux:
     working_directory: ~/repo
@@ -1867,7 +1849,7 @@ jobs:
       AMPLIFY_DIR: /home/circleci/repo/out
       AMPLIFY_PATH: /home/circleci/repo/out/amplify-pkg-linux
       TEST_SUITE: src/__tests__/api_4.test.ts
-      CLI_REGION: us-east-2
+      CLI_REGION: ap-southeast-2
     steps: *ref_5
 workflows:
   version: 2
@@ -1967,10 +1949,10 @@ workflows:
                 - master
       - done_with_node_e2e_tests:
           requires:
+            - schema-key-amplify_e2e_tests
             - analytics-amplify_e2e_tests
             - notifications-amplify_e2e_tests
             - schema-iterative-update-locking-amplify_e2e_tests
-            - api_4-amplify_e2e_tests
             - schema-auth-10-amplify_e2e_tests
             - hosting-amplify_e2e_tests
             - tags-amplify_e2e_tests
@@ -1990,17 +1972,17 @@ workflows:
             - schema-iterative-update-2-amplify_e2e_tests
             - schema-data-access-patterns-amplify_e2e_tests
             - init-special-case-amplify_e2e_tests
-            - defer-init-push-amplify_e2e_tests
+            - configure-project-amplify_e2e_tests
             - feature-flags-amplify_e2e_tests
             - schema-versioned-amplify_e2e_tests
             - plugin-amplify_e2e_tests
-            - configure-project-amplify_e2e_tests
+            - api_4-amplify_e2e_tests
       - done_with_pkg_linux_e2e_tests:
           requires:
+            - schema-key-amplify_e2e_tests_pkg_linux
             - analytics-amplify_e2e_tests_pkg_linux
             - notifications-amplify_e2e_tests_pkg_linux
             - schema-iterative-update-locking-amplify_e2e_tests_pkg_linux
-            - api_4-amplify_e2e_tests_pkg_linux
             - schema-auth-10-amplify_e2e_tests_pkg_linux
             - hosting-amplify_e2e_tests_pkg_linux
             - tags-amplify_e2e_tests_pkg_linux
@@ -2020,11 +2002,11 @@ workflows:
             - schema-iterative-update-2-amplify_e2e_tests_pkg_linux
             - schema-data-access-patterns-amplify_e2e_tests_pkg_linux
             - init-special-case-amplify_e2e_tests_pkg_linux
-            - defer-init-push-amplify_e2e_tests_pkg_linux
+            - configure-project-amplify_e2e_tests_pkg_linux
             - feature-flags-amplify_e2e_tests_pkg_linux
             - schema-versioned-amplify_e2e_tests_pkg_linux
             - plugin-amplify_e2e_tests_pkg_linux
-            - configure-project-amplify_e2e_tests_pkg_linux
+            - api_4-amplify_e2e_tests_pkg_linux
       - amplify_migration_tests_latest:
           context:
             - amplify-ecr-image-pull
@@ -2205,12 +2187,6 @@ workflows:
           filters: *ref_9
           requires:
             - function_2-amplify_e2e_tests
-      - api_4-amplify_e2e_tests:
-          context: *ref_7
-          post-steps: *ref_8
-          filters: *ref_9
-          requires:
-            - schema-key-amplify_e2e_tests
       - api_2-amplify_e2e_tests:
           context: *ref_7
           post-steps: *ref_8
@@ -2505,7 +2481,7 @@ workflows:
           filters: *ref_9
           requires:
             - layer-amplify_e2e_tests
-      - defer-init-push-amplify_e2e_tests:
+      - configure-project-amplify_e2e_tests:
           context: *ref_7
           post-steps: *ref_8
           filters: *ref_9
@@ -2565,7 +2541,7 @@ workflows:
           filters: *ref_9
           requires:
             - auth_3-amplify_e2e_tests
-      - configure-project-amplify_e2e_tests:
+      - api_4-amplify_e2e_tests:
           context: *ref_7
           post-steps: *ref_8
           filters: *ref_9
@@ -2643,12 +2619,6 @@ workflows:
           filters: *ref_12
           requires:
             - function_2-amplify_e2e_tests_pkg_linux
-      - api_4-amplify_e2e_tests_pkg_linux:
-          context: *ref_10
-          post-steps: *ref_11
-          filters: *ref_12
-          requires:
-            - schema-key-amplify_e2e_tests_pkg_linux
       - api_2-amplify_e2e_tests_pkg_linux:
           context: *ref_10
           post-steps: *ref_11
@@ -2963,7 +2933,7 @@ workflows:
           filters: *ref_12
           requires:
             - layer-amplify_e2e_tests_pkg_linux
-      - defer-init-push-amplify_e2e_tests_pkg_linux:
+      - configure-project-amplify_e2e_tests_pkg_linux:
           context: *ref_10
           post-steps: *ref_11
           filters: *ref_12
@@ -3027,7 +2997,7 @@ workflows:
           filters: *ref_12
           requires:
             - auth_3-amplify_e2e_tests_pkg_linux
-      - configure-project-amplify_e2e_tests_pkg_linux:
+      - api_4-amplify_e2e_tests_pkg_linux:
           context: *ref_10
           post-steps: *ref_11
           filters: *ref_12

diff --git a/jest.config.js b/jest.config.js
@@ -46,6 +46,7 @@ module.exports = {
     '<rootDir>/packages/amplify-graphql-docs-generator',
     '<rootDir>/packages/amplify-graphql-function-transformer',
     '<rootDir>/packages/amplify-graphql-http-transformer',
+    '<rootDir>/packages/amplify-graphql-searchable-transformer',
     '<rootDir>/packages/amplify-graphql-types-generator',
     '<rootDir>/packages/amplify-provider-awscloudformation',
     '<rootDir>/packages/amplify-storage-simulator',

diff --git a/packages/amplify-app/CHANGELOG.md b/packages/amplify-app/CHANGELOG.md
@@ -3,6 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.24.1](https://github.com/aws-amplify/amplify-cli/compare/amplify-app@2.24.0...amplify-app@2.24.1) (2021-05-18)
+
+**Note:** Version bump only for package amplify-app
+
+
+
+
+
+# [2.24.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-app@2.23.5...amplify-app@2.24.0) (2021-05-14)
+
+
+
+# 4.51.0 (2021-05-13)
+
+
+### Features
+
+* prep work for SMS Sandbox support ([#7302](https://github.com/aws-amplify/amplify-cli/issues/7302)) ([d1f85d2](https://github.com/aws-amplify/amplify-cli/commit/d1f85d2e0a9c367b71defefe6d9e00737f681ca4))
+
+
+
+
+
 ## [2.23.5](https://github.com/aws-amplify/amplify-cli/compare/amplify-app@2.23.3...amplify-app@2.23.5) (2021-05-03)
 
 

diff --git a/packages/amplify-app/package.json b/packages/amplify-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-app",
-  "version": "2.23.5",
+  "version": "2.24.1",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -30,8 +30,8 @@
   "dependencies": {
     "amplify-frontend-android": "2.15.3",
     "amplify-frontend-flutter": "0.4.3",
-    "amplify-frontend-ios": "2.19.6",
-    "amplify-frontend-javascript": "2.21.6",
+    "amplify-frontend-ios": "2.20.1",
+    "amplify-frontend-javascript": "2.22.1",
     "chalk": "^3.0.0",
     "execa": "^4.1.0",
     "fs-extra": "^8.1.0",
@@ -41,7 +41,7 @@
     "node-emoji": "^1.10.0",
     "ora": "^4.0.3",
     "rimraf": "^3.0.0",
-    "semver": "^7.1.1",
+    "semver": "^7.3.5",
     "strip-ansi": "^6.0.0",
     "xcode": "^2.1.0",
     "yargs": "^15.1.0"

diff --git a/packages/amplify-appsync-simulator/CHANGELOG.md b/packages/amplify-appsync-simulator/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.
 
+## [1.26.5](https://github.com/aws-amplify/amplify-cli/compare/amplify-appsync-simulator@1.26.4...amplify-appsync-simulator@1.26.5) (2021-05-18)
+
+**Note:** Version bump only for package amplify-appsync-simulator
+
+
+
+
+
 ## [1.26.4](https://github.com/aws-amplify/amplify-cli/compare/amplify-appsync-simulator@1.26.2...amplify-appsync-simulator@1.26.4) (2021-05-03)
 
 

diff --git a/packages/amplify-appsync-simulator/package.json b/packages/amplify-appsync-simulator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-appsync-simulator",
-  "version": "1.26.4",
+  "version": "1.26.5",
   "description": "An AppSync Simulator to test AppSync API.",
   "repository": {
     "type": "git",
@@ -64,7 +64,7 @@
     "@types/node": "^12.12.6",
     "@types/pino": "5.15.3",
     "@types/ws": "^7.2.3",
-    "amplify-graphiql-explorer": "1.6.0"
+    "amplify-graphiql-explorer": "1.6.1"
   },
   "jest": {
     "testRunner": "jest-circus/runner",

diff --git a/packages/amplify-category-analytics/CHANGELOG.md b/packages/amplify-category-analytics/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.21.8](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-analytics@2.21.7...amplify-category-analytics@2.21.8) (2021-05-18)
+
+**Note:** Version bump only for package amplify-category-analytics
+
+
+
+
+
+## [2.21.7](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-analytics@2.21.6...amplify-category-analytics@2.21.7) (2021-05-14)
+
+**Note:** Version bump only for package amplify-category-analytics
+
+
+
+
+
 ## [2.21.6](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-analytics@2.21.4...amplify-category-analytics@2.21.6) (2021-05-03)
 
 

diff --git a/packages/amplify-category-analytics/package.json b/packages/amplify-category-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-analytics",
-  "version": "2.21.6",
+  "version": "2.21.8",
   "description": "amplify-cli analytics plugin",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "aws"
   ],
   "dependencies": {
-    "amplify-cli-core": "1.21.2",
+    "amplify-cli-core": "1.22.1",
     "fs-extra": "^8.1.0",
     "inquirer": "^7.3.3",
     "uuid": "^3.4.0"

diff --git a/packages/amplify-category-api/CHANGELOG.md b/packages/amplify-category-api/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.31.8](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-api@2.31.7...amplify-category-api@2.31.8) (2021-05-18)
+
+
+### Bug Fixes
+
+* make ECR repository name validation more strict ([#7337](https://github.com/aws-amplify/amplify-cli/issues/7337)) ([188efdd](https://github.com/aws-amplify/amplify-cli/commit/188efdde6ded25a06c6fb52e0b2abe04981b0993))
+
+
+
+
+
+## [2.31.7](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-api@2.31.6...amplify-category-api@2.31.7) (2021-05-14)
+
+
+### Bug Fixes
+
+* carry existing container secret config over ([#7224](https://github.com/aws-amplify/amplify-cli/issues/7224)) ([b2f3bf7](https://github.com/aws-amplify/amplify-cli/commit/b2f3bf7059ce3ca1e72cf6c451edd3e61699828a))
+* conditionally rebuild container apis on push ([#7175](https://github.com/aws-amplify/amplify-cli/issues/7175)) ([a27a033](https://github.com/aws-amplify/amplify-cli/commit/a27a033af0fe6a9db8becd15b713113c64e70eb3))
+* update overlapping REST path warning ([#7276](https://github.com/aws-amplify/amplify-cli/issues/7276)) ([3fc7534](https://github.com/aws-amplify/amplify-cli/commit/3fc75343ba228307080f3ef6a6cae4cf3387a007))
+
+
+
+
+
 ## [2.31.6](https://github.com/aws-amplify/amplify-cli/compare/amplify-category-api@2.31.4...amplify-category-api@2.31.6) (2021-05-03)
 
 

diff --git a/packages/amplify-category-api/package.json b/packages/amplify-category-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-api",
-  "version": "2.31.6",
+  "version": "2.31.8",
   "description": "amplify-cli api plugin",
   "repository": {
     "type": "git",
@@ -62,14 +62,14 @@
     "@aws-cdk/cx-api": "~1.72.0",
     "@aws-cdk/region-info": "~1.72.0",
     "@graphql-tools/merge": "^6.0.18",
-    "amplify-cli-core": "1.21.2",
-    "amplify-util-headless-input": "1.4.3",
+    "amplify-cli-core": "1.22.1",
+    "amplify-util-headless-input": "1.4.5",
     "chalk": "^3.0.0",
     "constructs": "^3.2.0",
     "fs-extra": "^8.1.0",
     "graphql": "^14.5.8",
     "graphql-relational-schema-transformer": "2.17.3",
-    "graphql-transformer-core": "6.28.6",
+    "graphql-transformer-core": "6.28.8",
     "inquirer": "^7.3.3",
     "js-yaml": "^4.0.0",
     "ora": "^4.0.3",

diff --git a/...y-api/src/provider-utils/awscloudformation/service-walkthroughs/containers-walkthrough.ts b/...y-api/src/provider-utils/awscloudformation/service-walkthroughs/containers-walkthrough.ts
@@ -69,8 +69,8 @@ async function askResourceName(context, allDefaultValues) {
       validate: amplify.inputValidation({
         validation: {
           operator: 'regex',
-          value: '^[a-zA-Z0-9]+$',
-          onErrorMsg: 'Resource name should be alphanumeric',
+          value: '^(?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*$',
+          onErrorMsg: 'Resource name should be alphanumeric with no uppercase letters',
         },
         required: true,
       }),