Skip to content

Commit

Permalink
Merge branch 'main' into AwsSsoFix
Browse files Browse the repository at this point in the history
  • Loading branch information
bergjaak committed May 2, 2024
2 parents 1da8b5b + bb7e4d8 commit 9db78cf
Show file tree
Hide file tree
Showing 143 changed files with 9,188 additions and 10,289 deletions.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
"@types/prettier": "2.6.0",
"@yarnpkg/lockfile": "^1.1.0",
"aws-sdk-js-codemod": "^0.28.2",
"cdk-generate-synthetic-examples": "^0.2.0",
"cdk-generate-synthetic-examples": "^0.2.1",
"conventional-changelog-cli": "^2.2.2",
"fs-extra": "^9.1.0",
"graceful-fs": "^4.2.11",
"jest-junit": "^13.2.0",
"jsii-diff": "1.97.0",
"jsii-pacmak": "1.97.0",
"jsii-reflect": "1.97.0",
"jsii-diff": "1.98.0",
"jsii-pacmak": "1.98.0",
"jsii-reflect": "1.98.0",
"lerna": "^8.1.2",
"nx": "^18.3.3",
"nx": "^18.3.4",
"patch-package": "^6.5.1",
"semver": "^7.6.0",
"standard-version": "^9.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk-testing/cli-integ/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"dependencies": {
"@octokit/rest": "^18.12.0",
"aws-sdk": "^2.1605.0",
"aws-sdk": "^2.1610.0",
"axios": "^1.6.8",
"fs-extra": "^9.1.0",
"glob": "^7.2.3",
Expand Down
6 changes: 3 additions & 3 deletions packages/@aws-cdk-testing/framework-integ/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
"@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
"@aws-cdk/lambda-layer-kubectl-v29": "^2.0.0",
"aws-cdk-lib": "0.0.0",
"aws-sdk": "^2.1605.0",
"aws-sdk": "^2.1610.0",
"aws-sdk-mock": "5.6.0",
"cdk8s": "2.68.61",
"cdk8s-plus-27": "2.9.0",
"cdk8s": "2.68.65",
"cdk8s-plus-27": "2.9.1",
"constructs": "^10.0.0"
},
"repository": {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"Resources": {
"functionF19B1A04": {
"Type": "AWS::CloudFront::Function",
"Properties": {
"AutoPublish": false,
"FunctionCode": "function handler(event) { return event.request }",
"FunctionConfig": {
"Comment": "eu-west-1integdistributionfunctionEBF560BA",
"Runtime": "cloudfront-js-1.0"
},
"Name": "eu-west-1integdistributionfunctionEBF560BA"
}
}
},
"Parameters": {
"BootstrapVersion": {
"Type": "AWS::SSM::Parameter::Value<String>",
"Default": "/cdk-bootstrap/hnb659fds/version",
"Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]"
}
},
"Rules": {
"CheckBootstrapVersion": {
"Assertions": [
{
"Assert": {
"Fn::Not": [
{
"Fn::Contains": [
[
"1",
"2",
"3",
"4",
"5"
],
{
"Ref": "BootstrapVersion"
}
]
}
]
},
"AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI."
}
]
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9db78cf

Please sign in to comment.