Merge branch 'master' into mock-env-vars

aws-amplify · Feb 12, 2021 · b19684e · b19684e
2 parents 3fe813c + 31eb8eb
commit b19684e
Show file tree

Hide file tree

Showing 114 changed files with 926 additions and 232 deletions.
diff --git a/.circleci/config.base.yml b/.circleci/config.base.yml
@@ -874,6 +874,7 @@ workflows:
                 - iterative-update
                 - release
                 - compute-functions
+                - ci-build-tag-update
           requires:
             - build
       - build_pkg_binaries:
@@ -893,6 +894,7 @@ workflows:
                 - master
                 - compute-functions
                 - iterative-update
+                - ci-build-tag-update
           requires:
             - publish_to_local_registry
       - done_with_node_e2e_tests:

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2130,6 +2130,7 @@ workflows:
                 - iterative-update
                 - release
                 - compute-functions
+                - ci-build-tag-update
           requires:
             - build
       - build_pkg_binaries:
@@ -2281,6 +2282,7 @@ workflows:
                 - master
                 - compute-functions
                 - iterative-update
+                - ci-build-tag-update
           requires:
             - publish_to_local_registry
       - tags-amplify_e2e_tests:

diff --git a/packages/amplify-app/CHANGELOG.md b/packages/amplify-app/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.21.1](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.21.1) (2021-02-11)
+
+
+### Bug Fixes
+
+* **amplify-codegen:** set sourceDir path to correct graphql schema location ([#6512](https://github.com/aws-amplify/amplify-cli/issues/6512)) ([6edf229](https://github.com/aws-amplify/amplify-cli/commit/6edf2298ebbabda57230f9e0b9c6c4f504f8a275)), closes [aws-amplify/amplify-cli#5483](https://github.com/aws-amplify/amplify-cli/issues/5483) [aws-amplify/amplify-cli#5483](https://github.com/aws-amplify/amplify-cli/issues/5483)
+
+
+
+
+
 # [2.21.0](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.21.0) (2021-02-10)
 
 

diff --git a/packages/amplify-app/package.json b/packages/amplify-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-app",
-  "version": "2.21.0",
+  "version": "2.21.1",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -30,8 +30,8 @@
   "dependencies": {
     "amplify-frontend-android": "2.14.5",
     "amplify-frontend-flutter": "0.3.0",
-    "amplify-frontend-ios": "2.18.5",
-    "amplify-frontend-javascript": "2.20.5",
+    "amplify-frontend-ios": "2.18.6",
+    "amplify-frontend-javascript": "2.20.6",
     "chalk": "^3.0.0",
     "execa": "^4.1.0",
     "fs-extra": "^8.1.0",

diff --git a/packages/amplify-appsync-simulator/CHANGELOG.md b/packages/amplify-appsync-simulator/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.25.2](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@1.25.2) (2021-02-11)
+
+
+### Bug Fixes
+
+* **amplify-appsync-simulator:** expose errors from util.validate ([#6514](https://github.com/aws-amplify/amplify-cli/issues/6514)) ([8273037](https://github.com/aws-amplify/amplify-cli/commit/82730371ed0292e762d45313a7fa8de062c860dd)), closes [#6068](https://github.com/aws-amplify/amplify-cli/issues/6068)
+
+
+
+
+
 ## [1.25.1](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@1.25.1) (2021-02-10)
 
 

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.25.1",
+  "version": "1.25.2",
   "description": "An AppSync Simulator to test AppSync API.",
   "repository": {
     "type": "git",
@@ -65,7 +65,7 @@
     "@types/node": "^10.17.13",
     "@types/pino": "5.15.3",
     "@types/ws": "^7.2.3",
-    "amplify-graphiql-explorer": "1.4.1"
+    "amplify-graphiql-explorer": "1.4.2"
   },
   "jest": {
     "testRunner": "jest-circus/runner",

diff --git a/packages/amplify-category-analytics/CHANGELOG.md b/packages/amplify-category-analytics/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.20.0](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.20.0) (2021-02-11)
+
+
+### Features
+
+* dont open urls when CLI is running in CI ([#6503](https://github.com/aws-amplify/amplify-cli/issues/6503)) ([27546a7](https://github.com/aws-amplify/amplify-cli/commit/27546a78159ea95c636dbbd094fe6a4f7fb8f8f4)), closes [#5973](https://github.com/aws-amplify/amplify-cli/issues/5973)
+
+
+
+
+
 ## [2.19.5](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.19.5) (2021-02-10)
 
 **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.19.5",
+  "version": "2.20.0",
   "description": "amplify-cli analytics plugin",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "aws"
   ],
   "dependencies": {
-    "amplify-cli-core": "1.15.0",
+    "amplify-cli-core": "1.16.0",
     "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,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.29.0](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.29.0) (2021-02-11)
+
+
+### Bug Fixes
+
+* sets policy resource name in api update flow ([328abac](https://github.com/aws-amplify/amplify-cli/commit/328abacd81d03dbae8b0c0246536c465a7954c1e))
+
+
+### Features
+
+* dont open urls when CLI is running in CI ([#6503](https://github.com/aws-amplify/amplify-cli/issues/6503)) ([27546a7](https://github.com/aws-amplify/amplify-cli/commit/27546a78159ea95c636dbbd094fe6a4f7fb8f8f4)), closes [#5973](https://github.com/aws-amplify/amplify-cli/issues/5973)
+
+
+
+
+
 ## [2.28.3](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.28.3) (2021-02-10)
 
 

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.28.3",
+  "version": "2.29.0",
   "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.15.0",
+    "amplify-cli-core": "1.16.0",
     "amplify-util-headless-input": "1.4.3",
     "chalk": "^3.0.0",
     "constructs": "^3.2.0",
     "fs-extra": "^8.1.0",
     "graphql": "^14.5.8",
-    "graphql-relational-schema-transformer": "2.16.1",
-    "graphql-transformer-core": "6.26.0",
+    "graphql-relational-schema-transformer": "2.16.2",
+    "graphql-transformer-core": "6.26.1",
     "inquirer": "^7.3.3",
     "ora": "^4.0.3",
     "uuid": "^3.4.0"

diff --git a/...ests__/provider-utils/awscloudformation/__snapshots__/legacy-update-resource.test.ts.snap b/...ests__/provider-utils/awscloudformation/__snapshots__/legacy-update-resource.test.ts.snap
@@ -0,0 +1,17 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`legacy update resource sets policy resource name in paths object before copying template 1`] = `
+Object {
+  "paths": Array [
+    Object {
+      "name": "/some/{path}/with/{params}",
+      "policyResourceName": "/some/*/with/*",
+    },
+    Object {
+      "name": "another/path/without/params",
+      "policyResourceName": "another/path/without/params",
+    },
+  ],
+  "resourceName": "mockResourceName",
+}
+`;
diff --git a/...ategory-api/src/__tests__/provider-utils/awscloudformation/legacy-update-resource.test.ts b/...ategory-api/src/__tests__/provider-utils/awscloudformation/legacy-update-resource.test.ts
@@ -0,0 +1,34 @@
+import { legacyUpdateResource } from '../../../provider-utils/awscloudformation/legacy-update-resource';
+import { category } from '../../../category-constants';
+
+jest.mock('fs-extra');
+
+describe('legacy update resource', () => {
+  const contextStub = {
+    amplify: {
+      pathManager: {
+        getBackendDirPath: jest.fn(_ => 'mock/backend/path'),
+      },
+      updateamplifyMetaAfterResourceUpdate: jest.fn(),
+      copyBatch: jest.fn(),
+    },
+  };
+
+  it('sets policy resource name in paths object before copying template', async () => {
+    const stubWalkthroughPromise: Promise<any> = Promise.resolve({
+      answers: {
+        resourceName: 'mockResourceName',
+        paths: [
+          {
+            name: '/some/{path}/with/{params}',
+          },
+          {
+            name: 'another/path/without/params',
+          },
+        ],
+      },
+    });
+    await legacyUpdateResource(stubWalkthroughPromise, contextStub, category, 'API Gateway');
+    expect(contextStub.amplify.copyBatch.mock.calls[0][2]).toMatchSnapshot();
+  });
+});
diff --git a/packages/amplify-category-api/src/provider-utils/awscloudformation/legacy-add-resource.ts b/packages/amplify-category-api/src/provider-utils/awscloudformation/legacy-add-resource.ts
@@ -69,7 +69,7 @@ export const copyCfnTemplate = (context, category, options, cfnFilename) => {
   return context.amplify.copyBatch(context, copyJobs, options, true, false);
 };
 
-const addPolicyResourceNameToPaths = paths => {
+export const addPolicyResourceNameToPaths = paths => {
   if (Array.isArray(paths)) {
     paths.forEach(p => {
       const pathName = p.name;

diff --git a/packages/amplify-category-api/src/provider-utils/awscloudformation/legacy-update-resource.ts b/packages/amplify-category-api/src/provider-utils/awscloudformation/legacy-update-resource.ts
@@ -1,14 +1,14 @@
-import { serviceMetadataFor } from "./utils/dynamic-imports";
-import { copyCfnTemplate } from "./legacy-add-resource";
+import { serviceMetadataFor } from './utils/dynamic-imports';
+import { copyCfnTemplate, addPolicyResourceNameToPaths } from './legacy-add-resource';
 import fs from 'fs-extra';
 import path from 'path';
-import { parametersFileName } from "./aws-constants";
+import { parametersFileName } from './aws-constants';
 
 export const legacyUpdateResource = async (updateWalkthroughPromise: Promise<any>, context, category, service) => {
   let answers;
   let { cfnFilename } = await serviceMetadataFor(service);
   const projectBackendDirPath = context.amplify.pathManager.getBackendDirPath();
-  const result = await updateWalkthroughPromise
+  const result = await updateWalkthroughPromise;
   const options: any = {};
   if (result) {
     if (result.answers) {
@@ -22,6 +22,7 @@ export const legacyUpdateResource = async (updateWalkthroughPromise: Promise<any
       if (answers.customCfnFile) {
         cfnFilename = answers.customCfnFile;
       }
+      addPolicyResourceNameToPaths(answers.paths);
       copyCfnTemplate(context, category, answers, cfnFilename);
       const parameters = { ...answers };
       const resourceDirPath = path.join(projectBackendDirPath, category, parameters.resourceName);
@@ -32,4 +33,4 @@ export const legacyUpdateResource = async (updateWalkthroughPromise: Promise<any
       context.amplify.updateamplifyMetaAfterResourceUpdate(category, answers.resourceName, 'dependsOn', answers.dependsOn);
     }
   }
-}
+};
diff --git a/packages/amplify-category-auth/CHANGELOG.md b/packages/amplify-category-auth/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.28.0](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.28.0) (2021-02-11)
+
+
+### Features
+
+* dont open urls when CLI is running in CI ([#6503](https://github.com/aws-amplify/amplify-cli/issues/6503)) ([27546a7](https://github.com/aws-amplify/amplify-cli/commit/27546a78159ea95c636dbbd094fe6a4f7fb8f8f4)), closes [#5973](https://github.com/aws-amplify/amplify-cli/issues/5973)
+
+
+
+
+
 # [2.27.0](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.27.0) (2021-02-10)
 
 

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.27.0",
+  "version": "2.28.0",
   "description": "amplify-cli authentication plugin",
   "repository": {
     "type": "git",
@@ -23,10 +23,10 @@
     "test-watch": "jest --watch"
   },
   "dependencies": {
-    "amplify-cli-core": "1.15.0",
+    "amplify-cli-core": "1.16.0",
     "amplify-headless-interface": "1.5.3",
     "amplify-util-headless-input": "1.4.3",
-    "amplify-util-import": "1.3.9",
+    "amplify-util-import": "1.3.10",
     "aws-sdk": "^2.765.0",
     "chalk": "^3.0.0",
     "chalk-pipe": "^3.0.0",

diff --git a/packages/amplify-category-function/CHANGELOG.md b/packages/amplify-category-function/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.29.0](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.29.0) (2021-02-11)
+
+
+### Features
+
+* dont open urls when CLI is running in CI ([#6503](https://github.com/aws-amplify/amplify-cli/issues/6503)) ([27546a7](https://github.com/aws-amplify/amplify-cli/commit/27546a78159ea95c636dbbd094fe6a4f7fb8f8f4)), closes [#5973](https://github.com/aws-amplify/amplify-cli/issues/5973)
+
+
+
+
+
 ## [2.28.5](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.28.5) (2021-02-10)
 
 

diff --git a/packages/amplify-category-function/package.json b/packages/amplify-category-function/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-function",
-  "version": "2.28.5",
+  "version": "2.29.0",
   "description": "amplify-cli function plugin",
   "repository": {
     "type": "git",
@@ -22,14 +22,14 @@
     "aws"
   ],
   "dependencies": {
-    "amplify-cli-core": "1.15.0",
+    "amplify-cli-core": "1.16.0",
     "amplify-function-plugin-interface": "1.6.0",
     "cloudform-types": "^4.2.0",
     "enquirer": "^2.3.6",
     "folder-hash": "^3.3.2",
     "fs-extra": "^8.1.0",
     "globby": "^11.0.1",
-    "graphql-transformer-core": "6.26.0",
+    "graphql-transformer-core": "6.26.1",
     "inquirer": "^7.3.3",
     "inquirer-datepicker": "^2.0.0",
     "jstreemap": "^1.28.2",

diff --git a/packages/amplify-category-hosting/CHANGELOG.md b/packages/amplify-category-hosting/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.6.0](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.6.0) (2021-02-11)
+
+
+### Features
+
+* dont open urls when CLI is running in CI ([#6503](https://github.com/aws-amplify/amplify-cli/issues/6503)) ([27546a7](https://github.com/aws-amplify/amplify-cli/commit/27546a78159ea95c636dbbd094fe6a4f7fb8f8f4)), closes [#5973](https://github.com/aws-amplify/amplify-cli/issues/5973)
+
+
+
+
+
 ## [2.5.1](https://github.com/aws-amplify/amplify-cli/compare/[email protected]@2.5.1) (2020-11-22)
 
 **Note:** Version bump only for package amplify-category-hosting

diff --git a/packages/amplify-category-hosting/package.json b/packages/amplify-category-hosting/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amplify-category-hosting",
-  "version": "2.5.1",
+  "version": "2.6.0",
   "description": "amplify-cli hosting plugin",
   "repository": {
     "type": "git",
@@ -18,7 +18,7 @@
     "test": "jest --coverage"
   },
   "dependencies": {
-    "amplify-cli-core": "1.15.0",
+    "amplify-cli-core": "1.16.0",
     "chalk": "^3.0.0",
     "fs-extra": "^8.1.0",
     "inquirer": "^7.3.3",