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(cli): --no-fail flag is ignored in favor of the enableDiffNoFail feature flag #21107

Merged
merged 4 commits into from
Jul 12, 2022

Conversation

otaviomacedo
Copy link
Contributor

The CLI doesn't distinguish between cdk diff --no-fail and just cdk diff. In both cases, it's taking the value of enableDiffNoFail feature flag to decide which status code to return.

Change the behavior to:

Is there a difference? --fail (CLI option) enableDiffNoFail (FF) Return code
No Don't care Don't care 0
Yes false Don't care 0
Yes true Don't care 1
Yes null false 1
Yes null true 0

Fixes #19110.


All Submissions:

Adding new Unconventional Dependencies:

  • This PR adds new unconventional dependencies following the process described here

New Features

  • Have you added the new feature to an integration test?
    • Did you use yarn integ to deploy the infrastructure and generate the snapshot (i.e. yarn integ without --dry-run)?

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

@gitpod-io
Copy link

gitpod-io bot commented Jul 12, 2022

@aws-cdk-automation aws-cdk-automation requested a review from a team July 12, 2022 13:39
@github-actions github-actions bot added bug This issue is a bug. effort/small Small work item – less than a day of effort p1 labels Jul 12, 2022
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Jul 12, 2022
@mrgrain
Copy link
Contributor

mrgrain commented Jul 12, 2022

Is there a way to make this change without loosing the default value in cdk diff --help?
image

@otaviomacedo
Copy link
Contributor Author

Is there a way to make this change without loosing the default value in cdk diff --help? image

I don't think so. To get the value of the feature flag we need a Configuration; to build a Configuration, we need the argv; and the argv is produced after all these CLI options have been set.

@@ -518,6 +518,43 @@ integTest('cdk diff', withDefaultFixture(async (fixture) => {
.rejects.toThrow('exited with error');
}));

integTest('enableDiffNoFail', withDefaultFixture(async (fixture) => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kudos for the scenarios, by the time I was done reading them I got it, but it was a thoroughly confusing journey until then :-)

The option takes precedence in what the outcome is, unless it's not specified, and that is when the feature flag value matters.

Copy link
Contributor

@Naumel Naumel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@mergify
Copy link
Contributor

mergify bot commented Jul 12, 2022

Thank you for contributing! Your pull request will be updated from main 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: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 09b3f20
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@mergify mergify bot merged commit cad6fc5 into main Jul 12, 2022
@mergify mergify bot deleted the otaviom/respect-fail-flag branch July 12, 2022 17:11
@mergify
Copy link
Contributor

mergify bot commented Jul 12, 2022

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug This issue is a bug. contribution/core This is a PR that came from AWS. effort/small Small work item – less than a day of effort p1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cdk diff: always fails on diff
4 participants