Skip to content

Commit 9db78cf

Browse files
bergjaakbergjaak
authored
Merge branch 'main' into AwsSsoFix
2 parents 1da8b5b + bb7e4d8 commit 9db78cf

143 files changed

Lines changed: 9188 additions & 10289 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.

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@
2020
"@types/prettier": "2.6.0",
2121
"@yarnpkg/lockfile": "^1.1.0",
2222
"aws-sdk-js-codemod": "^0.28.2",
23-
"cdk-generate-synthetic-examples": "^0.2.0",
23+
"cdk-generate-synthetic-examples": "^0.2.1",
2424
"conventional-changelog-cli": "^2.2.2",
2525
"fs-extra": "^9.1.0",
2626
"graceful-fs": "^4.2.11",
2727
"jest-junit": "^13.2.0",
28-
"jsii-diff": "1.97.0",
29-
"jsii-pacmak": "1.97.0",
30-
"jsii-reflect": "1.97.0",
28+
"jsii-diff": "1.98.0",
29+
"jsii-pacmak": "1.98.0",
30+
"jsii-reflect": "1.98.0",
3131
"lerna": "^8.1.2",
32-
"nx": "^18.3.3",
32+
"nx": "^18.3.4",
3333
"patch-package": "^6.5.1",
3434
"semver": "^7.6.0",
3535
"standard-version": "^9.5.0",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
},
4040
"dependencies": {
4141
"@octokit/rest": "^18.12.0",
42-
"aws-sdk": "^2.1605.0",
42+
"aws-sdk": "^2.1610.0",
4343
"axios": "^1.6.8",
4444
"fs-extra": "^9.1.0",
4545
"glob": "^7.2.3",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
"@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
4343
"@aws-cdk/lambda-layer-kubectl-v29": "^2.0.0",
4444
"aws-cdk-lib": "0.0.0",
45-
"aws-sdk": "^2.1605.0",
45+
"aws-sdk": "^2.1610.0",
4646
"aws-sdk-mock": "5.6.0",
47-
"cdk8s": "2.68.61",
48-
"cdk8s-plus-27": "2.9.0",
47+
"cdk8s": "2.68.65",
48+
"cdk8s-plus-27": "2.9.1",
4949
"constructs": "^10.0.0"
5050
},
5151
"repository": {

‎packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.distribution-function-autopublish.js.snapshot/AutoPublishTestDefaultTestDeployAssert10053C6C.assets.json‎

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.distribution-function-autopublish.js.snapshot/AutoPublishTestDefaultTestDeployAssert10053C6C.template.json‎

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.distribution-function-autopublish.js.snapshot/cdk.out‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.distribution-function-autopublish.js.snapshot/integ-distribution-function.assets.json‎

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.distribution-function-autopublish.js.snapshot/integ-distribution-function.template.json‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{
2+
"Resources": {
3+
"functionF19B1A04": {
4+
"Type": "AWS::CloudFront::Function",
5+
"Properties": {
6+
"AutoPublish": false,
7+
"FunctionCode": "function handler(event) { return event.request }",
8+
"FunctionConfig": {
9+
"Comment": "eu-west-1integdistributionfunctionEBF560BA",
10+
"Runtime": "cloudfront-js-1.0"
11+
},
12+
"Name": "eu-west-1integdistributionfunctionEBF560BA"
13+
}
14+
}
15+
},
16+
"Parameters": {
17+
"BootstrapVersion": {
18+
"Type": "AWS::SSM::Parameter::Value<String>",
19+
"Default": "/cdk-bootstrap/hnb659fds/version",
20+
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
21+
}
22+
},
23+
"Rules": {
24+
"CheckBootstrapVersion": {
25+
"Assertions": [
26+
{
27+
"Assert": {
28+
"Fn::Not": [
29+
{
30+
"Fn::Contains": [
31+
[
32+
"1",
33+
"2",
34+
"3",
35+
"4",
36+
"5"
37+
],
38+
{
39+
"Ref": "BootstrapVersion"
40+
}
41+
]
42+
}
43+
]
44+
},
45+
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
46+
}
47+
]
48+
}
49+
}
50+
}

‎packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.distribution-function-autopublish.js.snapshot/integ.json‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-cloudfront/test/integ.distribution-function-autopublish.js.snapshot/manifest.json‎

Lines changed: 113 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)