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): always exit with 0 on cdk diff #4650

Merged
merged 1 commit into from
Oct 23, 2019
Merged

Conversation

jogold
Copy link
Contributor

@jogold jogold commented Oct 23, 2019

Add the --fail flag to exit with 1 if there's a diff.

Closes #2111

BREAKING CHANGE: cdk diff now exits with 0 even when there's a diff, use --fail to exit with 1.


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

Add the `--fail` flag to exit with 1 if there's a diff.

Closes aws#2111

BREAKING CHANGE: `cdk diff` now exits with 0 even when there's a diff, use `--fail` to exit with 1.
@jogold jogold requested a review from RomainMuller as a code owner October 23, 2019 15:15
@mergify
Copy link
Contributor

mergify bot commented Oct 23, 2019

Thanks so much for taking the time to contribute to the AWS CDK ❤️

We will shortly assign someone to review this pull request and help get it
merged. In the meantime, please take a minute to make sure you follow this
checklist
:

  • PR title type(scope): text
    • type: fix, feat, refactor go into CHANGELOG, chore is hidden
    • scope: name of module without aws- or cdk- prefix or postfix (e.g. s3 instead of aws-s3-deployment)
    • text: use all lower-case, do not end with a period, do not include issue refs
  • PR Description
    • Rationale: describe rationale of change and approach taken
    • Issues: indicate issues fixed via: fixes #xxx or closes #xxx
    • Breaking?: last paragraph: BREAKING CHANGE: <describe what changed + link for details>
  • Testing
    • Unit test added. Prefer to add a new test rather than modify existing tests
    • CLI or init templates change? Re-run/add CLI integration tests
  • Documentation
    • README: update module README to describe new features
    • API docs: public APIs must be documented. Copy from official AWS docs when possible
    • Design: for significant features, follow design process

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • 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 Oct 23, 2019

Thank you for contributing! Your pull request is now being automatically merged.

@mergify mergify bot merged commit 4f765b2 into aws:master Oct 23, 2019
@jogold jogold deleted the cdk-diff-fail branch October 24, 2019 09:39
eladb pushed a commit that referenced this pull request Oct 28, 2019
This change includes a breaking change in our stable APIs.
We will have to discuss this furthre in order to make a decision
to actually break.

This reverts commit 4f765b2.
eladb pushed a commit that referenced this pull request Oct 28, 2019
This change includes a breaking change in our stable APIs.
We will have to discuss this furthre in order to make a decision
to actually break.

This reverts commit 4f765b2.
eladb pushed a commit that referenced this pull request Oct 28, 2019
This change includes a breaking change in our stable APIs.
We will have to discuss this furthre in order to make a decision
to actually break.

This reverts commit 4f765b2.
@eladb
Copy link
Contributor

eladb commented Oct 28, 2019

@jogold since this is breaking the stable CLI API, we decided to revert this PR and I would like to propose the following change (let me know if this is acceptable):

  1. Make the default of diff --fail to true, so the current behavior will remain the same.
  2. When new projects are initialized with cdk init generate their cdk.json file with diff-fail: false by default.

This way, new projects will get the new behavior and existing projects will not experience a break.
Would be nice to implement this cdk.json defaults in a way that it's reused across all init templates.

What do you think?

@RomainMuller @rix0rrr - would love your input here.

@hoegertn
Copy link
Contributor

This sounds great. See my comment on the reverting PR.

@jogold
Copy link
Contributor Author

jogold commented Oct 28, 2019

2. generate their cdk.json file with diff-fail: false by default.

Is this syntax inside cdk.json already working?

@eladb
Copy link
Contributor

eladb commented Oct 28, 2019

Is this syntax inside cdk.json already working?

Not sure to be honest... I think some custom handling will be needed, but not sure.

jogold added a commit to jogold/aws-cdk that referenced this pull request Oct 28, 2019
Use `cdk diff --no-fail` to exit with 0 even when there is a diff.

To avoid a CLI breaking change, the default remains to fail on diff.

Related to aws#4650 and aws#4708
@jogold
Copy link
Contributor Author

jogold commented Oct 28, 2019

I suggest splitting this into 2 different PR's: one for the --no-fail (see #4721) and one for the default for new projects (to follow, needs more work on merging argv with cdk.json).

mergify bot pushed a commit that referenced this pull request Nov 28, 2019
* feat(cli): add --no-fail option to diff

Use `cdk diff --no-fail` to exit with 0 even when there is a diff.

To avoid a CLI breaking change, the default remains to fail on diff.

Related to #4650 and #4708

* use feature flag
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"cdk diff" returns error code 1
4 participants