Skip to content

fix(cli): cdk bootstrap is broken due to --no-execute#5092

Merged
mergify[bot] merged 1 commit intomasterfrom
benisrae/fix-bootstrap
Nov 19, 2019
Merged

fix(cli): cdk bootstrap is broken due to --no-execute#5092
mergify[bot] merged 1 commit intomasterfrom
benisrae/fix-bootstrap

Conversation

@eladb
Copy link
Copy Markdown
Contributor

@eladb eladb commented Nov 19, 2019

The change that introduced the --no-execute feature (#4852) did not take into account that cdk bootstrap uses the same code path for deployment, and therefore execute was undefined, and resolved to false (despite the documented default).
This change moves execute switch from the global scope into deploy and to bootstrap and passes it into the cliBootstrap command, as well as respects the default in case the option passed to the deployment utility is undefined.
It also emits a message to STDOUT in case --no-execute is provided to let user know that deployment hasn't really finished. Otherwise, it appears as if deployment is successful.

The deploy-no-execute integration test was also "failing successfully" due to invalid usage of bash conditions, so this is also fixed here.

Added integration test to verify that --no-execute is respected by cdk bootstrap.


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

The change that introduced the `--no-execute` feature (#4852) did not take into account that `cdk bootstrap` uses the same code path for deployment, and therefore `execute` was undefined, and resolved to false (despite the documented default).
This change moves `execute` switch from the global scope into `deploy` and to `bootstrap` and passes it into the `cliBootstrap` command, as well as respects the default in case the option passed to the deployment utility is `undefined`.
It also emits a message to STDOUT in case `--no-execute` is provided to let user know that deployment hasn't really finished. Otherwise, it appears as if deployment is successful.

The `deploy-no-execute` integration test was also "failing successfully" due to invalid usage of bash conditions, so this is also fixed here.

Added integration test to verify that --no-execute is respected by `cdk bootstrap`.
@eladb eladb requested a review from RomainMuller as a code owner November 19, 2019 07:51
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Nov 19, 2019
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Nov 19, 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
Copy Markdown
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
Copy Markdown
Contributor

mergify bot commented Nov 19, 2019

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

@mergify mergify bot merged commit 7acc588 into master Nov 19, 2019
@mergify mergify bot deleted the benisrae/fix-bootstrap branch November 19, 2019 08:16
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.

4 participants