Merge branch 'aws-amplify:main' into main

vigy02 · web-flow · commit 5977d8f640ec · 2024-09-23T13:28:53.000-07:00
diff --git a/.changeset/chatty-beans-begin.md b/.changeset/chatty-beans-begin.md
diff --git a/.changeset/fluffy-months-prove.md b/.changeset/fluffy-months-prove.md
diff --git a/.changeset/forty-squids-help.md b/.changeset/forty-squids-help.md
diff --git a/.changeset/four-drinks-yell.md b/.changeset/four-drinks-yell.md
diff --git a/.changeset/itchy-vans-behave.md b/.changeset/itchy-vans-behave.md
diff --git a/.changeset/seven-rabbits-poke.md b/.changeset/seven-rabbits-poke.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.changeset/spicy-toys-scream.md b/.changeset/spicy-toys-scream.md
diff --git a/.github/workflows/health_checks.yml b/.github/workflows/health_checks.yml
@@ -436,6 +436,7 @@ jobs:
   check_package_versions:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     needs:
       - install
     steps:
diff --git a/packages/backend-auth/CHANGELOG.md b/packages/backend-auth/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @aws-amplify/backend-auth
 
+## 1.2.0
+
+### Minor Changes
+
+- 87dbf41: expose stack property for backend, function resource, storage resource, and auth resource
+
+### Patch Changes
+
+- Updated dependencies [87dbf41]
+  - @aws-amplify/plugin-types@1.3.0
+
 ## 1.1.5
 
 ### Patch Changes
diff --git a/packages/backend-auth/package.json b/packages/backend-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/backend-auth",
-  "version": "1.1.5",
+  "version": "1.2.0",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -21,7 +21,7 @@
   "dependencies": {
     "@aws-amplify/auth-construct": "^1.3.1",
     "@aws-amplify/backend-output-storage": "^1.1.2",
-    "@aws-amplify/plugin-types": "^1.2.2"
+    "@aws-amplify/plugin-types": "^1.3.0"
   },
   "devDependencies": {
     "@aws-amplify/backend-platform-test-stubs": "^0.3.5",
diff --git a/packages/backend-function/CHANGELOG.md b/packages/backend-function/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @aws-amplify/backend-function
 
+## 1.5.0
+
+### Minor Changes
+
+- 87dbf41: expose stack property for backend, function resource, storage resource, and auth resource
+
+### Patch Changes
+
+- Updated dependencies [87dbf41]
+  - @aws-amplify/plugin-types@1.3.0
+
 ## 1.4.1
 
 ### Patch Changes
diff --git a/packages/backend-function/package.json b/packages/backend-function/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/backend-function",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -21,7 +21,7 @@
   "dependencies": {
     "@aws-amplify/backend-output-schemas": "^1.1.0",
     "@aws-amplify/backend-output-storage": "^1.1.2",
-    "@aws-amplify/plugin-types": "^1.2.2",
+    "@aws-amplify/plugin-types": "^1.3.0",
     "execa": "^8.0.1"
   },
   "devDependencies": {
diff --git a/packages/backend-storage/CHANGELOG.md b/packages/backend-storage/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @aws-amplify/backend-storage
 
+## 1.2.0
+
+### Minor Changes
+
+- 87dbf41: expose stack property for backend, function resource, storage resource, and auth resource
+
+### Patch Changes
+
+- Updated dependencies [87dbf41]
+  - @aws-amplify/plugin-types@1.3.0
+
 ## 1.1.3
 
 ### Patch Changes
diff --git a/packages/backend-storage/package.json b/packages/backend-storage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/backend-storage",
-  "version": "1.1.3",
+  "version": "1.2.0",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -21,7 +21,7 @@
   "dependencies": {
     "@aws-amplify/backend-output-schemas": "^1.2.0",
     "@aws-amplify/backend-output-storage": "^1.1.2",
-    "@aws-amplify/plugin-types": "^1.2.2"
+    "@aws-amplify/plugin-types": "^1.3.0"
   },
   "devDependencies": {
     "@aws-amplify/backend-platform-test-stubs": "^0.3.5",
diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @aws-amplify/backend
 
+## 1.3.0
+
+### Minor Changes
+
+- 87dbf41: expose stack property for backend, function resource, storage resource, and auth resource
+
+### Patch Changes
+
+- Updated dependencies [87dbf41]
+- Updated dependencies [87dbf41]
+  - @aws-amplify/backend-function@1.5.0
+  - @aws-amplify/backend-auth@1.2.0
+  - @aws-amplify/backend-storage@1.2.0
+  - @aws-amplify/plugin-types@1.3.0
+
 ## 1.2.2
 
 ### Patch Changes
diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/backend",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -26,16 +26,16 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@aws-amplify/data-schema": "^1.0.0",
-    "@aws-amplify/backend-auth": "^1.1.5",
-    "@aws-amplify/backend-function": "^1.4.1",
+    "@aws-amplify/backend-auth": "^1.2.0",
+    "@aws-amplify/backend-function": "^1.5.0",
     "@aws-amplify/backend-data": "^1.1.4",
     "@aws-amplify/backend-output-schemas": "^1.2.0",
     "@aws-amplify/backend-output-storage": "^1.1.2",
     "@aws-amplify/backend-secret": "^1.1.2",
-    "@aws-amplify/backend-storage": "^1.1.3",
+    "@aws-amplify/backend-storage": "^1.2.0",
     "@aws-amplify/client-config": "^1.3.1",
     "@aws-amplify/platform-core": "^1.1.0",
-    "@aws-amplify/plugin-types": "^1.2.2",
+    "@aws-amplify/plugin-types": "^1.3.0",
     "@aws-sdk/client-amplify": "^3.624.0",
     "lodash.snakecase": "^4.1.1"
   },
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,5 +1,19 @@
 # @aws-amplify/backend-cli
 
+## 1.2.8
+
+### Patch Changes
+
+- 9e11e5d: correctly handle stack argument for generate schema command
+- 7aad5e8: update fallback for backend id resolvers if stack, app id, or branch are in args
+- Updated dependencies [e325044]
+- Updated dependencies [87dbf41]
+- Updated dependencies [f6b1943]
+  - @aws-amplify/schema-generator@1.2.4
+  - @aws-amplify/model-generator@1.0.8
+  - @aws-amplify/form-generator@1.0.3
+  - @aws-amplify/plugin-types@1.3.0
+
 ## 1.2.7
 
 ### Patch Changes
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/backend-cli",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "Command line interface for various Amplify tools",
   "bin": {
     "ampx": "lib/ampx.js",
@@ -37,12 +37,12 @@
     "@aws-amplify/cli-core": "^1.1.3",
     "@aws-amplify/client-config": "^1.3.1",
     "@aws-amplify/deployed-backend-client": "^1.4.1",
-    "@aws-amplify/form-generator": "^1.0.2",
-    "@aws-amplify/model-generator": "^1.0.7",
+    "@aws-amplify/form-generator": "^1.0.3",
+    "@aws-amplify/model-generator": "^1.0.8",
     "@aws-amplify/platform-core": "^1.0.5",
-    "@aws-amplify/plugin-types": "^1.2.2",
+    "@aws-amplify/plugin-types": "^1.3.0",
     "@aws-amplify/sandbox": "^1.2.2",
-    "@aws-amplify/schema-generator": "^1.2.3",
+    "@aws-amplify/schema-generator": "^1.2.4",
     "@aws-sdk/client-amplify": "^3.624.0",
     "@aws-sdk/client-cloudformation": "^3.624.0",
     "@aws-sdk/client-s3": "^3.624.0",
diff --git a/packages/form-generator/CHANGELOG.md b/packages/form-generator/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @aws-amplify/form-generator
 
+## 1.0.3
+
+### Patch Changes
+
+- e325044: Prefer amplify errors in generators
+
 ## 1.0.2
 
 ### Patch Changes
diff --git a/packages/form-generator/package.json b/packages/form-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/form-generator",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "type": "module",
   "publishConfig": {
     "access": "public"
diff --git a/packages/integration-tests/src/amplify_auth_credentials_factory.ts b/packages/integration-tests/src/amplify_auth_credentials_factory.ts
@@ -16,16 +16,17 @@ import { AsyncLock } from './async_lock.js';
  * This class is safe to use in concurrent settings, i.e. tests running in parallel.
  */
 export class AmplifyAuthCredentialsFactory {
-  private readonly userPoolId: string;
-  private readonly userPoolClientId: string;
-  private readonly identityPoolId: string;
-  private readonly allowGuestAccess: boolean | undefined;
   /**
    * Asynchronous lock is used to assure that all calls to Amplify JS library are
    * made in single transaction. This is because that library maintains global state,
    * for example auth session.
    */
-  private readonly lock: AsyncLock = new AsyncLock(60 * 1000);
+  private static readonly lock: AsyncLock = new AsyncLock(60 * 1000);
+
+  private readonly userPoolId: string;
+  private readonly userPoolClientId: string;
+  private readonly identityPoolId: string;
+  private readonly allowGuestAccess: boolean | undefined;
 
   /**
    * Creates Amplify Auth credentials factory.
@@ -47,7 +48,7 @@ export class AmplifyAuthCredentialsFactory {
     iamCredentials: IamCredentials;
     accessToken: string;
   }> => {
-    await this.lock.acquire();
+    await AmplifyAuthCredentialsFactory.lock.acquire();
     try {
       const username = `amplify-backend-${shortUuid()}@amazon.com`;
       const temporaryPassword = `Test1@Temp${shortUuid()}`;
@@ -103,12 +104,12 @@ export class AmplifyAuthCredentialsFactory {
         accessToken: authSession.tokens.accessToken.toString(),
       };
     } finally {
-      this.lock.release();
+      AmplifyAuthCredentialsFactory.lock.release();
     }
   };
 
   getGuestAccessCredentials = async (): Promise<IamCredentials> => {
-    await this.lock.acquire();
+    await AmplifyAuthCredentialsFactory.lock.acquire();
     try {
       Amplify.configure({
         Auth: {
@@ -131,7 +132,7 @@ export class AmplifyAuthCredentialsFactory {
 
       return authSession.credentials;
     } finally {
-      this.lock.release();
+      AmplifyAuthCredentialsFactory.lock.release();
     }
   };
 }
diff --git a/packages/model-generator/CHANGELOG.md b/packages/model-generator/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @aws-amplify/model-generator
 
+## 1.0.8
+
+### Patch Changes
+
+- e325044: Prefer amplify errors in generators
+- Updated dependencies [87dbf41]
+  - @aws-amplify/plugin-types@1.3.0
+
 ## 1.0.7
 
 ### Patch Changes
diff --git a/packages/model-generator/package.json b/packages/model-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/model-generator",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "type": "module",
   "publishConfig": {
     "access": "public"
@@ -24,7 +24,7 @@
     "@aws-amplify/graphql-generator": "^0.4.0",
     "@aws-amplify/graphql-types-generator": "^3.6.0",
     "@aws-amplify/platform-core": "^1.0.5",
-    "@aws-amplify/plugin-types": "^1.2.2",
+    "@aws-amplify/plugin-types": "^1.3.0",
     "@aws-sdk/client-appsync": "^3.624.0",
     "@aws-sdk/client-s3": "^3.624.0",
     "@aws-sdk/credential-providers": "^3.624.0",
diff --git a/packages/plugin-types/CHANGELOG.md b/packages/plugin-types/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @aws-amplify/plugin-types
 
+## 1.3.0
+
+### Minor Changes
+
+- 87dbf41: add new type to handle exposing stack
+
 ## 1.2.2
 
 ### Patch Changes
diff --git a/packages/plugin-types/package.json b/packages/plugin-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/plugin-types",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "types": "lib/index.d.ts",
   "type": "commonjs",
   "publishConfig": {
diff --git a/packages/schema-generator/CHANGELOG.md b/packages/schema-generator/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @aws-amplify/schema-generator
 
+## 1.2.4
+
+### Patch Changes
+
+- e325044: Prefer amplify errors in generators
+- f6b1943: Handle schema errors
+
 ## 1.2.3
 
 ### Patch Changes
diff --git a/packages/schema-generator/package.json b/packages/schema-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/schema-generator",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "type": "module",
   "publishConfig": {
     "access": "public"
