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): make new CLI recognize old assembly versions #4307

Merged
merged 3 commits into from
Oct 1, 2019

Conversation

rix0rrr
Copy link
Contributor

@rix0rrr rix0rrr commented Oct 1, 2019

In the latest release, we changed the CX protocol, requiring users of a
newer CLI to upgrade their CDK framework libraries (to be safe).

This particular change was actually backwards compatible, so add the
requisite code to the CLI to recognize and fix that condition.

Fixes #4294.


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

In the latest release, we changed the CX protocol, requiring users of a
newer CLI to upgrade their CDK framework libraries (to be safe).

This particular change was actually backwards compatible, so add the
requisite code to the CLI to recognize and fix that condition.

Fixes #4294.
@rix0rrr rix0rrr self-assigned this Oct 1, 2019
@mergify
Copy link
Contributor

mergify bot commented Oct 1, 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

}

// if framework < cli, we require a newer framework version
if (semver.lt(frameworkVersion, toolkitVersion)) {
throw new Error(
`CDK CLI can only be used with apps created by CDK >= ${CLOUD_ASSEMBLY_VERSION}`);
`A newer version of the CDK framework (>= ${CLOUD_ASSEMBLY_VERSION}) is necessary to interact with this version of the CLI`);
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe something like “the CDK CLI you are using requires your CDK app to use CDK modules with version >= xxx”

Copy link
Contributor Author

Choose a reason for hiding this comment

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

😭

@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

Copy link
Contributor

@eladb eladb left a comment

Choose a reason for hiding this comment

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

While we are at it, can we also relay the CLI version through context so that apps can be smarter if needed in the future?

@eladb
Copy link
Contributor

eladb commented Oct 1, 2019

For reference: https://t.co/CEircxyDqv

@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

@rix0rrr rix0rrr added the pr/do-not-merge This PR should not be merged at this time. label Oct 1, 2019
@rix0rrr rix0rrr requested a review from eladb October 1, 2019 09:44
@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

@@ -73,6 +74,10 @@ export async function execProgram(aws: ISDK, config: Configuration): Promise<cxa
debug('outdir:', outdir);
env[cxapi.OUTDIR_ENV] = outdir;

// Send version information
env[cxapi.CLI_ASM_VERSION_ENV] = cxapi.CLOUD_ASSEMBLY_VERSION;
Copy link
Contributor

Choose a reason for hiding this comment

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

Curious why through environment variables and not through context... not that I have a strong opinion...

Copy link
Contributor

@eladb eladb left a comment

Choose a reason for hiding this comment

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

Looks good. Regarding your PR description: the change was not backwards compatible because the CloudAssembly used to throw if it saw an unknown artifact type. So either way we needed to bump both sides (or gracefully degrade at the framework level, which we couldn’t).

@rix0rrr
Copy link
Contributor Author

rix0rrr commented Oct 1, 2019

So either way we needed to bump both sides (or gracefully degrade at the framework level, which we couldn’t).

Or make the CLI understand old assembly types, which in this case is totally safe.

@rix0rrr rix0rrr merged commit 2f979b7 into master Oct 1, 2019
@rix0rrr rix0rrr deleted the huijbers/cli-backwards-compat branch October 1, 2019 11:02
rix0rrr added a commit that referenced this pull request Oct 1, 2019
In the latest release, we changed the CX protocol (adding a new artifact
type), requiring users of a newer CLI to upgrade their CDK framework
libraries. This check was originally written to improve safety.

This particular change was actually backwards compatible, so add the
requisite code to the CLI to recognize and fix that condition.

Fixes #4294.
mergify bot pushed a commit that referenced this pull request Oct 1, 2019
* fix(cli): make new CLI work with old assembly versions (#4307)

In the latest release, we changed the CX protocol (adding a new artifact
type), requiring users of a newer CLI to upgrade their CDK framework
libraries. This check was originally written to improve safety.

This particular change was actually backwards compatible, so add the
requisite code to the CLI to recognize and fix that condition.

Fixes #4294.

* v1.10.1

See CHANGELOG
@SomayaB SomayaB added the contribution/core This is a PR that came from AWS. label Nov 14, 2019
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. pr/do-not-merge This PR should not be merged at this time.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CDK CLI can only be used with apps created by CDK >= 1.10.0
4 participants