Merge branch 'release' into hotfix

aws-amplify · Dec 11, 2023 · fc5019f · fc5019f
2 parents 7f1d497 + d095702
commit fc5019f
Show file tree

Hide file tree

Showing 98 changed files with 1,837 additions and 941 deletions.
diff --git a/.github/workflows/build-test-mac.yml b/.github/workflows/build-test-mac.yml
@@ -18,7 +18,7 @@ jobs:
           persist-credentials: false
 
       - name: Install Python
-      - uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
+        uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4.7.1
         with:
           python-version: '3.11'
 

diff --git a/Readme.md b/Readme.md
@@ -17,6 +17,13 @@
 [![Feature Requests](https://img.shields.io/github/issues/aws-amplify/amplify-cli/feature-request?color=ff9001&label=feature%20requests)](https://github.com/aws-amplify/amplify-cli/issues?q=is%3Aissue+label%3Afeature-request+is%3Aopen)
 [![Closed Issues](https://img.shields.io/github/issues-closed/aws-amplify/amplify-cli?color=%2325CC00&label=issues%20closed)](https://github.com/aws-amplify/amplify-cli/issues?q=is%3Aissue+is%3Aclosed+)
 
+> [!TIP]  
+> **Preview: AWS Amplify's new code-first DX (Gen 2) for building backends**
+>
+> The next generation of Amplify's backend building experience with a TypeScript-first DX is now available in Preview. To learn more, please visit [AWS Amplify (Gen 2)](https://docs.amplify.aws/gen2/).
+>
+> To open a new issue related to Amplify's new backend building experience, please visit [AWS Amplify Backend](https://github.com/aws-amplify/amplify-backend).
+
 # AWS Amplify CLI
 
 The AWS Amplify CLI is a toolchain which includes a robust feature set for simplifying mobile and web application development. The CLI uses AWS CloudFormation and nested stacks to allow you to add or modify configurations locally before you push them for execution in your account.

diff --git a/codebuild_specs/install_and_cache_dependencies.yml b/codebuild_specs/install_and_cache_dependencies.yml
@@ -0,0 +1,11 @@
+version: 0.2
+env:
+  shell: bash
+phases:
+  build:
+    commands:
+      - source ./shared-scripts.sh && _installAndCacheDependencies
+
+artifacts:
+  files:
+    - 'shared-scripts.sh'
diff --git a/codebuild_specs/release_workflows/github_rollback.yml b/codebuild_specs/release_workflows/github_rollback.yml
@@ -0,0 +1,11 @@
+version: 0.2
+env:
+  shell: bash
+phases:
+  build:
+    commands:
+      - source ./shared-scripts.sh && _githubRollback
+
+artifacts:
+  files:
+    - 'shared-scripts.sh'
diff --git a/codebuild_specs/release_workflows/rollback_workflow.yml b/codebuild_specs/release_workflows/rollback_workflow.yml
@@ -0,0 +1,34 @@
+version: 0.2
+env:
+  shell: bash
+  compute-type: BUILD_GENERAL1_MEDIUM
+  git-credential-helper: yes
+  variables:
+    AWS_DEFAULT_REGION: us-east-1
+    AWS_REGION: us-east-1
+    CDK_DEFAULT_REGION: us-east-1
+    CLI_REGION: us-east-1
+
+batch:
+  fast-fail: false
+  build-graph:
+    - identifier: install_dependencies
+      buildspec: codebuild_specs/install_and_cache_dependencies.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+    - identifier: validate_rollback_target_version
+      buildspec: codebuild_specs/validate_rollback_target_version.yml
+      depend-on:
+        - install_dependencies
+    - identifier: github_rollback
+      buildspec: codebuild_specs/release_workflows/github_rollback.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+      depend-on:
+        - validate_rollback_target_version
+    - identifier: rollback_npm
+      buildspec: codebuild_specs/rollback_npm.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
+      depend-on:
+        - validate_rollback_target_version
diff --git a/codebuild_specs/rollback_npm.yml b/codebuild_specs/rollback_npm.yml
@@ -0,0 +1,11 @@
+version: 0.2
+env:
+  shell: bash
+  git-credential-helper: yes
+phases:
+  build:
+    commands:
+      - source ./shared-scripts.sh && _rollbackNpm
+artifacts:
+  files:
+    - 'shared-scripts.sh'
diff --git a/codebuild_specs/validate_rollback_target_version.yml b/codebuild_specs/validate_rollback_target_version.yml
@@ -0,0 +1,11 @@
+version: 0.2
+env:
+  shell: bash
+phases:
+  build:
+    commands:
+      - source ./shared-scripts.sh && _validateRollbackTargetVersion
+
+artifacts:
+  files:
+    - 'shared-scripts.sh'
diff --git a/package.json b/package.json
@@ -47,6 +47,7 @@
     "release-rc-local": "bash -c 'source ./scripts/cloud-release.sh && RCLocal'",
     "release-rc-beta": "bash -c 'source ./scripts/cloud-release.sh && RCBeta'",
     "release-rc": "bash -c 'source ./scripts/cloud-release.sh && RCProd'",
+    "rollback": "./scripts/cloud-rollback.sh",
     "tagged-release-without-e2e-local": "bash -c 'source ./scripts/cloud-release.sh && TaggedRCLocal'",
     "tagged-release-without-e2e-beta": "bash -c 'source ./scripts/cloud-release.sh && TaggedRCBeta'",
     "tagged-release-without-e2e-prod": "bash -c 'source ./scripts/cloud-release.sh && TaggedRCProd'",

diff --git a/packages/amplify-app/CHANGELOG.md b/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.
 
+## [5.0.26](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-11)
+
+**Note:** Version bump only for package @aws-amplify/amplify-app
+
+
+
+
+
 ## [5.0.25](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
 
 

diff --git a/packages/amplify-app/package.json b/packages/amplify-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-app",
-  "version": "5.0.25",
+  "version": "5.0.26",
   "description": "Amplify CLI",
   "repository": {
     "type": "git",
@@ -28,8 +28,8 @@
   "dependencies": {
     "@aws-amplify/amplify-frontend-android": "3.5.8",
     "@aws-amplify/amplify-frontend-flutter": "1.4.7",
-    "@aws-amplify/amplify-frontend-ios": "3.6.26",
-    "@aws-amplify/amplify-frontend-javascript": "3.10.7",
+    "@aws-amplify/amplify-frontend-ios": "3.6.27",
+    "@aws-amplify/amplify-frontend-javascript": "3.10.8",
     "chalk": "^4.1.1",
     "execa": "^5.1.1",
     "fs-extra": "^8.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.
 
+## [2.15.6](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-11)
+
+**Note:** Version bump only for package @aws-amplify/amplify-appsync-simulator
+
+
+
+
+
 ## [2.15.5](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
 
 

diff --git a/packages/amplify-appsync-simulator/package.json b/packages/amplify-appsync-simulator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-appsync-simulator",
-  "version": "2.15.5",
+  "version": "2.15.6",
   "description": "An AppSync Simulator to test AppSync API.",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.2.13",
+    "@aws-amplify/amplify-cli-core": "4.3.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "@graphql-tools/schema": "^8.3.1",
     "@graphql-tools/utils": "^8.5.1",
@@ -59,7 +59,7 @@
     "ws": "^8.5.0"
   },
   "devDependencies": {
-    "@aws-amplify/amplify-graphiql-explorer": "2.5.12",
+    "@aws-amplify/amplify-graphiql-explorer": "2.5.13",
     "@types/cors": "^2.8.6",
     "@types/express": "^4.17.3",
     "@types/node": "^12.12.6",

diff --git a/packages/amplify-category-analytics/CHANGELOG.md b/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.
 
+## [5.0.26](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-11)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-analytics
+
+
+
+
+
 ## [5.0.25](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
 
 

diff --git a/packages/amplify-category-analytics/package.json b/packages/amplify-category-analytics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-analytics",
-  "version": "5.0.25",
+  "version": "5.0.26",
   "description": "amplify-cli analytics plugin",
   "repository": {
     "type": "git",
@@ -25,8 +25,8 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.2.13",
-    "@aws-amplify/amplify-environment-parameters": "1.9.4",
+    "@aws-amplify/amplify-cli-core": "4.3.0",
+    "@aws-amplify/amplify-environment-parameters": "1.9.5",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "fs-extra": "^8.1.0",
     "uuid": "^8.3.2"

diff --git a/packages/amplify-category-auth/CHANGELOG.md b/packages/amplify-category-auth/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.7.5](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-11)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-auth
+
+
+
+
+
 ## [3.7.4](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
 
 

diff --git a/packages/amplify-category-auth/package.json b/packages/amplify-category-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-auth",
-  "version": "3.7.4",
+  "version": "3.7.5",
   "description": "amplify-cli authentication plugin",
   "repository": {
     "type": "git",
@@ -28,17 +28,17 @@
     "extract-api": "ts-node ../../scripts/extract-api.ts"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.2.13",
-    "@aws-amplify/amplify-environment-parameters": "1.9.4",
+    "@aws-amplify/amplify-cli-core": "4.3.0",
+    "@aws-amplify/amplify-environment-parameters": "1.9.5",
     "@aws-amplify/amplify-function-plugin-interface": "1.12.1",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "@aws-amplify/amplify-util-import": "2.8.3",
-    "@aws-amplify/cli-extensibility-helper": "3.0.23",
+    "@aws-amplify/cli-extensibility-helper": "3.0.24",
     "amplify-headless-interface": "1.17.6",
     "amplify-util-headless-input": "1.9.17",
     "aws-cdk-lib": "~2.80.0",
     "aws-sdk": "^2.1464.0",
-    "axios": "^0.26.0",
+    "axios": "^1.6.2",
     "chalk": "^4.1.1",
     "change-case": "^4.1.1",
     "constructs": "^10.0.5",

diff --git a/packages/amplify-category-custom/CHANGELOG.md b/packages/amplify-category-custom/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.1.14](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-11)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-custom
+
+
+
+
+
 ## [3.1.13](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
 
 

diff --git a/packages/amplify-category-custom/package.json b/packages/amplify-category-custom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-custom",
-  "version": "3.1.13",
+  "version": "3.1.14",
   "description": "amplify-cli custom resources plugin",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.2.13",
+    "@aws-amplify/amplify-cli-core": "4.3.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "aws-cdk-lib": "~2.80.0",
     "execa": "^5.1.1",

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.
 
+# [5.7.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-11)
+
+
+### Features
+
+* bump data dependencies to launch RDS feature ([#13409](https://github.com/aws-amplify/amplify-cli/issues/13409)) ([7fbf29f](https://github.com/aws-amplify/amplify-cli/commit/7fbf29f56eb7335d20de0b5526fbed7795a2af09))
+
+
+
+
+
 ## [5.6.4](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
 
 

diff --git a/packages/amplify-category-function/package.json b/packages/amplify-category-function/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-function",
-  "version": "5.6.4",
+  "version": "5.7.0",
   "description": "amplify-cli function plugin",
   "repository": {
     "type": "git",
@@ -26,8 +26,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.2.13",
-    "@aws-amplify/amplify-environment-parameters": "1.9.4",
+    "@aws-amplify/amplify-cli-core": "4.3.0",
+    "@aws-amplify/amplify-environment-parameters": "1.9.5",
     "@aws-amplify/amplify-function-plugin-interface": "1.12.1",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "archiver": "^5.3.0",
@@ -38,7 +38,7 @@
     "folder-hash": "^4.0.2",
     "fs-extra": "^8.1.0",
     "globby": "^11.0.3",
-    "graphql-transformer-core": "^8.1.13",
+    "graphql-transformer-core": "^8.2.3",
     "inquirer": "^7.3.3",
     "inquirer-datepicker": "^2.0.0",
     "jstreemap": "^1.28.2",

diff --git a/packages/amplify-category-geo/CHANGELOG.md b/packages/amplify-category-geo/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.5.5](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-11)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-geo
+
+
+
+
+
 ## [3.5.4](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)
 
 

diff --git a/packages/amplify-category-geo/package.json b/packages/amplify-category-geo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-category-geo",
-  "version": "3.5.4",
+  "version": "3.5.5",
   "description": "Amplify CLI plugin to manage the Geo resources for the project",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/amplify-cli-core": "4.2.13",
+    "@aws-amplify/amplify-cli-core": "4.3.0",
     "@aws-amplify/amplify-prompts": "2.8.6",
     "ajv": "^6.12.6",
     "amplify-headless-interface": "1.17.6",

diff --git a/packages/amplify-category-hosting/CHANGELOG.md b/packages/amplify-category-hosting/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.5.27](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-12-11)
+
+**Note:** Version bump only for package @aws-amplify/amplify-category-hosting
+
+
+
+
+
 ## [3.5.26](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/[email protected]...@aws-amplify/[email protected]) (2023-11-08)