Merge branch 'main' into run-e2e-beta-sql-layer

Signed-off-by: Kevin Shan <siqishan@amazon.com>

.vscode/settings.json

@@ -2,7 +2,7 @@
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "never"
   },
-  "editor.formatOnSave": false,
+  "editor.formatOnSave": true,
   "editor.rulers": [140],
   "eslint.format.enable": true,
   "eslint.lintTask.enable": true,

codebuild_specs/pr_workflow.yml

@@ -41,6 +41,10 @@ batch:
       buildspec: codebuild_specs/verify_cdk_version.yml
       depend-on:
         - build_linux
+    - identifier: verify_construct_dependencies
+      buildspec: codebuild_specs/verify_construct_dependencies.yml
+      depend-on:
+        - build_linux
     - identifier: verify_dependency_licenses_extract
       buildspec: codebuild_specs/verify_dependency_licenses_extract.yml
       env:

codebuild_specs/verify_construct_dependencies.yml

@@ -0,0 +1,7 @@
+version: 0.2
+env:
+  shell: bash
+phases:
+  build:
+    commands:
+      - source ./shared-scripts.sh && _verifyConstructDependencies

jest.config.base.js

@@ -0,0 +1,31 @@
+module.exports = {
+  preset: 'ts-jest',
+  transform: {
+    '^.+\\.tsx?$': 'ts-jest',
+  },
+  bail: false,
+  verbose: true,
+  testRunner: 'jest-circus/runner',
+  testMatch: ['**/?(*.)+(spec|test).[jt]s?(x)'],
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'core', 'node'],
+  collectCoverage: true,
+  coverageReporters: ['clover', 'text', 'html'],
+  coverageProvider: 'v8',
+  collectCoverageFrom: ['src/**/*.(ts|tsx|js|jsx)', '!src/**/*.test.(ts|tsx|js|jsx)', '!src/**/*.d.ts'],
+  coveragePathIgnorePatterns: ['/__tests__/', '/.*\\.template.js'],
+  coverageThreshold: {
+    global: {
+      branches: 90,
+      functions: 90,
+      lines: 90,
+    },
+  },
+  coverageDirectory: 'coverage',
+  snapshotFormat: {
+    escapeString: true,
+    printBasicPrototype: true,
+  },
+  testEnvironmentOptions: {
+    url: 'http://localhost',
+  },
+};

packages/amplify-data-construct/.jsii

@@ -6,11 +6,11 @@
     ]
   },
   "bundled": {
-    "@aws-amplify/ai-constructs": "^0.8.1",
+    "@aws-amplify/ai-constructs": "^1.0.0",
     "@aws-amplify/backend-output-schemas": "^1.0.0",
     "@aws-amplify/backend-output-storage": "^1.0.0",
     "@aws-amplify/graphql-auth-transformer": "4.1.7",
-    "@aws-amplify/graphql-conversation-transformer": "1.1.0",
+    "@aws-amplify/graphql-conversation-transformer": "1.1.2",
     "@aws-amplify/graphql-default-value-transformer": "3.1.4",
     "@aws-amplify/graphql-directives": "2.6.0",
     "@aws-amplify/graphql-function-transformer": "3.1.6",
@@ -23,11 +23,14 @@
     "@aws-amplify/graphql-relational-transformer": "3.1.1",
     "@aws-amplify/graphql-searchable-transformer": "3.0.9",
     "@aws-amplify/graphql-sql-transformer": "0.4.9",
-    "@aws-amplify/graphql-transformer": "2.2.0",
+    "@aws-amplify/graphql-transformer": "2.2.2",
     "@aws-amplify/graphql-transformer-core": "3.3.1",
     "@aws-amplify/graphql-transformer-interfaces": "4.2.0",
     "@aws-amplify/platform-core": "^1.0.0",
     "@aws-amplify/plugin-types": "^1.0.0",
+    "@aws-cdk/assert": "^2.68.0",
+    "@aws-cdk/cfnspec": "2.68.0",
+    "@aws-cdk/cloudformation-diff": "2.68.0",
     "@aws-crypto/crc32": "5.2.0",
     "@aws-crypto/sha256-browser": "5.2.0",
     "@aws-crypto/sha256-js": "^5.2.0",
@@ -100,38 +103,60 @@
     "@smithy/util-stream": "^3.1.3",
     "@smithy/util-uri-escape": "^3.0.0",
     "@smithy/util-utf8": "^3.0.0",
+    "ajv": "^8.0.1",
+    "ansi-regex": "^5.0.1",
+    "ansi-styles": "^4.1.0",
+    "astral-regex": "^2.0.0",
+    "at-least-node": "^1.0.0",
     "bowser": "^2.11.0",
+    "chalk": "^4",
     "charenc": "^0.0.2",
     "ci-info": "^3.2.0",
+    "color-convert": "^2.0.1",
+    "color-name": "~1.1.4",
     "crypt": "^0.0.2",
+    "diff": "^5.1.0",
+    "emoji-regex": "^8.0.0",
+    "fast-deep-equal": "^3.1.3",
+    "fast-uri": "^3.0.1",
     "fast-xml-parser": "4.4.1",
     "fs-extra": "^8.1.0",
     "graceful-fs": "^4.2.0",
     "graphql": "^15.5.0",
     "graphql-mapping-template": "5.0.1",
     "graphql-transformer-common": "5.1.1",
+    "has-flag": "^4.0.0",
     "hjson": "^3.2.2",
     "immer": "^9.0.12",
     "is-buffer": "~1.1.6",
     "is-ci": "^3.0.1",
+    "is-fullwidth-code-point": "^3.0.0",
+    "json-schema-traverse": "^1.0.0",
     "jsonfile": "^4.0.0",
     "libphonenumber-js": "1.9.47",
     "lodash": "^4.17.21",
     "lodash.mergewith": "^4.6.2",
+    "lodash.truncate": "^4.4.2",
     "md5": "^2.2.1",
     "object-hash": "^3.0.0",
     "pluralize": "8.0.0",
+    "require-from-string": "^2.0.2",
     "semver": "^7.6.3",
+    "slice-ansi": "^4.0.0",
+    "string-width": "^4.2.3",
+    "strip-ansi": "^6.0.1",
     "strnum": "^1.0.5",
+    "supports-color": "^7.1.0",
+    "table": "^6.8.1",
     "ts-dedent": "^2.0.0",
     "tslib": "^2.6.2",
     "universalify": "^0.1.0",
     "uuid": "^9.0.1",
     "zod": "^3.22.2"
   },
   "dependencies": {
-    "@aws-amplify/graphql-api-construct": "1.18.0",
-    "aws-cdk-lib": "^2.158.0",
+    "@aws-amplify/graphql-api-construct": "1.18.2",
+    "aws-cdk-lib": "^2.168.0",
     "constructs": "^10.3.0"
   },
   "dependencyClosure": {
@@ -1150,6 +1175,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_connectcampaignsv2": {
+          "targets": {
+            "dotnet": {
+              "package": "Amazon.CDK.AWS.ConnectCampaignsV2"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.connectcampaignsv2"
+            },
+            "python": {
+              "module": "aws_cdk.aws_connectcampaignsv2"
+            }
+          }
+        },
         "aws-cdk-lib.aws_controltower": {
           "targets": {
             "dotnet": {
@@ -1969,6 +2007,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_invoicing": {
+          "targets": {
+            "dotnet": {
+              "package": "Amazon.CDK.AWS.Invoicing"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.invoicing"
+            },
+            "python": {
+              "module": "aws_cdk.aws_invoicing"
+            }
+          }
+        },
         "aws-cdk-lib.aws_iot": {
           "targets": {
             "dotnet": {
@@ -2957,6 +3008,19 @@
             }
           }
         },
+        "aws-cdk-lib.aws_rbin": {
+          "targets": {
+            "dotnet": {
+              "package": "Amazon.CDK.AWS.Rbin"
+            },
+            "java": {
+              "package": "software.amazon.awscdk.services.rbin"
+            },
+            "python": {
+              "module": "aws_cdk.aws_rbin"
+            }
+          }
+        },
         "aws-cdk-lib.aws_rds": {
           "targets": {
             "dotnet": {
@@ -3991,7 +4055,7 @@
     "stability": "stable"
   },
   "homepage": "https://github.com/aws-amplify/amplify-category-api.git",
-  "jsiiVersion": "5.5.4 (build 1378d94)",
+  "jsiiVersion": "5.6.0 (build 7be6ace)",
   "keywords": [
     "awscdk",
     "aws-cdk",
@@ -4026,6 +4090,6 @@
     }
   },
   "types": {},
-  "version": "1.14.0",
-  "fingerprint": "O9tbfsjr+oFjPs0QnyeyJp/+ohWA9xCM+E3XUv2PDGw="
+  "version": "1.14.2",
+  "fingerprint": "APjytkZM54Hm1aMlPGMXzuoTZBDCo4V2Abg4rDYBE1A="
 }

packages/amplify-data-construct/API.md

@@ -23,6 +23,7 @@ import { CustomConflictResolutionStrategy } from '@aws-amplify/graphql-api-const
 import { CustomSqlDataSourceStrategy } from '@aws-amplify/graphql-api-construct';
 import { DataStoreConfiguration } from '@aws-amplify/graphql-api-construct';
 import { DefaultDynamoDbModelDataSourceStrategy } from '@aws-amplify/graphql-api-construct';
+import { FieldLogLevel } from '@aws-amplify/graphql-api-construct';
 import { FunctionSlot } from '@aws-amplify/graphql-api-construct';
 import { FunctionSlotBase } from '@aws-amplify/graphql-api-construct';
 import { FunctionSlotOverride } from '@aws-amplify/graphql-api-construct';
@@ -33,6 +34,8 @@ import { IBackendOutputStorageStrategy } from '@aws-amplify/graphql-api-construc
 import { IdentityPoolAuthorizationConfig } from '@aws-amplify/graphql-api-construct';
 import { ImportedAmplifyDynamoDbModelDataSourceStrategy } from '@aws-amplify/graphql-api-construct';
 import { LambdaAuthorizationConfig } from '@aws-amplify/graphql-api-construct';
+import { LogConfig } from '@aws-amplify/graphql-api-construct';
+import { Logging } from '@aws-amplify/graphql-api-construct';
 import { ModelDataSourceStrategy } from '@aws-amplify/graphql-api-construct';
 import { ModelDataSourceStrategyDbType } from '@aws-amplify/graphql-api-construct';
 import { ModelDataSourceStrategySqlDbType } from '@aws-amplify/graphql-api-construct';
@@ -43,6 +46,7 @@ import { PartialTranslationBehavior } from '@aws-amplify/graphql-api-construct';
 import { ProvisionedConcurrencyConfig } from '@aws-amplify/graphql-api-construct';
 import { ProvisionedThroughput } from '@aws-amplify/graphql-api-construct';
 import { QueryFunctionSlot } from '@aws-amplify/graphql-api-construct';
+import { RetentionDays } from '@aws-amplify/graphql-api-construct';
 import { SQLLambdaModelDataSourceStrategy } from '@aws-amplify/graphql-api-construct';
 import { SQLLambdaModelDataSourceStrategyFactory } from '@aws-amplify/graphql-api-construct';
 import { SqlModelDataSourceDbConnectionConfig } from '@aws-amplify/graphql-api-construct';
@@ -99,6 +103,8 @@ export { DataStoreConfiguration }
 
 export { DefaultDynamoDbModelDataSourceStrategy }
 
+export { FieldLogLevel }
+
 export { FunctionSlot }
 
 export { FunctionSlotBase }
@@ -119,6 +125,10 @@ export { ImportedAmplifyDynamoDbModelDataSourceStrategy }
 
 export { LambdaAuthorizationConfig }
 
+export { LogConfig }
+
+export { Logging }
+
 export { ModelDataSourceStrategy }
 
 export { ModelDataSourceStrategyDbType }
@@ -139,6 +149,8 @@ export { ProvisionedThroughput }
 
 export { QueryFunctionSlot }
 
+export { RetentionDays }
+
 export { SQLLambdaModelDataSourceStrategy }
 
 export { SQLLambdaModelDataSourceStrategyFactory }

packages/amplify-data-construct/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.14.2](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/data-construct@1.14.1...@aws-amplify/data-construct@1.14.2) (2024-11-20)
+
+### Bug Fixes
+
+- bump ai-constructs to ^1.0.0 ([#3040](https://github.com/aws-amplify/amplify-category-api/issues/3040)) ([0e9e195](https://github.com/aws-amplify/amplify-category-api/commit/0e9e195b05e7d40e41c29b82b8f3fb3a8961d80b))
+
+## [1.14.1](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/data-construct@1.14.0...@aws-amplify/data-construct@1.14.1) (2024-11-20)
+
+**Note:** Version bump only for package @aws-amplify/data-construct
+
 # [1.14.0](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/data-construct@1.13.3...@aws-amplify/data-construct@1.14.0) (2024-11-19)
 
 ### Features

packages/amplify-data-construct/jest.config.js

@@ -0,0 +1,5 @@
+const baseConfig = require('../../jest.config.base.js'); // eslint-disable-line @typescript-eslint/no-var-requires
+
+module.exports = {
+  ...baseConfig,
+};