Merge branch 'main' into prefer-amplify-errors

aws-amplify · Sep 10, 2024 · e36d96f · e36d96f
2 parents e9e15bc + c10f6fc
commit e36d96f
Show file tree

Hide file tree

Showing 14 changed files with 46 additions and 22 deletions.
diff --git a/.changeset/famous-files-laugh.md b/.changeset/famous-files-laugh.md
diff --git a/.changeset/flat-hounds-speak.md b/.changeset/flat-hounds-speak.md
diff --git a/.changeset/happy-adults-think.md b/.changeset/happy-adults-think.md
@@ -0,0 +1,6 @@
+---
+'@aws-amplify/schema-generator': patch
+'@aws-amplify/model-generator': patch
+---
+
+activated no-amplify-errors, ignored lines with valid violations
diff --git a/.changeset/happy-starfishes-trade.md b/.changeset/happy-starfishes-trade.md
diff --git a/.changeset/small-gorillas-remain.md b/.changeset/small-gorillas-remain.md
diff --git a/packages/ai-constructs/CHANGELOG.md b/packages/ai-constructs/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @aws-amplify/ai-constructs
 
+## 0.1.3
+
+### Patch Changes
+
+- 041d041: Do not bundle AWS SDK if default implementation is used
+
 ## 0.1.2
 
 ### Patch Changes

diff --git a/packages/ai-constructs/package.json b/packages/ai-constructs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/ai-constructs",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"

diff --git a/packages/backend-deployer/CHANGELOG.md b/packages/backend-deployer/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @aws-amplify/backend-deployer
 
+## 1.1.1
+
+### Patch Changes
+
+- 1505414: surface synth errors if the function declaration files have not been written yet.
+
 ## 1.1.0
 
 ### Minor Changes

diff --git a/packages/backend-deployer/package.json b/packages/backend-deployer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/backend-deployer",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "type": "module",
   "publishConfig": {
     "access": "public"

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @aws-amplify/backend-cli
 
+## 1.2.6
+
+### Patch Changes
+
+- ab09375: throw user error when sandbox identifier validation fails
+- Updated dependencies [1505414]
+  - @aws-amplify/backend-deployer@1.1.1
+
 ## 1.2.5
 
 ### 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.5",
+  "version": "1.2.6",
   "description": "Command line interface for various Amplify tools",
   "bin": {
     "ampx": "lib/ampx.js",
@@ -30,7 +30,7 @@
   },
   "homepage": "https://github.com/aws-amplify/amplify-backend#readme",
   "dependencies": {
-    "@aws-amplify/backend-deployer": "^1.1.0",
+    "@aws-amplify/backend-deployer": "^1.1.1",
     "@aws-amplify/backend-output-schemas": "^1.1.0",
     "@aws-amplify/backend-secret": "^1.1.0",
     "@aws-amplify/cli-core": "^1.1.2",

diff --git a/packages/eslint-rules/src/index.ts b/packages/eslint-rules/src/index.ts
@@ -34,7 +34,15 @@ export const configs = {
         },
       },
       {
-        files: ['packages/auth-construct/src/**'],
+        files: [
+          'packages/auth-construct/src/**',
+          'packages/ai-constructs/src/**',
+          'packages/backend-output-storage/src/**',
+          'packages/deployed-backend-client/src/**',
+          'packages/form-generator/src/**',
+          'packages/model-generator/src/**',
+          'packages/schema-generator/src/**',
+        ],
         rules: {
           'amplify-backend-rules/no-amplify-errors': 'error',
         },

diff --git a/packages/model-generator/src/get_backend_output_with_error_handling.ts b/packages/model-generator/src/get_backend_output_with_error_handling.ts
@@ -20,6 +20,7 @@ export const getBackendOutputWithErrorHandling = async (
       error instanceof BackendOutputClientError &&
       error.code === BackendOutputClientErrorType.DEPLOYMENT_IN_PROGRESS
     ) {
+      // eslint-disable-next-line amplify-backend-rules/no-amplify-errors
       throw new AmplifyUserError(
         'DeploymentInProgressError',
         {
@@ -33,6 +34,7 @@ export const getBackendOutputWithErrorHandling = async (
       error instanceof BackendOutputClientError &&
       error.code === BackendOutputClientErrorType.NO_STACK_FOUND
     ) {
+      // eslint-disable-next-line amplify-backend-rules/no-amplify-errors
       throw new AmplifyUserError(
         'StackDoesNotExistError',
         {
@@ -47,6 +49,7 @@ export const getBackendOutputWithErrorHandling = async (
       error instanceof BackendOutputClientError &&
       error.code === BackendOutputClientErrorType.CREDENTIALS_ERROR
     ) {
+      // eslint-disable-next-line amplify-backend-rules/no-amplify-errors
       throw new AmplifyUserError(
         'CredentialsError',
         {
@@ -61,6 +64,7 @@ export const getBackendOutputWithErrorHandling = async (
       error instanceof BackendOutputClientError &&
       error.code === BackendOutputClientErrorType.ACCESS_DENIED
     ) {
+      // eslint-disable-next-line amplify-backend-rules/no-amplify-errors
       throw new AmplifyUserError(
         'AccessDeniedError',
         {

diff --git a/packages/schema-generator/src/generate_schema.ts b/packages/schema-generator/src/generate_schema.ts
@@ -39,6 +39,7 @@ export class SchemaGenerator {
     } catch (err) {
       const databaseError = err as DatabaseConnectError;
       if (databaseError.code === 'ETIMEDOUT') {
+        // eslint-disable-next-line amplify-backend-rules/no-amplify-errors
         throw new AmplifyUserError<AmplifyGenerateSchemaError>(
           'DatabaseConnectionError',
           {
@@ -117,6 +118,7 @@ export const parseDatabaseUrl = (databaseUrl: string): SQLDataSourceConfig => {
     ).filter((part) => !config[part]);
 
     if (missingParts.length > 0) {
+      // eslint-disable-next-line amplify-backend-rules/no-amplify-errors
       throw new AmplifyUserError<AmplifyGenerateSchemaError>(
         'DatabaseUrlParseError',
         {
@@ -132,6 +134,7 @@ export const parseDatabaseUrl = (databaseUrl: string): SQLDataSourceConfig => {
     return config;
   } catch (err) {
     const error = err as Error;
+    // eslint-disable-next-line amplify-backend-rules/no-amplify-errors
     throw new AmplifyUserError<AmplifyGenerateSchemaError>(
       'DatabaseUrlParseError',
       {