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(cloudformation-diff): DependsOn singleton arrays aren't equal to string values #9814

Merged
merged 71 commits into from
Aug 19, 2020

Conversation

comcalvi
Copy link
Contributor


Closes #9813

This allows

DependsOn: "A" and DependsOn: ["A"]

and

DependsOn: ["A", "B"] and DependsOn: ["B", "A"] to be equivalent.


It also fixes a bug that would cause

BucketName: { 'Fn::Select': [0, ['name2', 'name1']] }

and

BucketName: { 'Fn::Select': [0, ['name1', 'name2']] }

to be equal.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

comcalvi and others added 30 commits June 4, 2020 17:44
Co-authored-by: Adam Ruka <[email protected]>
…::And, Fn::Not, and Fn::Or, including unit tests.
…ied the return type of transform to IResolvable, and updated transform docs
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Aug 18, 2020
@mergify
Copy link
Contributor

mergify bot commented Aug 18, 2020

Title does not follow the guidelines of Conventional Commits. Please adjust title before merge.

@comcalvi comcalvi changed the title Depends on diff fix(cloudformation-diff): allow DependsOn array arguments to be equivalent in certain cases Aug 18, 2020
@comcalvi comcalvi requested a review from skinny85 August 18, 2020 22:35
@skinny85 skinny85 requested review from rix0rrr and removed request for skinny85 August 18, 2020 22:59
@rix0rrr rix0rrr changed the title fix(cloudformation-diff): allow DependsOn array arguments to be equivalent in certain cases fix(cloudformation-diff): DependsOn singleton arrays aren't equal to string values Aug 19, 2020
@mergify
Copy link
Contributor

mergify bot commented Aug 19, 2020

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject6AEA49D1-qxepHUsryhcu
  • Commit ID: dc0fa65
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@mergify
Copy link
Contributor

mergify bot commented Aug 19, 2020

Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

@mergify mergify bot merged commit 49cdb47 into aws:master Aug 19, 2020
misterjoshua pushed a commit to misterjoshua/aws-cdk that referenced this pull request Aug 19, 2020
…string values (aws#9814)

----

Closes aws#9813 

This allows

`DependsOn: "A"` and `DependsOn: ["A"]`

and

`DependsOn: ["A", "B"]` and `DependsOn: ["B", "A"]` to be equivalent.

----

It also fixes a bug that would cause 

`BucketName: { 'Fn::Select': [0, ['name2', 'name1']] }`

and

`BucketName: { 'Fn::Select': [0, ['name1', 'name2']] }`

to be equal.

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contribution/core This is a PR that came from AWS.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[cloudformation-diff] DependsOn array arguments are incorrectly considered unequal in certain cases
3 participants