diff --git a/.changeset/perfect-coins-tease.md b/.changeset/perfect-coins-tease.md new file mode 100644 index 00000000000..e7fbcba59df --- /dev/null +++ b/.changeset/perfect-coins-tease.md @@ -0,0 +1,6 @@ +--- +'@aws-amplify/backend-data': minor +'@aws-amplify/schema-generator': minor +--- + +support custom SSL certificates in SQL data sources diff --git a/package-lock.json b/package-lock.json index 09b59890dfc..3ac4b6a83e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -620,9 +620,9 @@ } }, "node_modules/@aws-amplify/data-construct": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@aws-amplify/data-construct/-/data-construct-1.8.0.tgz", - "integrity": "sha512-RkJ+y+sG2GYW96bx3IZRxIBbfBj7s6KIuMPDluX6DH0gSWpd2pJiLUyXlGZPkPpO6cJjgB4sXER9f+ORPpqudA==", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/@aws-amplify/data-construct/-/data-construct-1.9.1.tgz", + "integrity": "sha512-xnL5zZBJ1EYCoqG8Y1BnGJ24sutBWcchxd1NflNiM4Dk9o1m47GNxnJOdIUp7c5pewKSTvGXk37lTesHPIcuvw==", "bundleDependencies": [ "@aws-amplify/backend-output-schemas", "@aws-amplify/backend-output-storage", @@ -666,22 +666,22 @@ "dependencies": { "@aws-amplify/backend-output-schemas": "^0.4.0", "@aws-amplify/backend-output-storage": "^0.2.2", - "@aws-amplify/graphql-api-construct": "1.9.0", - "@aws-amplify/graphql-auth-transformer": "3.5.0", - "@aws-amplify/graphql-default-value-transformer": "2.3.4", + "@aws-amplify/graphql-api-construct": "1.11.1", + "@aws-amplify/graphql-auth-transformer": "3.6.2", + "@aws-amplify/graphql-default-value-transformer": "2.3.10", "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-function-transformer": "2.1.21", - "@aws-amplify/graphql-http-transformer": "2.1.21", - "@aws-amplify/graphql-index-transformer": "2.4.0", - "@aws-amplify/graphql-maps-to-transformer": "3.4.12", - "@aws-amplify/graphql-model-transformer": "2.9.0", - "@aws-amplify/graphql-predictions-transformer": "2.1.21", - "@aws-amplify/graphql-relational-transformer": "2.5.0", - "@aws-amplify/graphql-searchable-transformer": "2.7.0", - "@aws-amplify/graphql-sql-transformer": "0.3.0", - "@aws-amplify/graphql-transformer": "1.5.2", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-function-transformer": "2.1.25", + "@aws-amplify/graphql-http-transformer": "2.1.25", + "@aws-amplify/graphql-index-transformer": "2.4.6", + "@aws-amplify/graphql-maps-to-transformer": "3.4.20", + "@aws-amplify/graphql-model-transformer": "2.11.1", + "@aws-amplify/graphql-predictions-transformer": "2.1.25", + "@aws-amplify/graphql-relational-transformer": "2.5.8", + "@aws-amplify/graphql-searchable-transformer": "2.7.6", + "@aws-amplify/graphql-sql-transformer": "0.3.6", + "@aws-amplify/graphql-transformer": "1.6.2", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "@aws-amplify/platform-core": "^0.2.0", "@aws-amplify/plugin-types": "^0.4.1", "charenc": "^0.0.2", @@ -690,7 +690,7 @@ "graceful-fs": "^4.2.11", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1", + "graphql-transformer-common": "4.31.1", "hjson": "^3.2.2", "immer": "^9.0.12", "is-buffer": "^2.0.5", @@ -730,18 +730,18 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-auth-transformer": { - "version": "3.5.0", + "version": "3.6.2", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-model-transformer": "2.9.0", - "@aws-amplify/graphql-relational-transformer": "2.5.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-model-transformer": "2.11.1", + "@aws-amplify/graphql-relational-transformer": "2.5.8", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1", + "graphql-transformer-common": "4.31.1", "lodash": "^4.17.21", "md5": "^2.3.0" }, @@ -751,16 +751,16 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-default-value-transformer": { - "version": "2.3.4", + "version": "2.3.10", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1", + "graphql-transformer-common": "4.31.1", "libphonenumber-js": "1.9.47" } }, @@ -770,16 +770,16 @@ "license": "Apache-2.0" }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-function-transformer": { - "version": "2.1.21", + "version": "2.1.25", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1" + "graphql-transformer-common": "4.31.1" }, "peerDependencies": { "aws-cdk-lib": "^2.80.0", @@ -787,16 +787,16 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-http-transformer": { - "version": "2.1.21", + "version": "2.1.25", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1" + "graphql-transformer-common": "4.31.1" }, "peerDependencies": { "aws-cdk-lib": "^2.80.0", @@ -804,17 +804,17 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-index-transformer": { - "version": "2.4.0", + "version": "2.4.6", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-model-transformer": "2.9.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-model-transformer": "2.11.1", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1" + "graphql-transformer-common": "4.31.1" }, "peerDependencies": { "aws-cdk-lib": "^2.80.0", @@ -822,15 +822,15 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-maps-to-transformer": { - "version": "3.4.12", + "version": "3.4.20", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1" + "graphql-transformer-common": "4.31.1" }, "peerDependencies": { "aws-cdk-lib": "^2.80.0", @@ -838,16 +838,16 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-model-transformer": { - "version": "2.9.0", + "version": "2.11.1", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1" + "graphql-transformer-common": "4.31.1" }, "peerDependencies": { "aws-cdk-lib": "^2.80.0", @@ -855,16 +855,16 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-predictions-transformer": { - "version": "2.1.21", + "version": "2.1.25", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1" + "graphql-transformer-common": "4.31.1" }, "peerDependencies": { "aws-cdk-lib": "^2.80.0", @@ -872,18 +872,18 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-relational-transformer": { - "version": "2.5.0", + "version": "2.5.8", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-index-transformer": "2.4.0", - "@aws-amplify/graphql-model-transformer": "2.9.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-index-transformer": "2.4.6", + "@aws-amplify/graphql-model-transformer": "2.11.1", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1", + "graphql-transformer-common": "4.31.1", "immer": "^9.0.12" }, "peerDependencies": { @@ -892,17 +892,17 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-searchable-transformer": { - "version": "2.7.0", + "version": "2.7.6", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-model-transformer": "2.9.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-model-transformer": "2.11.1", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1" + "graphql-transformer-common": "4.31.1" }, "peerDependencies": { "aws-cdk-lib": "^2.80.0", @@ -910,17 +910,17 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-sql-transformer": { - "version": "0.3.0", + "version": "0.3.6", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-model-transformer": "2.9.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-model-transformer": "2.11.1", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1" + "graphql-transformer-common": "4.31.1" }, "peerDependencies": { "aws-cdk-lib": "^2.80.0", @@ -928,23 +928,23 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-transformer": { - "version": "1.5.2", + "version": "1.6.2", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-auth-transformer": "3.5.0", - "@aws-amplify/graphql-default-value-transformer": "2.3.4", - "@aws-amplify/graphql-function-transformer": "2.1.21", - "@aws-amplify/graphql-http-transformer": "2.1.21", - "@aws-amplify/graphql-index-transformer": "2.4.0", - "@aws-amplify/graphql-maps-to-transformer": "3.4.12", - "@aws-amplify/graphql-model-transformer": "2.9.0", - "@aws-amplify/graphql-predictions-transformer": "2.1.21", - "@aws-amplify/graphql-relational-transformer": "2.5.0", - "@aws-amplify/graphql-searchable-transformer": "2.7.0", - "@aws-amplify/graphql-sql-transformer": "0.3.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0" + "@aws-amplify/graphql-auth-transformer": "3.6.2", + "@aws-amplify/graphql-default-value-transformer": "2.3.10", + "@aws-amplify/graphql-function-transformer": "2.1.25", + "@aws-amplify/graphql-http-transformer": "2.1.25", + "@aws-amplify/graphql-index-transformer": "2.4.6", + "@aws-amplify/graphql-maps-to-transformer": "3.4.20", + "@aws-amplify/graphql-model-transformer": "2.11.1", + "@aws-amplify/graphql-predictions-transformer": "2.1.25", + "@aws-amplify/graphql-relational-transformer": "2.5.8", + "@aws-amplify/graphql-searchable-transformer": "2.7.6", + "@aws-amplify/graphql-sql-transformer": "0.3.6", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0" }, "peerDependencies": { "aws-cdk-lib": "^2.80.0", @@ -952,16 +952,16 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-transformer-core": { - "version": "2.7.0", + "version": "2.9.2", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "fs-extra": "^8.1.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1", + "graphql-transformer-common": "4.31.1", "hjson": "^3.2.2", "lodash": "^4.17.21", "md5": "^2.3.0", @@ -974,7 +974,7 @@ } }, "node_modules/@aws-amplify/data-construct/node_modules/@aws-amplify/graphql-transformer-interfaces": { - "version": "3.7.0", + "version": "3.10.0", "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -1066,7 +1066,7 @@ "license": "Apache-2.0" }, "node_modules/@aws-amplify/data-construct/node_modules/graphql-transformer-common": { - "version": "4.30.1", + "version": "4.31.1", "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -1202,9 +1202,9 @@ } }, "node_modules/@aws-amplify/data-schema-types": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@aws-amplify/data-schema-types/-/data-schema-types-1.0.0.tgz", - "integrity": "sha512-sjw68YTpGNSDoNI1WBAgFWaUFpmmwFtkZQE/r+P9jWrVZPyBlfDeRIc3RhPgUrtW91hLCm4WA8TzYf1eZzJstg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@aws-amplify/data-schema-types/-/data-schema-types-1.1.1.tgz", + "integrity": "sha512-WhWEEsztpSSxIY0lJ3Ge5iA4g3PBm66SQmy1fBH1FBq0T+cxUBijifOU8MNwf+tf6lGpArMX0RS54HRVF5fUSA==", "dependencies": { "graphql": "15.8.0", "rxjs": "^7.8.1" @@ -1236,9 +1236,9 @@ "link": true }, "node_modules/@aws-amplify/graphql-api-construct": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-api-construct/-/graphql-api-construct-1.9.0.tgz", - "integrity": "sha512-Syap3/oH1yqYni+aq2Lg3NlztC7SKvn6MJgDdv7mPJ+YhT3rOs8Xe5i+gZ7BuDQXb1YoKjur/3LY0S8ZcaDpDg==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-api-construct/-/graphql-api-construct-1.11.1.tgz", + "integrity": "sha512-FMTPU4yPOM10f1eM9ZwEOlyfHJBRrCVZoC/1DC9KVHxjt27lcpHYH8U227IBGEecqWxBjI6e7Vopd9ibjroFdA==", "bundleDependencies": [ "@aws-amplify/backend-output-schemas", "@aws-amplify/backend-output-storage", @@ -1282,21 +1282,21 @@ "dependencies": { "@aws-amplify/backend-output-schemas": "^0.4.0", "@aws-amplify/backend-output-storage": "^0.2.2", - "@aws-amplify/graphql-auth-transformer": "3.5.0", - "@aws-amplify/graphql-default-value-transformer": "2.3.4", + "@aws-amplify/graphql-auth-transformer": "3.6.2", + "@aws-amplify/graphql-default-value-transformer": "2.3.10", "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-function-transformer": "2.1.21", - "@aws-amplify/graphql-http-transformer": "2.1.21", - "@aws-amplify/graphql-index-transformer": "2.4.0", - "@aws-amplify/graphql-maps-to-transformer": "3.4.12", - "@aws-amplify/graphql-model-transformer": "2.9.0", - "@aws-amplify/graphql-predictions-transformer": "2.1.21", - "@aws-amplify/graphql-relational-transformer": "2.5.0", - "@aws-amplify/graphql-searchable-transformer": "2.7.0", - "@aws-amplify/graphql-sql-transformer": "0.3.0", - "@aws-amplify/graphql-transformer": "1.5.2", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-function-transformer": "2.1.25", + "@aws-amplify/graphql-http-transformer": "2.1.25", + "@aws-amplify/graphql-index-transformer": "2.4.6", + "@aws-amplify/graphql-maps-to-transformer": "3.4.20", + "@aws-amplify/graphql-model-transformer": "2.11.1", + "@aws-amplify/graphql-predictions-transformer": "2.1.25", + "@aws-amplify/graphql-relational-transformer": "2.5.8", + "@aws-amplify/graphql-searchable-transformer": "2.7.6", + "@aws-amplify/graphql-sql-transformer": "0.3.6", + "@aws-amplify/graphql-transformer": "1.6.2", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "@aws-amplify/platform-core": "^0.2.0", "@aws-amplify/plugin-types": "^0.4.1", "charenc": "^0.0.2", @@ -1305,7 +1305,7 @@ "graceful-fs": "^4.2.11", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1", + "graphql-transformer-common": "4.31.1", "hjson": "^3.2.2", "immer": "^9.0.12", "is-buffer": "^2.0.5", @@ -1345,18 +1345,18 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-auth-transformer": { - "version": "3.5.0", + "version": "3.6.2", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-model-transformer": "2.9.0", - "@aws-amplify/graphql-relational-transformer": "2.5.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-model-transformer": "2.11.1", + "@aws-amplify/graphql-relational-transformer": "2.5.8", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1", + "graphql-transformer-common": "4.31.1", "lodash": "^4.17.21", "md5": "^2.3.0" }, @@ -1366,16 +1366,16 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-default-value-transformer": { - "version": "2.3.4", + "version": "2.3.10", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1", + "graphql-transformer-common": "4.31.1", "libphonenumber-js": "1.9.47" } }, @@ -1385,16 +1385,16 @@ "license": "Apache-2.0" }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-function-transformer": { - "version": "2.1.21", + "version": "2.1.25", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1" + "graphql-transformer-common": "4.31.1" }, "peerDependencies": { "aws-cdk-lib": "^2.80.0", @@ -1402,16 +1402,16 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-http-transformer": { - "version": "2.1.21", + "version": "2.1.25", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1" + "graphql-transformer-common": "4.31.1" }, "peerDependencies": { "aws-cdk-lib": "^2.80.0", @@ -1419,17 +1419,17 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-index-transformer": { - "version": "2.4.0", + "version": "2.4.6", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-model-transformer": "2.9.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-model-transformer": "2.11.1", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1" + "graphql-transformer-common": "4.31.1" }, "peerDependencies": { "aws-cdk-lib": "^2.80.0", @@ -1437,15 +1437,15 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-maps-to-transformer": { - "version": "3.4.12", + "version": "3.4.20", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1" + "graphql-transformer-common": "4.31.1" }, "peerDependencies": { "aws-cdk-lib": "^2.80.0", @@ -1453,16 +1453,16 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-model-transformer": { - "version": "2.9.0", + "version": "2.11.1", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1" + "graphql-transformer-common": "4.31.1" }, "peerDependencies": { "aws-cdk-lib": "^2.80.0", @@ -1470,16 +1470,16 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-predictions-transformer": { - "version": "2.1.21", + "version": "2.1.25", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1" + "graphql-transformer-common": "4.31.1" }, "peerDependencies": { "aws-cdk-lib": "^2.80.0", @@ -1487,18 +1487,18 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-relational-transformer": { - "version": "2.5.0", + "version": "2.5.8", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-index-transformer": "2.4.0", - "@aws-amplify/graphql-model-transformer": "2.9.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-index-transformer": "2.4.6", + "@aws-amplify/graphql-model-transformer": "2.11.1", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1", + "graphql-transformer-common": "4.31.1", "immer": "^9.0.12" }, "peerDependencies": { @@ -1507,17 +1507,17 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-searchable-transformer": { - "version": "2.7.0", + "version": "2.7.6", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-model-transformer": "2.9.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-model-transformer": "2.11.1", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1" + "graphql-transformer-common": "4.31.1" }, "peerDependencies": { "aws-cdk-lib": "^2.80.0", @@ -1525,17 +1525,17 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-sql-transformer": { - "version": "0.3.0", + "version": "0.3.6", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-model-transformer": "2.9.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-model-transformer": "2.11.1", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1" + "graphql-transformer-common": "4.31.1" }, "peerDependencies": { "aws-cdk-lib": "^2.80.0", @@ -1543,23 +1543,23 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-transformer": { - "version": "1.5.2", + "version": "1.6.2", "inBundle": true, "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-auth-transformer": "3.5.0", - "@aws-amplify/graphql-default-value-transformer": "2.3.4", - "@aws-amplify/graphql-function-transformer": "2.1.21", - "@aws-amplify/graphql-http-transformer": "2.1.21", - "@aws-amplify/graphql-index-transformer": "2.4.0", - "@aws-amplify/graphql-maps-to-transformer": "3.4.12", - "@aws-amplify/graphql-model-transformer": "2.9.0", - "@aws-amplify/graphql-predictions-transformer": "2.1.21", - "@aws-amplify/graphql-relational-transformer": "2.5.0", - "@aws-amplify/graphql-searchable-transformer": "2.7.0", - "@aws-amplify/graphql-sql-transformer": "0.3.0", - "@aws-amplify/graphql-transformer-core": "2.7.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0" + "@aws-amplify/graphql-auth-transformer": "3.6.2", + "@aws-amplify/graphql-default-value-transformer": "2.3.10", + "@aws-amplify/graphql-function-transformer": "2.1.25", + "@aws-amplify/graphql-http-transformer": "2.1.25", + "@aws-amplify/graphql-index-transformer": "2.4.6", + "@aws-amplify/graphql-maps-to-transformer": "3.4.20", + "@aws-amplify/graphql-model-transformer": "2.11.1", + "@aws-amplify/graphql-predictions-transformer": "2.1.25", + "@aws-amplify/graphql-relational-transformer": "2.5.8", + "@aws-amplify/graphql-searchable-transformer": "2.7.6", + "@aws-amplify/graphql-sql-transformer": "0.3.6", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0" }, "peerDependencies": { "aws-cdk-lib": "^2.80.0", @@ -1567,16 +1567,16 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-transformer-core": { - "version": "2.7.0", + "version": "2.9.2", "inBundle": true, "license": "Apache-2.0", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-transformer-interfaces": "3.7.0", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "fs-extra": "^8.1.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.30.1", + "graphql-transformer-common": "4.31.1", "hjson": "^3.2.2", "lodash": "^4.17.21", "md5": "^2.3.0", @@ -1589,7 +1589,7 @@ } }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/@aws-amplify/graphql-transformer-interfaces": { - "version": "3.7.0", + "version": "3.10.0", "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -1681,7 +1681,7 @@ "license": "Apache-2.0" }, "node_modules/@aws-amplify/graphql-api-construct/node_modules/graphql-transformer-common": { - "version": "4.30.1", + "version": "4.31.1", "inBundle": true, "license": "Apache-2.0", "dependencies": { @@ -1944,12 +1944,12 @@ "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==" }, "node_modules/@aws-amplify/graphql-schema-generator": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-schema-generator/-/graphql-schema-generator-0.9.0.tgz", - "integrity": "sha512-TDco+WuNv76QqNCaP/W3OjlAGgToptmFRq/0yThqLlW2p8mV6KHpmqAHIJnxNl/fI8R+wbscOmM/0Q1oYzPwAg==", + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-schema-generator/-/graphql-schema-generator-0.9.2.tgz", + "integrity": "sha512-D2N2shrTvkDoB8WtyPzreqFuAof2sHthfa2GzPZ1s1EvCvm/G6yuwpM1fKZ0yWLiXMzjVqzkx+nIporMAu2Luw==", "dependencies": { - "@aws-amplify/graphql-transformer-core": "2.9.0", - "@aws-amplify/graphql-transformer-interfaces": "3.9.0", + "@aws-amplify/graphql-transformer-core": "2.9.2", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "@aws-sdk/client-ec2": "3.338.0", "@aws-sdk/client-iam": "3.338.0", "@aws-sdk/client-lambda": "3.338.0", @@ -1957,7 +1957,7 @@ "csv-parse": "^5.5.2", "fs-extra": "11.1.1", "graphql": "^15.5.0", - "graphql-transformer-common": "4.31.0", + "graphql-transformer-common": "4.31.1", "knex": "~2.4.0", "mysql2": "~3.9.7", "ora": "^4.0.3", @@ -2511,16 +2511,16 @@ } }, "node_modules/@aws-amplify/graphql-transformer-core": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-transformer-core/-/graphql-transformer-core-2.9.0.tgz", - "integrity": "sha512-aIS4seXV+hxHpjnrQ9eA8FQYdzNxeuAtneshmBApDC4RvNaeTEwLv7qSsT//ZMkbW+ngK38hEmVOf14Ua2ZdEg==", + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-transformer-core/-/graphql-transformer-core-2.9.2.tgz", + "integrity": "sha512-rYLv4vYJohbqJKpavBhxbq4LMxaytmhrQ8cAbJ0BSg4nTR2mobmBeFn+gjtTviGTcHLNGKjZN/+5E0mM1wTNHA==", "dependencies": { "@aws-amplify/graphql-directives": "1.1.0", - "@aws-amplify/graphql-transformer-interfaces": "3.9.0", + "@aws-amplify/graphql-transformer-interfaces": "3.10.0", "fs-extra": "^8.1.0", "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", - "graphql-transformer-common": "4.31.0", + "graphql-transformer-common": "4.31.1", "hjson": "^3.2.2", "lodash": "^4.17.21", "md5": "^2.3.0", @@ -2570,9 +2570,9 @@ } }, "node_modules/@aws-amplify/graphql-transformer-interfaces": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-transformer-interfaces/-/graphql-transformer-interfaces-3.9.0.tgz", - "integrity": "sha512-MlO+jABhnRlxWtgqrg+V++JQOU0HwP+s7WOFKIsQuzoj6137DEyPYoY6rXm8mlUFzpdcq8gTob866d/SDWPCYQ==", + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/@aws-amplify/graphql-transformer-interfaces/-/graphql-transformer-interfaces-3.10.0.tgz", + "integrity": "sha512-8FOonxB58ytIXWIYNBGifUz4Y+6GW6QMajmdlMMjqlDIwdYbZg+HItPC22K2SewF93CgH1IOFYwNmZYk9L7wiQ==", "dependencies": { "graphql": "^15.5.0" }, @@ -20875,9 +20875,9 @@ } }, "node_modules/graphql-transformer-common": { - "version": "4.31.0", - "resolved": "https://registry.npmjs.org/graphql-transformer-common/-/graphql-transformer-common-4.31.0.tgz", - "integrity": "sha512-y5VUlFIz/tI8xyRrUmHWpbjMyP4FFrZd1hEncUtttho4mNuauaQh98m2d8oCvSdTU/JnxNHkwIJ2plu9jHzVig==", + "version": "4.31.1", + "resolved": "https://registry.npmjs.org/graphql-transformer-common/-/graphql-transformer-common-4.31.1.tgz", + "integrity": "sha512-s+C2S3PrDyuAR0ZDj9vq/DaV3ZUMf04VzacIPrc9wodvtF76Jr4E/ZzXnUAC1dKX96oK3E31W/7jilQoyZj8Rg==", "dependencies": { "graphql": "^15.5.0", "graphql-mapping-template": "4.20.16", @@ -27733,12 +27733,12 @@ }, "packages/auth-construct": { "name": "@aws-amplify/auth-construct", - "version": "1.1.4", + "version": "1.1.5", "license": "Apache-2.0", "dependencies": { "@aws-amplify/backend-output-schemas": "^1.1.0", - "@aws-amplify/backend-output-storage": "^1.0.1", - "@aws-amplify/plugin-types": "^1.0.0", + "@aws-amplify/backend-output-storage": "^1.0.2", + "@aws-amplify/plugin-types": "^1.0.1", "@aws-sdk/util-arn-parser": "^3.465.0" }, "peerDependencies": { @@ -27748,20 +27748,20 @@ }, "packages/backend": { "name": "@aws-amplify/backend", - "version": "1.0.3", + "version": "1.0.4", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/backend-auth": "^1.0.2", - "@aws-amplify/backend-data": "^1.0.2", - "@aws-amplify/backend-function": "^1.0.3", + "@aws-amplify/backend-auth": "^1.1.0", + "@aws-amplify/backend-data": "^1.0.3", + "@aws-amplify/backend-function": "^1.1.0", "@aws-amplify/backend-output-schemas": "^1.1.0", - "@aws-amplify/backend-output-storage": "^1.0.1", + "@aws-amplify/backend-output-storage": "^1.0.2", "@aws-amplify/backend-secret": "^1.0.0", - "@aws-amplify/backend-storage": "^1.0.2", - "@aws-amplify/client-config": "^1.0.3", + "@aws-amplify/backend-storage": "^1.0.4", + "@aws-amplify/client-config": "^1.0.5", "@aws-amplify/data-schema": "^1.0.0", "@aws-amplify/platform-core": "^1.0.1", - "@aws-amplify/plugin-types": "^1.0.0", + "@aws-amplify/plugin-types": "^1.0.1", "@aws-sdk/client-amplify": "^3.465.0", "lodash.snakecase": "^4.1.1" }, @@ -27777,12 +27777,12 @@ }, "packages/backend-auth": { "name": "@aws-amplify/backend-auth", - "version": "1.0.2", + "version": "1.1.0", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/auth-construct": "^1.1.1", - "@aws-amplify/backend-output-storage": "^1.0.1", - "@aws-amplify/plugin-types": "^1.0.0" + "@aws-amplify/auth-construct": "^1.1.5", + "@aws-amplify/backend-output-storage": "^1.0.2", + "@aws-amplify/plugin-types": "^1.0.1" }, "devDependencies": { "@aws-amplify/backend-platform-test-stubs": "^0.3.3", @@ -27795,14 +27795,14 @@ }, "packages/backend-data": { "name": "@aws-amplify/backend-data", - "version": "1.0.2", + "version": "1.0.3", "license": "Apache-2.0", "dependencies": { "@aws-amplify/backend-output-schemas": "^1.1.0", - "@aws-amplify/backend-output-storage": "^1.0.1", - "@aws-amplify/data-construct": "^1.8.0", - "@aws-amplify/data-schema-types": "^1.0.0", - "@aws-amplify/plugin-types": "^1.0.0" + "@aws-amplify/backend-output-storage": "^1.0.2", + "@aws-amplify/data-construct": "^1.9.1", + "@aws-amplify/data-schema-types": "^1.1.1", + "@aws-amplify/plugin-types": "^1.0.1" }, "devDependencies": { "@aws-amplify/backend-platform-test-stubs": "^0.3.3", @@ -27816,11 +27816,11 @@ }, "packages/backend-deployer": { "name": "@aws-amplify/backend-deployer", - "version": "1.0.0", + "version": "1.0.1", "license": "Apache-2.0", "dependencies": { "@aws-amplify/platform-core": "^1.0.0", - "@aws-amplify/plugin-types": "^1.0.0", + "@aws-amplify/plugin-types": "^1.0.1", "execa": "^8.0.1", "tsx": "^4.6.1" }, @@ -27831,12 +27831,12 @@ }, "packages/backend-function": { "name": "@aws-amplify/backend-function", - "version": "1.0.3", + "version": "1.1.0", "license": "Apache-2.0", "dependencies": { "@aws-amplify/backend-output-schemas": "^1.1.0", - "@aws-amplify/backend-output-storage": "^1.0.1", - "@aws-amplify/plugin-types": "^1.0.0", + "@aws-amplify/backend-output-storage": "^1.0.2", + "@aws-amplify/plugin-types": "^1.0.1", "execa": "^8.0.1" }, "devDependencies": { @@ -27877,7 +27877,7 @@ }, "packages/backend-output-storage": { "name": "@aws-amplify/backend-output-storage", - "version": "1.0.1", + "version": "1.0.2", "license": "Apache-2.0", "dependencies": { "@aws-amplify/backend-output-schemas": "^1.1.0", @@ -27911,12 +27911,12 @@ }, "packages/backend-storage": { "name": "@aws-amplify/backend-storage", - "version": "1.0.3", + "version": "1.0.4", "license": "Apache-2.0", "dependencies": { "@aws-amplify/backend-output-schemas": "^1.1.0", - "@aws-amplify/backend-output-storage": "^1.0.1", - "@aws-amplify/plugin-types": "^1.0.0" + "@aws-amplify/backend-output-storage": "^1.0.2", + "@aws-amplify/plugin-types": "^1.0.1" }, "devDependencies": { "@aws-amplify/backend-platform-test-stubs": "^0.3.3", @@ -27929,20 +27929,20 @@ }, "packages/cli": { "name": "@aws-amplify/backend-cli", - "version": "1.0.4", + "version": "1.1.0", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/backend-deployer": "^1.0.0", + "@aws-amplify/backend-deployer": "^1.0.1", "@aws-amplify/backend-output-schemas": "^1.1.0", "@aws-amplify/backend-secret": "^1.0.0", "@aws-amplify/cli-core": "^1.0.0", - "@aws-amplify/client-config": "^1.0.3", + "@aws-amplify/client-config": "^1.0.5", "@aws-amplify/deployed-backend-client": "^1.0.1", "@aws-amplify/form-generator": "^1.0.0", "@aws-amplify/model-generator": "^1.0.1", "@aws-amplify/platform-core": "^1.0.1", - "@aws-amplify/sandbox": "^1.0.3", - "@aws-amplify/schema-generator": "^1.0.0", + "@aws-amplify/sandbox": "^1.0.5", + "@aws-amplify/schema-generator": "^1.1.0", "@aws-sdk/client-amplify": "^3.465.0", "@aws-sdk/client-cloudformation": "^3.465.0", "@aws-sdk/client-s3": "^3.465.0", @@ -28074,7 +28074,7 @@ }, "packages/client-config": { "name": "@aws-amplify/client-config", - "version": "1.0.4", + "version": "1.0.5", "license": "Apache-2.0", "dependencies": { "@aws-amplify/backend-output-schemas": "^1.1.0", @@ -28095,12 +28095,12 @@ } }, "packages/create-amplify": { - "version": "1.0.1", + "version": "1.0.2", "license": "Apache-2.0", "dependencies": { "@aws-amplify/cli-core": "^1.0.0", "@aws-amplify/platform-core": "^1.0.0", - "@aws-amplify/plugin-types": "^1.0.0", + "@aws-amplify/plugin-types": "^1.0.1", "execa": "^8.0.1", "kleur": "^4.1.5", "yargs": "^17.7.2" @@ -28351,7 +28351,7 @@ }, "packages/plugin-types": { "name": "@aws-amplify/plugin-types", - "version": "1.0.0", + "version": "1.0.1", "license": "Apache-2.0", "devDependencies": { "execa": "^5.1.1" @@ -28471,13 +28471,13 @@ }, "packages/sandbox": { "name": "@aws-amplify/sandbox", - "version": "1.0.4", + "version": "1.0.5", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/backend-deployer": "^1.0.0", + "@aws-amplify/backend-deployer": "^1.0.1", "@aws-amplify/backend-secret": "^1.0.0", "@aws-amplify/cli-core": "^1.0.0", - "@aws-amplify/client-config": "^1.0.4", + "@aws-amplify/client-config": "^1.0.5", "@aws-amplify/deployed-backend-client": "^1.0.2", "@aws-amplify/platform-core": "^1.0.1", "@aws-sdk/client-cloudformation": "^3.465.0", @@ -28500,10 +28500,10 @@ }, "packages/schema-generator": { "name": "@aws-amplify/schema-generator", - "version": "1.0.0", + "version": "1.1.0", "license": "Apache-2.0", "dependencies": { - "@aws-amplify/graphql-schema-generator": "^0.9.0", + "@aws-amplify/graphql-schema-generator": "^0.9.2", "@aws-amplify/platform-core": "^1.0.0" } } diff --git a/package.json b/package.json index 25981f1d09b..19b680cf88a 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "", "type": "module", "scripts": { - "build": "tsc --build packages/* && tsc --build scripts", + "build": "tsc --build packages/* scripts", "check:api": "npm run update:api && tsx scripts/check_api_extract.ts", "check:dependencies": "tsx scripts/check_dependencies.ts", "check:package-lock": "tsx scripts/check_package_lock.ts", diff --git a/packages/backend-data/package.json b/packages/backend-data/package.json index 52bb5b9ee92..ed089360519 100644 --- a/packages/backend-data/package.json +++ b/packages/backend-data/package.json @@ -29,8 +29,8 @@ "dependencies": { "@aws-amplify/backend-output-storage": "^1.0.2", "@aws-amplify/backend-output-schemas": "^1.1.0", - "@aws-amplify/data-construct": "^1.8.0", + "@aws-amplify/data-construct": "^1.9.1", "@aws-amplify/plugin-types": "^1.0.1", - "@aws-amplify/data-schema-types": "^1.0.0" + "@aws-amplify/data-schema-types": "^1.1.1" } } diff --git a/packages/backend-data/src/convert_schema.test.ts b/packages/backend-data/src/convert_schema.test.ts index da99c9d1e71..9fbf85f73b5 100644 --- a/packages/backend-data/src/convert_schema.test.ts +++ b/packages/backend-data/src/convert_schema.test.ts @@ -394,4 +394,124 @@ void describe('convertSchemaToCDK', () => { } ); }); + + void it('produces expected definition for MySQL schema with custom SSL cert', () => { + const schema = configure({ + database: { + engine: 'mysql', + connectionUri: new TestBackendSecret('SQL_CONNECTION_STRING'), + sslCert: new TestBackendSecret('CUSTOM_SSL_CERT'), + }, + }).schema({ + post: a + .model({ + id: a.integer().required(), + title: a.string(), + }) + .identifier(['id']) + .authorization((allow) => allow.publicApiKey()), + }); + + const modified = schema.addQueries({ + oddList: a + .query() + .handler(a.handler.inlineSql('SELECT * from post where id % 2 = 1;')) + .returns(a.ref('post')) + .authorization((allow) => allow.publicApiKey()), + }); + + const convertedDefinition = convertSchemaToCDK( + modified, + secretResolver, + stableBackendIdentifiers + ); + + assert.equal( + Object.values(convertedDefinition.dataSourceStrategies).length, + 1 + ); + assert.deepEqual( + Object.values(convertedDefinition.dataSourceStrategies)[0], + { + customSqlStatements: {}, + /* eslint-disable spellcheck/spell-checker */ + dbConnectionConfig: { + connectionUriSsmPath: [ + '/amplify/testBackendId/testBranchName-branch-e482a1c36f/SQL_CONNECTION_STRING', + '/amplify/shared/testBackendId/SQL_CONNECTION_STRING', + ], + sslCertConfig: { + ssmPath: [ + '/amplify/testBackendId/testBranchName-branch-e482a1c36f/CUSTOM_SSL_CERT', + '/amplify/shared/testBackendId/CUSTOM_SSL_CERT', + ], + }, + }, + dbType: 'MYSQL', + name: '00034dcf3444861c3ca5mysql', + vpcConfiguration: undefined, + /* eslint-enable spellcheck/spell-checker */ + } + ); + }); + + void it('produces expected definition for Postgresql schema with custom SSL cert', () => { + const schema = configure({ + database: { + engine: 'postgresql', + connectionUri: new TestBackendSecret('SQL_CONNECTION_STRING'), + sslCert: new TestBackendSecret('CUSTOM_SSL_CERT'), + }, + }).schema({ + post: a + .model({ + id: a.integer().required(), + title: a.string(), + }) + .identifier(['id']) + .authorization((allow) => allow.publicApiKey()), + }); + + const modified = schema.addQueries({ + oddList: a + .query() + .handler(a.handler.inlineSql('SELECT * from post where id % 2 = 1;')) + .returns(a.ref('post')) + .authorization((allow) => allow.publicApiKey()), + }); + + const convertedDefinition = convertSchemaToCDK( + modified, + secretResolver, + stableBackendIdentifiers + ); + + assert.equal( + Object.values(convertedDefinition.dataSourceStrategies).length, + 1 + ); + assert.deepEqual( + Object.values(convertedDefinition.dataSourceStrategies)[0], + { + customSqlStatements: {}, + /* eslint-disable spellcheck/spell-checker */ + dbConnectionConfig: { + connectionUriSsmPath: [ + '/amplify/testBackendId/testBranchName-branch-e482a1c36f/SQL_CONNECTION_STRING', + '/amplify/shared/testBackendId/SQL_CONNECTION_STRING', + ], + sslCertConfig: { + ssmPath: [ + '/amplify/testBackendId/testBranchName-branch-e482a1c36f/CUSTOM_SSL_CERT', + '/amplify/shared/testBackendId/CUSTOM_SSL_CERT', + ], + }, + }, + dbType: 'POSTGRES', + name: '00034dcf3444861c3ca5postgresql', + vpcConfiguration: undefined, + /* eslint-enable spellcheck/spell-checker */ + } + ); + }); }); diff --git a/packages/backend-data/src/convert_schema.ts b/packages/backend-data/src/convert_schema.ts index 4b250721822..6ff94ae9f70 100644 --- a/packages/backend-data/src/convert_schema.ts +++ b/packages/backend-data/src/convert_schema.ts @@ -8,6 +8,7 @@ import { AmplifyDataDefinition, type IAmplifyDataDefinition, type ModelDataSourceStrategy, + type SslCertSsmPathConfig, type VpcConfig, } from '@aws-amplify/data-construct'; import type { DataSchema, DataSchemaInput } from './types.js'; @@ -174,17 +175,29 @@ const convertDatabaseConfigurationToDataSourceStrategy = ( const { branchSecretPath, sharedSecretPath } = backendSecretResolver.resolvePath(configuration.connectionUri); - return { + + let sslCertConfig: SslCertSsmPathConfig | undefined; + if (configuration.sslCert) { + const { branchSecretPath, sharedSecretPath } = + backendSecretResolver.resolvePath(configuration.sslCert); + sslCertConfig = { + ssmPath: [branchSecretPath, sharedSecretPath], + }; + } + const strategy: ModelDataSourceStrategy = { dbType, name: provisionStrategyName + (configuration.identifier ?? configuration.engine), dbConnectionConfig: { connectionUriSsmPath: [branchSecretPath, sharedSecretPath], + ...(sslCertConfig ? { sslCertConfig } : undefined), }, vpcConfiguration, customSqlStatements, }; + + return strategy; }; /** diff --git a/packages/schema-generator/package.json b/packages/schema-generator/package.json index bc6914fa2a5..59b0376d456 100644 --- a/packages/schema-generator/package.json +++ b/packages/schema-generator/package.json @@ -17,7 +17,7 @@ "update:api": "api-extractor run --local" }, "dependencies": { - "@aws-amplify/graphql-schema-generator": "^0.9.0", + "@aws-amplify/graphql-schema-generator": "^0.9.2", "@aws-amplify/platform-core": "^1.0.0" }, "license": "Apache-2.0"