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.

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): cross stack references to string lists break #22873

Merged
merged 38 commits into from Dec 8, 2022
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
5cce6a1
working linked app example, but still needs testing + edge cases
comcalvi Nov 7, 2022
dcc3465
tmp
comcalvi Nov 7, 2022
f177221
working intra-env
comcalvi Nov 8, 2022
c2364dd
integ test + ssm bugfix
comcalvi Nov 10, 2022
1491766
integ
comcalvi Nov 10, 2022
063590a
undo
comcalvi Nov 10, 2022
bc71472
edge case
comcalvi Nov 11, 2022
183d70c
changed return type of to any
comcalvi Nov 11, 2022
3b9fa84
remove breaking change
comcalvi Nov 14, 2022
9a055ce
docs
comcalvi Nov 14, 2022
e065be7
synta
comcalvi Nov 14, 2022
4129840
docs
comcalvi Nov 14, 2022
a7b9e1f
comments
comcalvi Nov 15, 2022
468cd82
leftover
comcalvi Nov 15, 2022
ecc6aab
remove Fn::Ref (it's not valid CFN)
comcalvi Nov 16, 2022
9e454c3
added test for name
comcalvi Nov 16, 2022
8b5239c
global const
comcalvi Nov 16, 2022
c6110c6
outputs will throw if given string lists
comcalvi Nov 16, 2022
a75181e
comment
comcalvi Nov 16, 2022
d31ff3c
extra comments
comcalvi Nov 16, 2022
d1796d2
stash
comcalvi Nov 28, 2022
6ea0622
type hints for tokens!
comcalvi Nov 29, 2022
1876530
build errors
comcalvi Nov 30, 2022
4666004
Merge branch 'main' into crossStack
comcalvi Nov 30, 2022
d4455bb
clean up
comcalvi Dec 1, 2022
51b86a3
test
comcalvi Dec 1, 2022
cd2f636
remove more unused type hints
comcalvi Dec 2, 2022
3d600db
clean up
comcalvi Dec 2, 2022
95914ff
rename
comcalvi Dec 2, 2022
8933739
remove from iam
comcalvi Dec 2, 2022
d324356
clean up
comcalvi Dec 3, 2022
e6ae434
comments
comcalvi Dec 3, 2022
2cfa06a
update genspec to use correct enum
comcalvi Dec 5, 2022
b571cd9
comment
comcalvi Dec 5, 2022
c1e1c25
update output error message
comcalvi Dec 5, 2022
caf451f
comments
comcalvi Dec 6, 2022
f23fbdb
Merge branch 'main' into crossStack
mergify[bot] Dec 7, 2022
8bef0bb
Merge branch 'main' into crossStack
TheRealAmazonKendra Dec 7, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/@aws-cdk/aws-cloudformation/package.json
Expand Up @@ -93,6 +93,7 @@
"jest": "^27.5.1"
},
"dependencies": {
"@aws-cdk/aws-ec2": "0.0.0",
comcalvi marked this conversation as resolved.
Show resolved Hide resolved
"@aws-cdk/aws-iam": "0.0.0",
"@aws-cdk/aws-lambda": "0.0.0",
"@aws-cdk/aws-s3": "0.0.0",
Expand All @@ -103,6 +104,7 @@
},
"homepage": "https://github.com/aws/aws-cdk",
"peerDependencies": {
"@aws-cdk/aws-ec2": "0.0.0",
"@aws-cdk/aws-iam": "0.0.0",
"@aws-cdk/aws-lambda": "0.0.0",
"@aws-cdk/aws-s3": "0.0.0",
Expand Down
@@ -0,0 +1 @@
{"version":"21.0.0"}
@@ -0,0 +1,19 @@
{
"version": "21.0.0",
"files": {
"202e8f081dd11cb0e9069382b05ff8627424bffd02c1aca22b6b4b4ee96df4a3": {
"source": {
"path": "consumer.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "202e8f081dd11cb0e9069382b05ff8627424bffd02c1aca22b6b4b4ee96df4a3.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
}
},
"dockerImages": {}
}
@@ -0,0 +1,76 @@
{
"Resources": {
"GetAtt0B6ACA40": {
"Type": "AWS::SSM::Parameter",
"Properties": {
"Type": "StringList",
"Value": {
"Fn::Join": [
",",
{
"Fn::Split": [
"CDK-string-list-export-delimiter",
{
"Fn::ImportValue": "producer:ExportsOutputFnGetAttendpointE7B9679BDnsEntries62080A34"
}
]
}
]
}
}
},
"Ref47C32AF2": {
"Type": "AWS::SSM::Parameter",
"Properties": {
"Type": "StringList",
"Value": {
"Fn::Join": [
",",
{
"Fn::Split": [
"CDK-string-list-export-delimiter",
{
"Fn::ImportValue": "producer:ExportsOutputRefstringListParam77B646D6"
}
]
}
]
}
}
}
},
"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."
}
]
}
}
}
@@ -0,0 +1,19 @@
{
"version": "21.0.0",
"files": {
"21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": {
"source": {
"path": "crossregionreferencesDefaultTestDeployAssertAB7415FD.template.json",
"packaging": "file"
},
"destinations": {
"current_account-current_region": {
"bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}",
"objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json",
"assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}"
}
}
}
},
"dockerImages": {}
}
@@ -0,0 +1,36 @@
{
"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."
}
]
}
}
}
@@ -0,0 +1,14 @@
{
"version": "21.0.0",
"testCases": {
"cross-region-references/DefaultTest": {
"stacks": [
"producer",
"consumer"
],
"stackUpdateWorkflow": false,
"assertionStack": "cross-region-references/DefaultTest/DeployAssert",
"assertionStackName": "crossregionreferencesDefaultTestDeployAssertAB7415FD"
}
}
}