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

Jump to bottom

fix(core): prevent the error when the condition is split into groups of 10 and 1 in Fn.conditionAnd() #25999

Merged
merged 2 commits into from Jun 28, 2023
Merged

fix(core): prevent the error when the condition is split into groups of 10 and 1 in Fn.conditionAnd() #25999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80c7868
fix(core): prevent the error when the condition is split into groups …
wafuwafu13 Jun 15, 2023
3111aa8
Merge branch 'main' into ten-n-one-and
corymhall Jun 28, 2023
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
5 changes: 4 additions & 1 deletion packages/aws-cdk-lib/core/lib/cfn-fn.ts
View file
Open in desktop
Expand Up @@ -275,7 +275,10 @@ export class Fn {
if (conditions.length === 1) {
return conditions[0] as ICfnRuleConditionExpression;
}
return Fn.conditionAnd(..._inGroupsOf(conditions, 10).map(group => new FnAnd(...group)));
if (conditions.length <= 10) {
return new FnAnd(...conditions);
}
return Fn.conditionAnd(..._inGroupsOf(conditions, 10).map(group => Fn.conditionAnd(...group)));
}

/**
Expand Down
100 changes: 100 additions & 0 deletions packages/aws-cdk-lib/core/test/condition.test.ts
View file
Open in desktop
Expand Up @@ -60,6 +60,106 @@ describe('condition', () => {
});
});

test('condition length is 10n + 1 in Fn.conditionAnd', () => {
// GIVEN
const stack = new cdk.Stack();
const expression = cdk.Fn.conditionAnd(
cdk.Fn.conditionEquals('a', '1'),
cdk.Fn.conditionEquals('b', '2'),
cdk.Fn.conditionEquals('c', '3'),
cdk.Fn.conditionEquals('d', '4'),
cdk.Fn.conditionEquals('e', '5'),
cdk.Fn.conditionEquals('f', '6'),
cdk.Fn.conditionEquals('g', '7'),
cdk.Fn.conditionEquals('h', '8'),
cdk.Fn.conditionEquals('i', '9'),
cdk.Fn.conditionEquals('j', '10'),
cdk.Fn.conditionEquals('k', '11'),
);

// WHEN
new cdk.CfnCondition(stack, 'Condition', { expression });

// THEN
expect(toCloudFormation(stack)).toEqual({
Conditions: {
Condition: {
'Fn::And': [
{
'Fn::And': [
{ 'Fn::Equals': ['a', '1'] },
{ 'Fn::Equals': ['b', '2'] },
{ 'Fn::Equals': ['c', '3'] },
{ 'Fn::Equals': ['d', '4'] },
{ 'Fn::Equals': ['e', '5'] },
{ 'Fn::Equals': ['f', '6'] },
{ 'Fn::Equals': ['g', '7'] },
{ 'Fn::Equals': ['h', '8'] },
{ 'Fn::Equals': ['i', '9'] },
{ 'Fn::Equals': ['j', '10'] },
],
},
{
'Fn::Equals': ['k', '11'],
},
],
},
},
});
});

test('condition length is more than 10 in Fn.conditionAnd', () => {
// GIVEN
const stack = new cdk.Stack();
const expression = cdk.Fn.conditionAnd(
cdk.Fn.conditionEquals('a', '1'),
cdk.Fn.conditionEquals('b', '2'),
cdk.Fn.conditionEquals('c', '3'),
cdk.Fn.conditionEquals('d', '4'),
cdk.Fn.conditionEquals('e', '5'),
cdk.Fn.conditionEquals('f', '6'),
cdk.Fn.conditionEquals('g', '7'),
cdk.Fn.conditionEquals('h', '8'),
cdk.Fn.conditionEquals('i', '9'),
cdk.Fn.conditionEquals('j', '10'),
cdk.Fn.conditionEquals('k', '11'),
cdk.Fn.conditionEquals('l', '12'),
);

// WHEN
new cdk.CfnCondition(stack, 'Condition', { expression });

// THEN
expect(toCloudFormation(stack)).toEqual({
Conditions: {
Condition: {
'Fn::And': [
{
'Fn::And': [
{ 'Fn::Equals': ['a', '1'] },
{ 'Fn::Equals': ['b', '2'] },
{ 'Fn::Equals': ['c', '3'] },
{ 'Fn::Equals': ['d', '4'] },
{ 'Fn::Equals': ['e', '5'] },
{ 'Fn::Equals': ['f', '6'] },
{ 'Fn::Equals': ['g', '7'] },
{ 'Fn::Equals': ['h', '8'] },
{ 'Fn::Equals': ['i', '9'] },
{ 'Fn::Equals': ['j', '10'] },
],
},
{
'Fn::And': [
{ 'Fn::Equals': ['k', '11'] },
{ 'Fn::Equals': ['l', '12'] },
],
},
],
},
},
});
});

test('condition length is 10n + 1 in Fn.conditionOr', () => {
// GIVEN
const stack = new cdk.Stack();
Expand Down