Skip to content

Commit 68a78a7

Browse files
author
Dane Pilcher
committed
Merge branch 'main' into run-e2e-beta-sql-layer
2 parents c617e47 + 14e5d54 commit 68a78a7

66 files changed

Lines changed: 407 additions & 381 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dependency_licenses.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -824,7 +824,7 @@ limitations under the License.
824824

825825
-----
826826

827-
The following software may be included in this product: @aws-cdk/asset-awscli-v1, @aws-cdk/asset-kubectl-v20, @aws-cdk/asset-node-proxy-agent-v6, jsii, jsii-rosetta. A copy of the source code may be downloaded from https://github.com/cdklabs/awscdk-asset-awscli.git (@aws-cdk/asset-awscli-v1), https://github.com/cdklabs/awscdk-asset-kubectl.git (@aws-cdk/asset-kubectl-v20), https://github.com/cdklabs/awscdk-asset-node-proxy-agent.git (@aws-cdk/asset-node-proxy-agent-v6), https://github.com/aws/jsii-compiler.git (jsii), https://github.com/aws/jsii-rosetta.git (jsii-rosetta). This software contains the following license and notice below:
827+
The following software may be included in this product: @aws-cdk/asset-awscli-v1, @aws-cdk/asset-node-proxy-agent-v6, jsii, jsii-rosetta. A copy of the source code may be downloaded from https://github.com/cdklabs/awscdk-asset-awscli.git (@aws-cdk/asset-awscli-v1), https://github.com/cdklabs/awscdk-asset-node-proxy-agent.git (@aws-cdk/asset-node-proxy-agent-v6), https://github.com/aws/jsii-compiler.git (jsii), https://github.com/aws/jsii-rosetta.git (jsii-rosetta). This software contains the following license and notice below:
828828

829829
Apache License
830830
Version 2.0, January 2004

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@
413413
"**/istanbul/async": "^2.6.4",
414414
"**/jake/async": "^2.6.4",
415415
"**/nth-check": "^2.0.1",
416-
"aws-cdk-lib": "^2.177.0",
416+
"aws-cdk-lib": "^2.180.0",
417417
"lodash": "^4.17.21",
418418
"node-fetch": "^2.6.7",
419419
"cross-fetch": "^2.2.6",

‎packages/amplify-data-construct/.jsii‎

Lines changed: 22 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,27 @@
66
]
77
},
88
"bundled": {
9-
"@aws-amplify/ai-constructs": "^1.2.2",
9+
"@aws-amplify/ai-constructs": "^1.2.4",
1010
"@aws-amplify/backend-output-schemas": "^1.0.0",
1111
"@aws-amplify/backend-output-storage": "^1.0.0",
12-
"@aws-amplify/graphql-auth-transformer": "4.1.12",
13-
"@aws-amplify/graphql-conversation-transformer": "1.1.7",
14-
"@aws-amplify/graphql-default-value-transformer": "3.1.9",
15-
"@aws-amplify/graphql-directives": "2.6.1",
16-
"@aws-amplify/graphql-function-transformer": "3.1.11",
17-
"@aws-amplify/graphql-generation-transformer": "1.1.5",
18-
"@aws-amplify/graphql-http-transformer": "3.0.14",
19-
"@aws-amplify/graphql-index-transformer": "3.0.14",
20-
"@aws-amplify/graphql-maps-to-transformer": "4.0.14",
21-
"@aws-amplify/graphql-model-transformer": "3.1.6",
22-
"@aws-amplify/graphql-predictions-transformer": "3.0.14",
23-
"@aws-amplify/graphql-relational-transformer": "3.1.6",
24-
"@aws-amplify/graphql-searchable-transformer": "3.0.14",
25-
"@aws-amplify/graphql-sql-transformer": "0.4.14",
26-
"@aws-amplify/graphql-transformer": "2.2.7",
27-
"@aws-amplify/graphql-transformer-core": "3.3.6",
12+
"@aws-amplify/graphql-auth-transformer": "4.2.0",
13+
"@aws-amplify/graphql-conversation-transformer": "1.1.8",
14+
"@aws-amplify/graphql-default-value-transformer": "3.1.10",
15+
"@aws-amplify/graphql-directives": "2.7.0",
16+
"@aws-amplify/graphql-function-transformer": "3.1.12",
17+
"@aws-amplify/graphql-generation-transformer": "1.2.0",
18+
"@aws-amplify/graphql-http-transformer": "3.0.15",
19+
"@aws-amplify/graphql-index-transformer": "3.0.15",
20+
"@aws-amplify/graphql-maps-to-transformer": "4.0.15",
21+
"@aws-amplify/graphql-model-transformer": "3.2.0",
22+
"@aws-amplify/graphql-predictions-transformer": "3.0.15",
23+
"@aws-amplify/graphql-relational-transformer": "3.1.7",
24+
"@aws-amplify/graphql-searchable-transformer": "3.0.15",
25+
"@aws-amplify/graphql-sql-transformer": "0.4.15",
26+
"@aws-amplify/graphql-transformer": "2.3.0",
27+
"@aws-amplify/graphql-transformer-core": "3.4.0",
2828
"@aws-amplify/graphql-transformer-interfaces": "4.2.3",
29-
"@aws-amplify/graphql-validate-transformer": "1.0.0",
29+
"@aws-amplify/graphql-validate-transformer": "1.1.0",
3030
"@aws-amplify/platform-core": "^1.0.0",
3131
"@aws-amplify/plugin-types": "^1.0.0",
3232
"@aws-crypto/crc32": "5.2.0",
@@ -132,8 +132,8 @@
132132
"zod": "^3.22.2"
133133
},
134134
"dependencies": {
135-
"@aws-amplify/graphql-api-construct": "1.18.8",
136-
"aws-cdk-lib": "^2.177.0",
135+
"@aws-amplify/graphql-api-construct": "1.19.0",
136+
"aws-cdk-lib": "^2.180.0",
137137
"constructs": "^10.3.0"
138138
},
139139
"dependencyClosure": {
@@ -170,32 +170,6 @@
170170
}
171171
}
172172
},
173-
"@aws-cdk/asset-kubectl-v20": {
174-
"targets": {
175-
"dotnet": {
176-
"namespace": "Amazon.CDK.Asset.KubectlV20",
177-
"packageId": "Amazon.CDK.Asset.KubectlV20"
178-
},
179-
"go": {
180-
"moduleName": "github.com/cdklabs/awscdk-asset-kubectl-go",
181-
"packageName": "kubectlv20"
182-
},
183-
"java": {
184-
"maven": {
185-
"artifactId": "cdk-asset-kubectl-v20",
186-
"groupId": "software.amazon.awscdk"
187-
},
188-
"package": "software.amazon.awscdk.cdk.asset.kubectl.v20"
189-
},
190-
"js": {
191-
"npm": "@aws-cdk/asset-kubectl-v20"
192-
},
193-
"python": {
194-
"distName": "aws-cdk.asset-kubectl-v20",
195-
"module": "aws_cdk.asset_kubectl_v20"
196-
}
197-
}
198-
},
199173
"@aws-cdk/asset-node-proxy-agent-v6": {
200174
"targets": {
201175
"dotnet": {
@@ -3948,19 +3922,6 @@
39483922
}
39493923
}
39503924
},
3951-
"aws-cdk-lib.lambda_layer_kubectl": {
3952-
"targets": {
3953-
"dotnet": {
3954-
"namespace": "Amazon.CDK.LambdaLayer.Kubectl"
3955-
},
3956-
"java": {
3957-
"package": "software.amazon.awscdk.lambdalayer.kubectl"
3958-
},
3959-
"python": {
3960-
"module": "aws_cdk.lambda_layer_kubectl"
3961-
}
3962-
}
3963-
},
39643925
"aws-cdk-lib.lambda_layer_node_proxy_agent": {
39653926
"targets": {
39663927
"dotnet": {
@@ -4106,6 +4067,6 @@
41064067
}
41074068
},
41084069
"types": {},
4109-
"version": "1.14.8",
4110-
"fingerprint": "rZWy+a/CElQLDjCmKd6hg0FYzJry9GFG+Gx8i2GudXk="
4070+
"version": "1.15.0",
4071+
"fingerprint": "8xj065JU+Xv6A2GrghNOVxAbUo31cVT9oh1nRAE9rnk="
41114072
}

‎packages/amplify-data-construct/CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [1.15.0](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/data-construct@1.14.8...@aws-amplify/data-construct@1.15.0) (2025-02-26)
7+
8+
### Features
9+
10+
- add validate transformer ([#3172](https://github.com/aws-amplify/amplify-category-api/issues/3172)) ([b8771c1](https://github.com/aws-amplify/amplify-category-api/commit/b8771c1f782b19f653f310f0a29528dae08035dc)), closes [#3121](https://github.com/aws-amplify/amplify-category-api/issues/3121) [#3125](https://github.com/aws-amplify/amplify-category-api/issues/3125) [#3129](https://github.com/aws-amplify/amplify-category-api/issues/3129) [#3130](https://github.com/aws-amplify/amplify-category-api/issues/3130) [#3132](https://github.com/aws-amplify/amplify-category-api/issues/3132) [#3134](https://github.com/aws-amplify/amplify-category-api/issues/3134) [#3149](https://github.com/aws-amplify/amplify-category-api/issues/3149) [#3150](https://github.com/aws-amplify/amplify-category-api/issues/3150) [#3157](https://github.com/aws-amplify/amplify-category-api/issues/3157) [#3165](https://github.com/aws-amplify/amplify-category-api/issues/3165) [#3167](https://github.com/aws-amplify/amplify-category-api/issues/3167) [#3171](https://github.com/aws-amplify/amplify-category-api/issues/3171)
11+
612
## [1.14.8](https://github.com/aws-amplify/amplify-category-api/compare/@aws-amplify/data-construct@1.14.7...@aws-amplify/data-construct@1.14.8) (2025-02-07)
713

814
### Bug Fixes

‎packages/amplify-data-construct/package.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@aws-amplify/data-construct",
3-
"version": "1.14.8",
3+
"version": "1.15.0",
44
"description": "AppSync GraphQL Api Construct using Amplify GraphQL Transformer - Aliased to use `Data` name scheme.",
55
"repository": {
66
"type": "git",
@@ -159,28 +159,28 @@
159159
"zod"
160160
],
161161
"dependencies": {
162-
"@aws-amplify/ai-constructs": "^1.2.2",
162+
"@aws-amplify/ai-constructs": "^1.2.4",
163163
"@aws-amplify/backend-output-schemas": "^1.0.0",
164164
"@aws-amplify/backend-output-storage": "^1.0.0",
165-
"@aws-amplify/graphql-api-construct": "1.18.8",
166-
"@aws-amplify/graphql-auth-transformer": "4.1.12",
167-
"@aws-amplify/graphql-conversation-transformer": "1.1.7",
168-
"@aws-amplify/graphql-default-value-transformer": "3.1.9",
169-
"@aws-amplify/graphql-directives": "2.6.1",
170-
"@aws-amplify/graphql-function-transformer": "3.1.11",
171-
"@aws-amplify/graphql-generation-transformer": "1.1.5",
172-
"@aws-amplify/graphql-http-transformer": "3.0.14",
173-
"@aws-amplify/graphql-index-transformer": "3.0.14",
174-
"@aws-amplify/graphql-maps-to-transformer": "4.0.14",
175-
"@aws-amplify/graphql-model-transformer": "3.1.6",
176-
"@aws-amplify/graphql-predictions-transformer": "3.0.14",
177-
"@aws-amplify/graphql-relational-transformer": "3.1.6",
178-
"@aws-amplify/graphql-searchable-transformer": "3.0.14",
179-
"@aws-amplify/graphql-sql-transformer": "0.4.14",
180-
"@aws-amplify/graphql-transformer": "2.2.7",
181-
"@aws-amplify/graphql-transformer-core": "3.3.6",
165+
"@aws-amplify/graphql-api-construct": "1.19.0",
166+
"@aws-amplify/graphql-auth-transformer": "4.2.0",
167+
"@aws-amplify/graphql-conversation-transformer": "1.1.8",
168+
"@aws-amplify/graphql-default-value-transformer": "3.1.10",
169+
"@aws-amplify/graphql-directives": "2.7.0",
170+
"@aws-amplify/graphql-function-transformer": "3.1.12",
171+
"@aws-amplify/graphql-generation-transformer": "1.2.0",
172+
"@aws-amplify/graphql-http-transformer": "3.0.15",
173+
"@aws-amplify/graphql-index-transformer": "3.0.15",
174+
"@aws-amplify/graphql-maps-to-transformer": "4.0.15",
175+
"@aws-amplify/graphql-model-transformer": "3.2.0",
176+
"@aws-amplify/graphql-predictions-transformer": "3.0.15",
177+
"@aws-amplify/graphql-relational-transformer": "3.1.7",
178+
"@aws-amplify/graphql-searchable-transformer": "3.0.15",
179+
"@aws-amplify/graphql-sql-transformer": "0.4.15",
180+
"@aws-amplify/graphql-transformer": "2.3.0",
181+
"@aws-amplify/graphql-transformer-core": "3.4.0",
182182
"@aws-amplify/graphql-transformer-interfaces": "4.2.3",
183-
"@aws-amplify/graphql-validate-transformer": "1.0.0",
183+
"@aws-amplify/graphql-validate-transformer": "1.1.0",
184184
"@aws-amplify/platform-core": "^1.0.0",
185185
"@aws-amplify/plugin-types": "^1.0.0",
186186
"@aws-crypto/crc32": "5.2.0",
@@ -288,7 +288,7 @@
288288
"devDependencies": {
289289
"@types/fs-extra": "^8.0.1",
290290
"@types/node": "^18.0.0",
291-
"aws-cdk-lib": "2.177.0",
291+
"aws-cdk-lib": "2.180.0",
292292
"constructs": "10.3.0",
293293
"jsii": "^5.4.23",
294294
"jsii-pacmak": "^1.84.0",
@@ -297,7 +297,7 @@
297297
"ts-node": "^8.10.1"
298298
},
299299
"peerDependencies": {
300-
"aws-cdk-lib": "^2.177.0",
300+
"aws-cdk-lib": "^2.180.0",
301301
"constructs": "^10.3.0"
302302
},
303303
"stability": "stable",

‎packages/amplify-e2e-tests/CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [4.1.7](https://github.com/aws-amplify/amplify-category-api/compare/amplify-category-api-e2e-tests@4.1.6...amplify-category-api-e2e-tests@4.1.7) (2025-02-26)
7+
8+
### Bug Fixes
9+
10+
- add -integtest- to role regex in e2e cleanup script ([#3175](https://github.com/aws-amplify/amplify-category-api/issues/3175)) ([cde4d3e](https://github.com/aws-amplify/amplify-category-api/commit/cde4d3eec12cec7ca95d0339c17c15a55daab564))
11+
612
## [4.1.6](https://github.com/aws-amplify/amplify-category-api/compare/amplify-category-api-e2e-tests@4.1.5...amplify-category-api-e2e-tests@4.1.6) (2025-02-07)
713

814
**Note:** Version bump only for package amplify-category-api-e2e-tests

‎packages/amplify-e2e-tests/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "amplify-category-api-e2e-tests",
3-
"version": "4.1.6",
3+
"version": "4.1.7",
44
"description": "E2e test suite",
55
"repository": {
66
"type": "git",
@@ -25,8 +25,8 @@
2525
},
2626
"dependencies": {
2727
"@aws-amplify/amplify-app": "^5.0.35",
28-
"@aws-amplify/graphql-schema-generator": "0.11.7",
29-
"@aws-amplify/graphql-transformer-core": "3.3.6",
28+
"@aws-amplify/graphql-schema-generator": "0.11.8",
29+
"@aws-amplify/graphql-transformer-core": "3.4.0",
3030
"amplify-category-api-e2e-core": "5.0.7",
3131
"aws-amplify": "^4.2.8",
3232
"aws-appsync": "^4.1.1",

‎packages/amplify-graphql-api-construct-tests/CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [1.14.0](https://github.com/aws-amplify/amplify-category-api/compare/amplify-graphql-api-construct-tests@1.13.10...amplify-graphql-api-construct-tests@1.14.0) (2025-02-26)
7+
8+
### Features
9+
10+
- add ddb deletion protection on imported tables ([#3158](https://github.com/aws-amplify/amplify-category-api/issues/3158)) ([fe4bfad](https://github.com/aws-amplify/amplify-category-api/commit/fe4bfad8fae7584dc6f9be5dc569b0c00cfbda70))
11+
- add validate transformer ([#3172](https://github.com/aws-amplify/amplify-category-api/issues/3172)) ([b8771c1](https://github.com/aws-amplify/amplify-category-api/commit/b8771c1f782b19f653f310f0a29528dae08035dc)), closes [#3121](https://github.com/aws-amplify/amplify-category-api/issues/3121) [#3125](https://github.com/aws-amplify/amplify-category-api/issues/3125) [#3129](https://github.com/aws-amplify/amplify-category-api/issues/3129) [#3130](https://github.com/aws-amplify/amplify-category-api/issues/3130) [#3132](https://github.com/aws-amplify/amplify-category-api/issues/3132) [#3134](https://github.com/aws-amplify/amplify-category-api/issues/3134) [#3149](https://github.com/aws-amplify/amplify-category-api/issues/3149) [#3150](https://github.com/aws-amplify/amplify-category-api/issues/3150) [#3157](https://github.com/aws-amplify/amplify-category-api/issues/3157) [#3165](https://github.com/aws-amplify/amplify-category-api/issues/3165) [#3167](https://github.com/aws-amplify/amplify-category-api/issues/3167) [#3171](https://github.com/aws-amplify/amplify-category-api/issues/3171)
12+
613
## [1.13.10](https://github.com/aws-amplify/amplify-category-api/compare/amplify-graphql-api-construct-tests@1.13.9...amplify-graphql-api-construct-tests@1.13.10) (2025-02-07)
714

815
### Bug Fixes

‎packages/amplify-graphql-api-construct-tests/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "amplify-graphql-api-construct-tests",
3-
"version": "1.13.10",
3+
"version": "1.14.0",
44
"description": "E2e test suite",
55
"repository": {
66
"type": "git",
@@ -24,7 +24,7 @@
2424
"dependencies": {
2525
"@aws-amplify/auth-construct": "^1.0.0",
2626
"@aws-amplify/core": "^2.1.0",
27-
"@aws-amplify/graphql-api-construct": "1.18.8",
27+
"@aws-amplify/graphql-api-construct": "1.19.0",
2828
"@aws-cdk/aws-cognito-identitypool-alpha": "2.152.0-alpha.0",
2929
"@aws-sdk/client-appsync": "3.624.0",
3030
"@aws-sdk/client-cloudformation": "3.624.0",
@@ -49,11 +49,11 @@
4949
"@aws-amplify/amplify-cli-core": "^4.3.9"
5050
},
5151
"devDependencies": {
52-
"@aws-amplify/graphql-transformer-core": "3.3.6",
52+
"@aws-amplify/graphql-transformer-core": "3.4.0",
5353
"@aws-amplify/graphql-transformer-interfaces": "4.2.3",
54-
"@aws-amplify/graphql-validate-transformer": "1.0.0",
54+
"@aws-amplify/graphql-validate-transformer": "1.1.0",
5555
"@types/node": "^18.0.0",
56-
"aws-cdk-lib": "2.177.0",
56+
"aws-cdk-lib": "2.180.0",
5757
"constructs": "10.3.0",
5858
"ts-node": "^8.10.2"
5959
},

‎packages/amplify-graphql-api-construct-tests/src/__tests__/__snapshots__/base-cdk.test.ts.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

3-
exports[`CDK GraphQL Transformer CDK base case - aws-cdk-lib@2.177.0 1`] = `
3+
exports[`CDK GraphQL Transformer CDK base case - aws-cdk-lib@2.180.0 1`] = `
44
Object {
55
"body": Object {
66
"data": Object {
@@ -14,7 +14,7 @@ Object {
1414
}
1515
`;
1616
17-
exports[`CDK GraphQL Transformer CDK base case - aws-cdk-lib@2.177.0 2`] = `
17+
exports[`CDK GraphQL Transformer CDK base case - aws-cdk-lib@2.180.0 2`] = `
1818
Object {
1919
"body": Object {
2020
"data": Object {

0 commit comments

Comments
 (0)