Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(core): allow override with cross-stack references #24920

Merged
merged 20 commits into from
May 23, 2023
Merged

fix(core): allow override with cross-stack references #24920

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d73508f
wip
tmokmss Dec 17, 2022
0e807eb
fix
tmokmss Dec 17, 2022
f82f941
Update resolvable.ts
tmokmss Dec 19, 2022
11a8ac0
Merge branch 'main' into fix_cross_stack_override
tmokmss Jan 8, 2023
b656fdd
Merge branch 'main' into fix_cross_stack_override
tmokmss Apr 4, 2023
f6d5465
Merge branch 'main' into fix_cross_stack_override
tmokmss Apr 6, 2023
c751a54
Merge branch 'main' into fix_cross_stack_override
tmokmss Apr 15, 2023
e0ee5b5
add integ diff
tmokmss Apr 15, 2023
13044b3
Update cfn-resource.ts
tmokmss Apr 27, 2023
c390b52
Revert "Update cfn-resource.ts"
tmokmss May 3, 2023
423fb74
Revert "add integ diff"
tmokmss May 3, 2023
458e6b4
revert
tmokmss May 3, 2023
905d5ed
Revert "revert"
tmokmss May 7, 2023
7fbc30d
Revert "Revert "revert""
tmokmss May 7, 2023
e971d8b
propagate context
tmokmss May 7, 2023
78d0205
Merge branch 'main' into fix_cross_stack_override
tmokmss May 7, 2023
15f59ee
Update resolvable.ts
tmokmss May 7, 2023
99e4ec5
Update cfn-resource.ts
tmokmss May 7, 2023
ee4d400
Merge branch 'main' into fix_cross_stack_override
tmokmss May 23, 2023
cdae366
Merge branch 'main' into fix_cross_stack_override
mergify[bot] May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added ...asset.c7bba0d9d477c86c6dc2adb0eb95842634a1c040dd3a66b42eec2bb604644d4f.handler/index.d.ts
View file
Open in desktop
Empty file.
13 changes: 13 additions & 0 deletions ...t/asset.c7bba0d9d477c86c6dc2adb0eb95842634a1c040dd3a66b42eec2bb604644d4f.handler/index.js
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion .../@aws-cdk-testing/framework-integ/test/aws-apigateway/test/integ.cors.js.snapshot/cdk.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"20.0.0"}
{"version":"31.0.0"}
6 changes: 3 additions & 3 deletions ...mework-integ/test/aws-apigateway/test/integ.cors.js.snapshot/cors-twitch-test.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "20.0.0",
"version": "31.0.0",
"files": {
"c7bba0d9d477c86c6dc2adb0eb95842634a1c040dd3a66b42eec2bb604644d4f": {
"source": {
Expand All @@ -14,15 +14,15 @@
}
}
},
"ba5dee6e1f1d18e08b8875856fa71d14724d042519cd5803e3176d4ec31e83b3": {
"4f10510e39020bda41b3762edb48c92c486e6b2c92a512e23376d332d2feedb6": {
"source": {
"path": "cors-twitch-test.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "ba5dee6e1f1d18e08b8875856fa71d14724d042519cd5803e3176d4ec31e83b3.json",
"objectKey": "4f10510e39020bda41b3762edb48c92c486e6b2c92a512e23376d332d2feedb6.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...work-integ/test/aws-apigateway/test/integ.cors.js.snapshot/cors-twitch-test.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@
]
},
"Handler": "index.handler",
"Runtime": "nodejs14.x"
"Runtime": "nodejs16.x"
},
"DependsOn": [
"handlerServiceRole187D5A5A"
Expand Down
2 changes: 1 addition & 1 deletion ...ws-apigateway/test/integ.cors.js.snapshot/corsDefaultTestDeployAssert5CF8F851.assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "20.0.0",
"version": "31.0.0",
"files": {
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
"source": {
Expand Down
5 changes: 3 additions & 2 deletions ...ws-cdk-testing/framework-integ/test/aws-apigateway/test/integ.cors.js.snapshot/integ.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"version": "20.0.0",
"version": "31.0.0",
"testCases": {
"cors/DefaultTest": {
"stacks": [
"cors-twitch-test"
],
"assertionStack": "cors/DefaultTest/DeployAssert"
"assertionStack": "cors/DefaultTest/DeployAssert",
"assertionStackName": "corsDefaultTestDeployAssert5CF8F851"
}
}
}
16 changes: 8 additions & 8 deletions ...cdk-testing/framework-integ/test/aws-apigateway/test/integ.cors.js.snapshot/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
{
"version": "20.0.0",
"version": "31.0.0",
"artifacts": {
"Tree": {
"type": "cdk:tree",
"properties": {
"file": "tree.json"
}
},
"cors-twitch-test.assets": {
"type": "cdk:asset-manifest",
"properties": {
Expand All @@ -23,7 +17,7 @@
"validateOnSynth": false,
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
"cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/ba5dee6e1f1d18e08b8875856fa71d14724d042519cd5803e3176d4ec31e83b3.json",
"stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/4f10510e39020bda41b3762edb48c92c486e6b2c92a512e23376d332d2feedb6.json",
"requiresBootstrapStackVersion": 6,
"bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
"additionalDependencies": [
Expand Down Expand Up @@ -214,6 +208,12 @@
]
},
"displayName": "cors/DefaultTest/DeployAssert"
},
"Tree": {
"type": "cdk:tree",
"properties": {
"file": "tree.json"
}
}
}
}
Loading