Skip to content

Commit

Permalink
Merge branch 'main' into awsgh-26623
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Aug 10, 2023
2 parents 3724e4a + ed3aaf7 commit 2c3281b
Show file tree
Hide file tree
Showing 182 changed files with 24,028 additions and 2,627 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
"fs-extra": "^9.1.0",
"graceful-fs": "^4.2.11",
"jest-junit": "^13.2.0",
"jsii-diff": "1.86.0",
"jsii-pacmak": "1.86.0",
"jsii-reflect": "1.86.0",
"jsii-diff": "1.86.1",
"jsii-pacmak": "1.86.1",
"jsii-reflect": "1.86.1",
"jsii-rosetta": "~5.1.9",
"lerna": "^7.1.4",
"nx": "^16.6.0",
Expand Down Expand Up @@ -173,4 +173,4 @@
"dependencies": {
"string-width": "^4.2.3"
}
}
}
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.1427.0",
"aws-sdk": "^2.1432.0",
"axios": "^0.27.2",
"fs-extra": "^9.1.0",
"glob": "^7.2.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/@aws-cdk-testing/framework-integ/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
"@aws-cdk/integ-tests-alpha": "0.0.0",
"@aws-cdk/lambda-layer-kubectl-v24": "^2.0.242",
"aws-cdk-lib": "0.0.0",
"aws-sdk": "^2.1427.0",
"aws-sdk": "^2.1432.0",
"aws-sdk-mock": "5.6.0",
"cdk8s": "^2.30.0",
"cdk8s": "^2.38.0",
"cdk8s-plus-24": "2.12.1",
"constructs": "^10.0.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"name": "eks-service-account-sdk-call-integ-test",
"private": "true",
"dependencies": {
"aws-sdk": "^2.1427.0"
"aws-sdk": "^2.1432.0"
}
}

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,32 @@
{
"version": "33.0.0",
"files": {
"ba598c1f1d84f7077ea9c16a6b921e4f8acf18e996100e72a8f17da980e64fdd": {
"source": {
"path": "asset.ba598c1f1d84f7077ea9c16a6b921e4f8acf18e996100e72a8f17da980e64fdd",
"packaging": "zip"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "ba598c1f1d84f7077ea9c16a6b921e4f8acf18e996100e72a8f17da980e64fdd.zip",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
},
"3cb4c5b292de90a5cca731c6fccc40d54330b450daa17f661fd5b902cdb88262": {
"source": {
"path": "aws-cdk-rds-integ-instance-create-grant.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "3cb4c5b292de90a5cca731c6fccc40d54330b450daa17f661fd5b902cdb88262.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
}
},
"dockerImages": {}
}
Loading

0 comments on commit 2c3281b

Please sign in to comment.