chore: fix CLI integration tests by rix0rrr · Pull Request #4198 · aws/aws-cdk

rix0rrr · 2019-09-23T11:40:45Z

Fixes:

Fix breakage introduced by fix(cli): update bit.ly link to be directly to github #3782, which changed the wrong string.
Update other expectation to match change introduced in feat(core): context lookup errors are reported to CX app #3772.

Refactor:

Simplify testing scripts themselves to run commands as they normally would (just runs cdk, just calls npm install @aws-cdk/core), and remove the dependency on a complex set of sourced bash scripts with functions that need to be called at the right moment.

Instead, there are three new dispatcher scripts:

run-against-repo
run-against-dist
run-against-release

Which set up an appropriate environment before calling a command that is passed.

Each of them does something different, but through a combination of PATH manipulation, config file rewriting and other things makes it so that in the subsequent script the cdk command points to an appropriate instance of the CDK, npm install and pip install will install packages from an appropriate source, etc.

To be used like so:

./run-against-repo cli/test.sh
./run-against-dist cli/test.sh
./run-against-release init/test-all.sh
# etc

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

Fix breakage introduced by #3782, which changed the wrong string. Update other expectation to match change introduced in #3772.

mergify · 2019-09-23T11:41:22Z

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

eladb · 2019-09-23T11:45:26Z

packages/aws-cdk/test/integ/cli/test-cdk-ssm-parameter-provider-error.sh


 assert "cdk_synth ${STACK_NAME_PREFIX}-missing-ssm-parameter -c test:ssm-parameter-name=${parameterName}" <<HERE
-SSM parameter not available in account ${account}, region ${region}: ${parameterName}
+[Error at /cdk-toolkit-integration-missing-ssm-parameter] SSM parameter not available in account 993655754359, region us-east-1: /does/not/exist


Are you sure we don’t want to use substitution here?

+1

does this work:

[Error at ${STACK_NAME_PREFIX}-missing-ssm-parameter] SSM parameter not available in account ${account}, region ${region}: ${parameterName}

or adding errorKey=[Error at /cdk-toolkit-integration-missing-ssm-parameter] and use it as ${errorKey} ahead of the rest of the existing error message?

Doh, you are correct.

packages/@aws-cdk/cloudformation-diff/lib/format.ts

shivlaks · 2019-09-23T11:54:03Z

packages/aws-cdk/test/integ/cli/test-cdk-ssm-parameter-provider-error.sh


 assert "cdk_synth ${STACK_NAME_PREFIX}-missing-ssm-parameter -c test:ssm-parameter-name=${parameterName}" <<HERE
-SSM parameter not available in account ${account}, region ${region}: ${parameterName}
+[Error at /cdk-toolkit-integration-missing-ssm-parameter] SSM parameter not available in account 993655754359, region us-east-1: /does/not/exist


+1

does this work:

[Error at ${STACK_NAME_PREFIX}-missing-ssm-parameter] SSM parameter not available in account ${account}, region ${region}: ${parameterName}

or adding errorKey=[Error at /cdk-toolkit-integration-missing-ssm-parameter] and use it as ${errorKey} ahead of the rest of the existing error message?

aws-cdk-automation · 2019-09-23T12:20:40Z

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 · 2019-09-24T08:59:55Z

I'm going to drastically simplify the scripts used here, and remove the references to verdaccio etc. Setting up the runtime environment so that we can choose what artifacts to work from should be the responsibility of the caller, not of the tests themselves.

aws-cdk-automation · 2019-09-24T14:17:13Z

AWS CodeBuild CI Report

Result: SUCCEEDED
Build Logs (available for 30 days)

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

aws-cdk-automation · 2019-09-24T14:57:43Z

AWS CodeBuild CI Report

Result: SUCCEEDED
Build Logs (available for 30 days)

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

aws-cdk-automation · 2019-09-24T15:06:09Z

AWS CodeBuild CI Report

Result: SUCCEEDED
Build Logs (available for 30 days)

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

eladb

👌👌❤️👌❤️

mergify · 2019-09-24T17:53:59Z

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

aws-cdk-automation · 2019-09-24T18:36:07Z

AWS CodeBuild CI Report

Result: SUCCEEDED
Build Logs (available for 30 days)

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

chore: fix CLI integration tests

ee90fba

Fix breakage introduced by #3782, which changed the wrong string. Update other expectation to match change introduced in #3772.

rix0rrr requested review from RomainMuller, eladb, nija-at and shivlaks September 23, 2019 11:40

rix0rrr self-assigned this Sep 23, 2019

eladb reviewed Sep 23, 2019

View reviewed changes

shivlaks reviewed Sep 23, 2019

View reviewed changes

Use substitutions in error message

55eb17b

Rewrite how CLI tests are being run

37c4d6b

Extract environment setup from tests

4269940

rix0rrr force-pushed the huijbers/fix-integ-tests branch from 140de50 to 4269940 Compare September 24, 2019 14:18

rix0rrr requested a review from skinny85 as a code owner September 24, 2019 14:18

Need to not ignore integ test Javascript files

dc5875b

eladb approved these changes Sep 24, 2019

View reviewed changes

Merge branch 'master' into huijbers/fix-integ-tests

2cc52a0

mergify bot merged commit 7ce8112 into master Sep 24, 2019

mergify bot deleted the huijbers/fix-integ-tests branch September 24, 2019 18:36

NGL321 added the contribution/core This is a PR that came from AWS. label Sep 27, 2019

sumodgeorge mentioned this pull request Dec 9, 2023

[Snyk] Security upgrade verdaccio from 3.8.1 to 5.29.0 sumodgeorge/aws-cdk#22

Open

sumodgeorge mentioned this pull request Dec 20, 2023

[Snyk] Security upgrade verdaccio from 3.8.1 to 5.29.0 sumodgeorge/aws-cdk#24

Open

Conversation

rix0rrr commented Sep 23, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mergify bot commented Sep 23, 2019

Uh oh!

eladb Sep 23, 2019

Choose a reason for hiding this comment

Uh oh!

shivlaks Sep 23, 2019

Choose a reason for hiding this comment

Uh oh!

rix0rrr Sep 24, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

shivlaks Sep 23, 2019

Choose a reason for hiding this comment

Uh oh!

aws-cdk-automation commented Sep 23, 2019

AWS CodeBuild CI Report

Uh oh!

rix0rrr commented Sep 24, 2019

Uh oh!

aws-cdk-automation commented Sep 24, 2019

AWS CodeBuild CI Report

Uh oh!

aws-cdk-automation commented Sep 24, 2019

AWS CodeBuild CI Report

Uh oh!

aws-cdk-automation commented Sep 24, 2019

AWS CodeBuild CI Report

Uh oh!

eladb left a comment

Choose a reason for hiding this comment

Uh oh!

mergify bot commented Sep 24, 2019

Uh oh!

aws-cdk-automation commented Sep 24, 2019

AWS CodeBuild CI Report

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

rix0rrr commented Sep 23, 2019 •

edited

Loading