Merge branch 'master' into importstorage

aws-amplify · Nov 20, 2020 · 3ea61da · 3ea61da
2 parents 021bef6 + d6909f4
commit 3ea61da
Show file tree

Hide file tree

Showing 116 changed files with 2,122 additions and 205 deletions.
diff --git a/.circleci/config.base.yml b/.circleci/config.base.yml
@@ -328,6 +328,7 @@ jobs:
 
   amplify_migration_tests_v4:
     <<: *defaults
+
     steps:
       - attach_workspace:
           at: ./
@@ -348,6 +349,32 @@ jobs:
           path: ~/repo/packages/amplify-migration-tests/amplify-migration-reports
     working_directory: ~/repo
 
+  amplify_migration_tests_v4_30_0:
+    <<: *defaults
+    environment:
+      AMPLIFY_PATH: /home/circleci/.npm-global/lib/node_modules/@aws-amplify/cli/bin/amplify
+    steps:
+      - attach_workspace:
+          at: ./
+      - restore_cache:
+          key: amplify-cli-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}
+      - run:
+          name: Update OS Packages
+          command: sudo apt-get update
+      - run:
+          name: Run tests migrating from CLI v4.30.0
+          command: |
+            source .circleci/local_publish_helpers.sh
+            changeNpmGlobalPath
+            cd packages/amplify-migration-tests
+            yarn run migration_v4.30.0_auth --maxWorkers=3
+          no_output_timeout: 90m
+      - store_test_results:
+          path: packages/amplify-migration-tests/
+      - store_artifacts:
+          path: ~/repo/packages/amplify-migration-tests/amplify-migration-reports
+    working_directory: ~/repo
+
   amplify_migration_tests_latest:
     <<: *defaults
     steps:
@@ -878,6 +905,16 @@ workflows:
                 - master
           requires:
             - build
+      - amplify_migration_tests_v4_30_0:
+          filters:
+            branches:
+              only:
+                - master
+                - graphqlschemae2e
+                - feat-import
+                - test-fix-status
+          requires:
+            - build
       - amplify_console_integration_tests:
           filters:
             branches:
@@ -911,6 +948,7 @@ workflows:
             - amplify_console_integration_tests
             - amplify_migration_tests_latest
             - amplify_migration_tests_v4
+            - amplify_migration_tests_v4_30_0
             - github_prerelease_install_sanity_check
           filters:
             branches:

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -397,6 +397,32 @@ jobs:
           path: packages/amplify-migration-tests/
       - store_artifacts:
           path: ~/repo/packages/amplify-migration-tests/amplify-migration-reports
+  amplify_migration_tests_v4_30_0:
+    working_directory: ~/repo
+    docker: *ref_0
+    resource_class: large
+    environment:
+      AMPLIFY_PATH: /home/circleci/.npm-global/lib/node_modules/@aws-amplify/cli/bin/amplify
+    steps:
+      - attach_workspace:
+          at: ./
+      - restore_cache:
+          key: 'amplify-cli-yarn-deps-{{ .Branch }}-{{ checksum "yarn.lock" }}'
+      - run:
+          name: Update OS Packages
+          command: sudo apt-get update
+      - run:
+          name: Run tests migrating from CLI v4.30.0
+          command: |
+            source .circleci/local_publish_helpers.sh
+            changeNpmGlobalPath
+            cd packages/amplify-migration-tests
+            yarn run migration_v4.30.0_auth --maxWorkers=3
+          no_output_timeout: 90m
+      - store_test_results:
+          path: packages/amplify-migration-tests/
+      - store_artifacts:
+          path: ~/repo/packages/amplify-migration-tests/amplify-migration-reports
   amplify_migration_tests_latest:
     working_directory: ~/repo
     docker: *ref_0
@@ -2040,6 +2066,16 @@ workflows:
                 - master
           requires:
             - build
+      - amplify_migration_tests_v4_30_0:
+          filters:
+            branches:
+              only:
+                - master
+                - graphqlschemae2e
+                - feat-import
+                - test-fix-status
+          requires:
+            - build
       - amplify_console_integration_tests:
           filters:
             branches:
@@ -2073,6 +2109,7 @@ workflows:
             - amplify_console_integration_tests
             - amplify_migration_tests_latest
             - amplify_migration_tests_v4
+            - amplify_migration_tests_v4_30_0
             - github_prerelease_install_sanity_check
           filters:
             branches:

diff --git a/packages/amplify-app/CHANGELOG.md b/packages/amplify-app/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.17.21](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.17.21) (2020-11-20)
+
+**Note:** Version bump only for package amplify-app
+
+
+
+
+
+## [2.17.20](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.17.20) (2020-11-20)
+
+**Note:** Version bump only for package amplify-app
+
+
+
+
+
+## [2.17.19](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.17.19) (2020-11-19)
+
+**Note:** Version bump only for package amplify-app
+
+
+
+
+
 ## [2.17.18](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.17.18) (2020-11-08)
 
 **Note:** Version bump only for package amplify-app

diff --git a/packages/amplify-app/package.json b/packages/amplify-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-app",
-  "version": "2.17.18",
+  "version": "2.17.21",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -28,9 +28,9 @@
     "@aws-amplify/cli": ">=4.27.2"
   },
   "dependencies": {
-    "amplify-frontend-android": "2.13.5",
-    "amplify-frontend-ios": "2.13.8",
-    "amplify-frontend-javascript": "2.17.3",
+    "amplify-frontend-android": "2.13.8",
+    "amplify-frontend-ios": "2.13.11",
+    "amplify-frontend-javascript": "2.17.6",
     "chalk": "^3.0.0",
     "fs-extra": "^8.1.0",
     "graphql": "^14.5.8",

diff --git a/packages/amplify-category-analytics/CHANGELOG.md b/packages/amplify-category-analytics/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.18.7](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.18.7) (2020-11-20)
+
+**Note:** Version bump only for package amplify-category-analytics
+
+
+
+
+
+## [2.18.6](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.18.6) (2020-11-20)
+
+**Note:** Version bump only for package amplify-category-analytics
+
+
+
+
+
+## [2.18.5](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.18.5) (2020-11-19)
+
+**Note:** Version bump only for package amplify-category-analytics
+
+
+
+
+
 ## [2.18.4](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.18.4) (2020-11-08)
 
 **Note:** Version bump only for package amplify-category-analytics

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.18.4",
+  "version": "2.18.7",
   "description": "amplify-cli analytics plugin",
   "repository": {
     "type": "git",

diff --git a/...er-utils/awscloudformation/cloudformation-templates/pinpoint-cloudformation-template.json b/...er-utils/awscloudformation/cloudformation-templates/pinpoint-cloudformation-template.json
@@ -285,7 +285,7 @@
           "Statement": [
             {
               "Effect": "Allow",
-              "Action": ["mobiletargeting:PutEvents", "mobiletargeting:UpdateEndpoint", "mobiletargeting:GetUserEndpoints"],
+              "Action": ["mobiletargeting:PutEvents", "mobiletargeting:UpdateEndpoint"],
               "Resource": [
                 {
                   "Fn::If": [
@@ -337,7 +337,7 @@
           "Statement": [
             {
               "Effect": "Allow",
-              "Action": ["mobiletargeting:PutEvents", "mobiletargeting:UpdateEndpoint", "mobiletargeting:GetUserEndpoints"],
+              "Action": ["mobiletargeting:PutEvents", "mobiletargeting:UpdateEndpoint"],
               "Resource": [
                 {
                   "Fn::If": [

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.25.7](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.25.7) (2020-11-20)
+
+**Note:** Version bump only for package amplify-category-api
+
+
+
+
+
+## [2.25.6](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.25.6) (2020-11-20)
+
+**Note:** Version bump only for package amplify-category-api
+
+
+
+
+
+## [2.25.5](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.25.5) (2020-11-19)
+
+**Note:** Version bump only for package amplify-category-api
+
+
+
+
+
 ## [2.25.4](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.25.4) (2020-11-08)
 
 **Note:** Version bump only for package amplify-category-api

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.25.4",
+  "version": "2.25.7",
   "description": "amplify-cli api plugin",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
     "fs-extra": "^8.1.0",
     "graphql": "^14.5.8",
     "graphql-relational-schema-transformer": "2.15.19",
-    "graphql-transformer-core": "6.22.0",
+    "graphql-transformer-core": "6.22.3",
     "inquirer": "^7.3.3",
     "open": "^7.0.0",
     "ora": "^4.0.3",

diff --git a/packages/amplify-category-auth/CHANGELOG.md b/packages/amplify-category-auth/CHANGELOG.md
@@ -3,6 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.22.4](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.22.4) (2020-11-20)
+
+
+### Bug Fixes
+
+* remove app client secret as best practice ([#5731](https://github.com/aws-amplify/amplify-cli/issues/5731)) ([8bc0dd2](https://github.com/aws-amplify/amplify-cli/commit/8bc0dd2434b93c9a2cb1ff3bfad9cedd2d356c30))
+* team provider migration ([#5733](https://github.com/aws-amplify/amplify-cli/issues/5733)) ([d18f795](https://github.com/aws-amplify/amplify-cli/commit/d18f795560f0e671f63f1dcbe38931c951794619))
+
+
+
+
+
+## [2.22.3](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.22.3) (2020-11-20)
+
+
+### Bug Fixes
+
+* remove app client secret as best practice ([#5731](https://github.com/aws-amplify/amplify-cli/issues/5731)) ([8bc0dd2](https://github.com/aws-amplify/amplify-cli/commit/8bc0dd2434b93c9a2cb1ff3bfad9cedd2d356c30))
+* team provider migration ([#5733](https://github.com/aws-amplify/amplify-cli/issues/5733)) ([d18f795](https://github.com/aws-amplify/amplify-cli/commit/d18f795560f0e671f63f1dcbe38931c951794619))
+
+
+
+
+
+## [2.22.2](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.22.2) (2020-11-19)
+
+
+### Bug Fixes
+
+* remove app client secret as best practice ([#5731](https://github.com/aws-amplify/amplify-cli/issues/5731)) ([8bc0dd2](https://github.com/aws-amplify/amplify-cli/commit/8bc0dd2434b93c9a2cb1ff3bfad9cedd2d356c30))
+* team provider migration ([#5733](https://github.com/aws-amplify/amplify-cli/issues/5733)) ([d18f795](https://github.com/aws-amplify/amplify-cli/commit/d18f795560f0e671f63f1dcbe38931c951794619))
+
+
+
+
+
 ## [2.22.1](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.22.1) (2020-11-08)
 
 **Note:** Version bump only for package amplify-category-auth

diff --git a/packages/amplify-category-auth/package.json b/packages/amplify-category-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-auth",
-  "version": "2.22.1",
+  "version": "2.22.4",
   "description": "amplify-cli authentication plugin",
   "repository": {
     "type": "git",
@@ -23,10 +23,10 @@
     "test-watch": "jest --watch"
   },
   "dependencies": {
-    "amplify-cli-core": "1.6.0",
+    "amplify-cli-core": "1.6.3",
     "amplify-headless-interface": "1.4.0",
     "amplify-util-headless-input": "1.3.0",
-    "amplify-util-import": "1.1.3",
+    "amplify-util-import": "1.1.6",
     "aws-sdk": "^2.765.0",
     "chalk": "^3.0.0",
     "chalk-pipe": "^3.0.0",

diff --git a/packages/amplify-category-auth/resources/cloudformation-templates/auth-template.yml.ejs b/packages/amplify-category-auth/resources/cloudformation-templates/auth-template.yml.ejs
@@ -23,6 +23,7 @@ Parameters:
   <%=Object.keys(props)[i]%>:
     Type: String
   <% } -%>
+
   <% if (typeof Object.values(props)[i] === 'boolean') { %>
   <%=Object.keys(props)[i]%>:
     Type: String
@@ -40,6 +41,11 @@ Parameters:
     Type: CommaDelimitedList
   <% } -%>
   <% } -%>
+  <% if(Object.keys(props).includes('hostedUIProviderMeta') && !Object.keys(props).includes('hostedUIProviderCreds')) { %>
+  hostedUIProviderCreds:
+    Type: String
+    Default: '[]'
+  <% } -%>
 
 Conditions:
   ShouldNotCreateEnvResources: !Equals [ !Ref env, NONE ]
@@ -562,6 +568,9 @@ Resources:
             - ' const userPoolId = event.ResourceProperties.userPoolId;'
             - ' let hostedUIProviderMeta = JSON.parse(event.ResourceProperties.hostedUIProviderMeta);'
             - ' let hostedUIProviderCreds = JSON.parse(event.ResourceProperties.hostedUIProviderCreds);'
+            - ' if(hostedUIProviderCreds.length === 0) {'
+            - '  response.send(event, context, response.SUCCESS, {});'
+            - ' }'
             - ' if (event.RequestType == ''Delete'') {'
             - '  response.send(event, context, response.SUCCESS, {});'
             - ' }'