Skip to content

Commit 3e86daa

Browse files
rix0rrrrix0rrr
authored
Merge branch 'main' into scanlonp/route53-cazd
2 parents b818e7d + f6a5900 commit 3e86daa

26 files changed

Lines changed: 570 additions & 414 deletions

‎.github/workflows/request-cli-integ-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
persist-credentials: false
2020
- name: Find changed cli files
2121
id: changed-cli-files
22-
uses: tj-actions/changed-files@c860b5c47fa71f461da850094ef2f6e3d6514e44
22+
uses: tj-actions/changed-files@2f7246cb26e8bb6709b6cbfc1fec7febfe82e96a
2323
with:
2424
base_sha: ${{ github.event.pull_request.base.sha }}
2525
files_yaml: |

‎aws-cdk.code-workspace‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"folders": [{ "path": "." }],
3+
"settings": {
4+
"jest.jestCommandLine": "node_modules/.bin/jest",
5+
"jest.autoRun": "off",
6+
"jest.virtualFolders": [
7+
{ "name": "aws-cdk", "rootPath": "packages/aws-cdk" },
8+
{ "name": "aws-cdk-lib", "rootPath": "packages/aws-cdk-lib" },
9+
{
10+
"name": "cli-lib-alpha",
11+
"rootPath": "packages/@aws-cdk/cli-lib-alpha"
12+
},
13+
{
14+
"name": "custom-resource-handlers",
15+
"rootPath": "packages/@aws-cdk/custom-resource-handlers"
16+
},
17+
{
18+
"name": "integ-runner",
19+
"rootPath": "packages/@aws-cdk/integ-runner"
20+
},
21+
{
22+
"name": "integ-tests-alpha",
23+
"rootPath": "packages/@aws-cdk/integ-tests-alpha"
24+
},
25+
{
26+
"name": "sdk-v2-to-v3-adapter",
27+
"rootPath": "packages/@aws-cdk/sdk-v2-to-v3-adapter"
28+
}
29+
]
30+
},
31+
"extensions": {
32+
"recommendations": ["dbaeumer.vscode-eslint", "Orta.vscode-jest"]
33+
}
34+
}

‎packages/@aws-cdk/aws-iot-actions-alpha/test/kinesis-firehose/integ.firehose-put-record-action.js.snapshot/manifest.json‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"validateOnSynth": false,
1818
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
1919
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
20-
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/cf636658ec15133bceba498f25c92e3b2a42f090f11883a69d8fd68b873600a1.json",
20+
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/f75ab8f9b4f9b4569a43902e069684cc217226d66b42e025930c87f6f6dd1cb4.json",
2121
"requiresBootstrapStackVersion": 6,
2222
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
2323
"additionalDependencies": [
@@ -57,12 +57,6 @@
5757
"data": "MyBucketF68F3FF0"
5858
}
5959
],
60-
"/test-stack/MyStream/Service Role/Resource": [
61-
{
62-
"type": "aws:cdk:logicalId",
63-
"data": "MyStreamServiceRole8C50608A"
64-
}
65-
],
6660
"/test-stack/MyStream/S3 Destination Role/Resource": [
6761
{
6862
"type": "aws:cdk:logicalId",
@@ -110,6 +104,15 @@
110104
"type": "aws:cdk:logicalId",
111105
"data": "CheckBootstrapVersion"
112106
}
107+
],
108+
"MyStreamServiceRole8C50608A": [
109+
{
110+
"type": "aws:cdk:logicalId",
111+
"data": "MyStreamServiceRole8C50608A",
112+
"trace": [
113+
"!!DESTRUCTIVE_CHANGES: WILL_DESTROY"
114+
]
115+
}
113116
]
114117
},
115118
"displayName": "test-stack"

‎packages/@aws-cdk/aws-iot-actions-alpha/test/kinesis-firehose/integ.firehose-put-record-action.js.snapshot/test-stack.assets.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"version": "34.0.0",
33
"files": {
4-
"cf636658ec15133bceba498f25c92e3b2a42f090f11883a69d8fd68b873600a1": {
4+
"f75ab8f9b4f9b4569a43902e069684cc217226d66b42e025930c87f6f6dd1cb4": {
55
"source": {
66
"path": "test-stack.template.json",
77
"packaging": "file"
88
},
99
"destinations": {
1010
"current_account-current_region": {
1111
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
12-
"objectKey": "cf636658ec15133bceba498f25c92e3b2a42f090f11883a69d8fd68b873600a1.json",
12+
"objectKey": "f75ab8f9b4f9b4569a43902e069684cc217226d66b42e025930c87f6f6dd1cb4.json",
1313
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
1414
}
1515
}

‎packages/@aws-cdk/aws-iot-actions-alpha/test/kinesis-firehose/integ.firehose-put-record-action.js.snapshot/test-stack.template.json‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -77,23 +77,6 @@
7777
"UpdateReplacePolicy": "Delete",
7878
"DeletionPolicy": "Delete"
7979
},
80-
"MyStreamServiceRole8C50608A": {
81-
"Type": "AWS::IAM::Role",
82-
"Properties": {
83-
"AssumeRolePolicyDocument": {
84-
"Statement": [
85-
{
86-
"Action": "sts:AssumeRole",
87-
"Effect": "Allow",
88-
"Principal": {
89-
"Service": "firehose.amazonaws.com"
90-
}
91-
}
92-
],
93-
"Version": "2012-10-17"
94-
}
95-
}
96-
},
9780
"MyStreamS3DestinationRole5E0BA960": {
9881
"Type": "AWS::IAM::Role",
9982
"Properties": {

0 commit comments

Comments
 (0)