Skip to content

Commit b00426e

Browse files
mergify[bot]mergify[bot]
authored
Merge branch 'main' into huijbers/apigw-cords
2 parents 4c6ec59 + 7d02e5e commit b00426e

218 files changed

Lines changed: 40297 additions & 5668 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.

‎.github/workflows/spec-update.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
contents: read
1616
runs-on: ubuntu-latest
1717
steps:
18-
1918
- name: Check Out
2019
uses: actions/checkout@v4
2120

@@ -35,8 +34,14 @@ jobs:
3534

3635
# This will ensure the current lockfile is up-to-date with the dependency specifications
3736
- name: Install latest version & update lockfile
38-
run: |-
39-
yarn upgrade @aws-cdk/aws-service-spec @aws-cdk/service-spec-types
37+
run: yarn upgrade @aws-cdk/aws-service-spec @aws-cdk/service-spec-types
38+
39+
# Build @aws-cdk/spec2cdk and run L1 gen script to generate base files for new modules
40+
- name: Build @aws-cdk/spec2cdk
41+
run: lerna run build --stream --no-progress --skip-nx-cache --scope @aws-cdk/spec2cdk
42+
- name: Generate L1s
43+
working-directory: packages/aws-cdk-lib
44+
run: yarn gen
4045

4146
# Next, create and upload the changes as a patch file. This will later be downloaded to create a pull request
4247
# Creating a pull request requires write permissions and it's best to keep write privileges isolated.
@@ -80,9 +85,9 @@ jobs:
8085
feat: update AWS Service Spec
8186
AWS Service Spec packages to latest versions.
8287
# Pull Request details
83-
title: 'feat: update AWS Service Spec'
88+
title: "feat: update AWS Service Spec"
8489
body: |-
85-
AWS Service Spec packages to latest versions.
90+
AWS Service Spec packages to latest versions.
8691
labels: contribution/core,dependencies,auto-approve,pr-linter/exempt-integ-test,pr-linter/exempt-readme,pr-linter/exempt-test
8792
team-reviewers: aws-cdk-team
8893
# Github prevents further Github actions to be run if the default Github token is used.

‎allowed-breaking-changes.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,3 +188,6 @@ removed:aws-cdk-lib.aws_cloudwatch.CfnAlarm.attrId
188188
removed:aws-cdk-lib.aws_ec2.CfnNetworkInterface.enablePrimaryIpv6
189189
removed:aws-cdk-lib.aws_ec2.CfnNetworkInterfaceAttachment.attrId
190190
removed:aws-cdk-lib.aws_ec2.CfnNetworkInterfaceProps.enablePrimaryIpv6
191+
192+
# Changed type from GraphqlApi to IGraphqlApi to support import from a different stack, should not matter.
193+
weakened:aws-cdk-lib.aws_appsync.SourceApi

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"build-all": "tsc -b"
1616
},
1717
"devDependencies": {
18-
"@nx/workspace": "^16.8.0",
18+
"@nx/workspace": "^16.8.1",
1919
"@types/node": "18.11.19",
2020
"@types/prettier": "2.6.0",
2121
"@yarnpkg/lockfile": "^1.1.0",
@@ -27,9 +27,9 @@
2727
"jsii-diff": "1.88.0",
2828
"jsii-pacmak": "1.88.0",
2929
"jsii-reflect": "1.88.0",
30-
"jsii-rosetta": "~5.1.12",
31-
"lerna": "^7.2.0",
32-
"nx": "^16.8.0",
30+
"jsii-rosetta": "~5.1.13",
31+
"lerna": "^7.3.0",
32+
"nx": "^16.8.1",
3333
"patch-package": "^6.5.1",
3434
"semver": "^7.5.4",
3535
"standard-version": "^9.5.0",

‎packages/@aws-cdk-testing/cli-integ/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"license": "Apache-2.0",
3131
"devDependencies": {
3232
"@aws-cdk/cdk-build-tools": "0.0.0",
33-
"@types/semver": "^7.5.1",
33+
"@types/semver": "^7.5.2",
3434
"@types/yargs": "^15.0.15",
3535
"@types/fs-extra": "^9.0.13",
3636
"@types/glob": "^7.2.0",
@@ -39,11 +39,11 @@
3939
},
4040
"dependencies": {
4141
"@octokit/rest": "^18.12.0",
42-
"aws-sdk": "^2.1451.0",
42+
"aws-sdk": "^2.1461.0",
4343
"axios": "^0.27.2",
4444
"fs-extra": "^9.1.0",
4545
"glob": "^7.2.3",
46-
"jest": "^29.6.4",
46+
"jest": "^29.7.0",
4747
"jest-junit": "^14.0.1",
4848
"make-runnable": "^1.4.1",
4949
"npm": "^8.19.4",

‎packages/@aws-cdk-testing/framework-integ/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@
3232
"@aws-cdk/cdk-build-tools": "0.0.0",
3333
"@aws-cdk/integ-runner": "^0.0.0",
3434
"@aws-cdk/pkglint": "0.0.0",
35-
"@aws-sdk/client-acm": "3.408.0",
36-
"@aws-sdk/client-rds": "3.408.0",
37-
"@aws-sdk/client-s3": "3.408.0",
35+
"@aws-sdk/client-acm": "3.414.0",
36+
"@aws-sdk/client-rds": "3.414.0",
37+
"@aws-sdk/client-s3": "3.414.0",
3838
"delay": "5.0.0"
3939
},
4040
"dependencies": {
4141
"@aws-cdk/integ-tests-alpha": "0.0.0",
4242
"@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
4343
"aws-cdk-lib": "0.0.0",
44-
"aws-sdk": "^2.1451.0",
44+
"aws-sdk": "^2.1461.0",
4545
"aws-sdk-mock": "5.6.0",
46-
"cdk8s": "^2.64.5",
46+
"cdk8s": "^2.64.16",
4747
"cdk8s-plus-24": "2.12.1",
4848
"constructs": "^10.0.0"
4949
},

‎packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/appsync.merged-api-3.graphql‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
type thirdTest {
2+
version: String!
3+
}
4+
type Query {
5+
getThirdTests: [thirdTest]!
6+
}
7+
type Mutation {
8+
addThirdTest(version: String!): thirdTest
9+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.appsync-merged-api-arn-flag-enabled.js.snapshot/apiDefaultTestDeployAssert018781F2.assets.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": "34.0.0",
3+
"files": {
4+
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
5+
"source": {
6+
"path": "apiDefaultTestDeployAssert018781F2.template.json",
7+
"packaging": "file"
8+
},
9+
"destinations": {
10+
"current_account-current_region": {
11+
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12+
"objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
13+
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
14+
}
15+
}
16+
}
17+
},
18+
"dockerImages": {}
19+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.appsync-merged-api-arn-flag-enabled.js.snapshot/apiDefaultTestDeployAssert018781F2.template.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"Parameters": {
3+
"BootstrapVersion": {
4+
"Type": "AWS::SSM::Parameter::Value<String>",
5+
"Default": "/cdk-bootstrap/hnb659fds/version",
6+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
7+
}
8+
},
9+
"Rules": {
10+
"CheckBootstrapVersion": {
11+
"Assertions": [
12+
{
13+
"Assert": {
14+
"Fn::Not": [
15+
{
16+
"Fn::Contains": [
17+
[
18+
"1",
19+
"2",
20+
"3",
21+
"4",
22+
"5"
23+
],
24+
{
25+
"Ref": "BootstrapVersion"
26+
}
27+
]
28+
}
29+
]
30+
},
31+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
32+
}
33+
]
34+
}
35+
}
36+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.appsync-merged-api-arn-flag-enabled.js.snapshot/cdk.out‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"version":"34.0.0"}

‎packages/@aws-cdk-testing/framework-integ/test/aws-appsync/test/integ.appsync-merged-api-arn-flag-enabled.js.snapshot/integ.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"version": "34.0.0",
3+
"testCases": {
4+
"api/DefaultTest": {
5+
"stacks": [
6+
"stack"
7+
],
8+
"assertionStack": "api/DefaultTest/DeployAssert",
9+
"assertionStackName": "apiDefaultTestDeployAssert018781F2"
10+
}
11+
}
12+
}

0 commit comments

Comments
 (0)