Skip to content

chore(cli): fix nested stack integ test collision #7846

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

Merged
mergify merged 5 commits into from
May 7, 2020
Merged

chore(cli): fix nested stack integ test collision #7846

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ad6230
use the parameter of the parent stack in the nested stack
iliapolo May 7, 2020
ab5ffa4
update exclusions
iliapolo May 7, 2020
e1c6239
use valueAsString when using a parameter
iliapolo May 7, 2020
06b8a54
Merge branch 'master' into epolon/fix-nested-stack-params-integ-test
mergify[bot] May 7, 2020
2e0b433
Merge branch 'master' into epolon/fix-nested-stack-params-integ-test
mergify[bot] May 7, 2020
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
14 changes: 2 additions & 12 deletions packages/aws-cdk/test/integ/cli.exclusions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,10 @@ For example:

*/
const exclusions = [
{
"test": "test-cdk-deploy-with-parameters.sh",
"version": "v1.31.0",
"justification": "This test doesn't use a unique sns topic name and it collides with our regular integ suite"
},
{
"test": "test-cdk-deploy-wildcard-with-parameters.sh",
"version": "v1.31.0",
"justification": "This test doesn't use a unique sns topic name and it collides with our regular integ suite"
},
{
"test": "test-cdk-deploy-nested-stack-with-parameters.sh",
"version": "v1.31.0",
"justification": "This test doesn't use a unique sns topic name and it collides with our regular integ suite"
"version": "v1.37.0",
"justification": "This test doesn't use a unique sns topic name for the topic in the nested stack and it collides with our regular integ suite"
}
]

Expand Down
8 changes: 4 additions & 4 deletions packages/aws-cdk/test/integ/cli/app/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class ParameterStack extends cdk.Stack {
super(parent, id, props);

new sns.Topic(this, 'TopicParameter', {
topicName: new cdk.CfnParameter(this, 'TopicNameParam')
topicName: new cdk.CfnParameter(this, 'TopicNameParam').valueAsString
});
}
}
Expand All @@ -56,7 +56,7 @@ class OtherParameterStack extends cdk.Stack {
super(parent, id, props);

new sns.Topic(this, 'TopicParameter', {
topicName: new cdk.CfnParameter(this, 'OtherTopicNameParam')
topicName: new cdk.CfnParameter(this, 'OtherTopicNameParam').valueAsString
});
}
}
Expand All @@ -66,10 +66,10 @@ class MultiParameterStack extends cdk.Stack {
super(parent, id, props);

new sns.Topic(this, 'TopicParameter', {
displayName: new cdk.CfnParameter(this, 'DisplayNameParam')
displayName: new cdk.CfnParameter(this, 'DisplayNameParam').valueAsString
});
new sns.Topic(this, 'OtherTopicParameter', {
displayName: new cdk.CfnParameter(this, 'OtherDisplayNameParam')
displayName: new cdk.CfnParameter(this, 'OtherDisplayNameParam').valueAsString
});
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/aws-cdk/test/integ/cli/app/nested-stack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ class MyNestedStack extends cfn.NestedStack {
class StackWithNestedStackUsingParameters extends Stack {
constructor(scope, id) {
super(scope, id);
new CfnParameter(this, 'MyTopicParam');
const topicNameParam = new CfnParameter(this, 'MyTopicParam');
new MyNestedStackUsingParameters(this, 'MyNested', {
parameters: {'MyTopicParam': 'ThereIsASpoon'}
parameters: {'MyTopicParam': topicNameParam.valueAsString}
});
}
}
Expand Down