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

feat(cli): cdk watch --concurrency #21598

Merged
merged 4 commits into from
Aug 16, 2022
Merged

Conversation

misterjoshua
Copy link
Contributor

@misterjoshua misterjoshua commented Aug 14, 2022

This PR adds #20345's --concurrency to cdk watch mode. Given that cdk watch is a wrapper around deploy, this is a simple matter of passing the concurrency option along.

Fixes #21597


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 Aug 14, 2022

@github-actions github-actions bot added feature-request A feature should be added or improved. p2 labels Aug 14, 2022
@aws-cdk-automation aws-cdk-automation requested a review from a team August 14, 2022 21:10
@TheRealAmazonKendra TheRealAmazonKendra added the pr-linter/exempt-integ-test The PR linter will not require integ test changes label Aug 15, 2022
@mergify
Copy link
Contributor

mergify bot commented Aug 15, 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).

@misterjoshua
Copy link
Contributor Author

@TheRealAmazonKendra There is a strange new error from the CI. I'm not sure what could have caused this. I am re-running the build locally to see if I can find an obvious cause.

@aws-cdk/integ-runner: Validating circular imports
@aws-cdk/integ-runner: Validating resources
@aws-cdk/integ-runner: Validating attributions
@aws-cdk/integ-runner: Build times for @aws-cdk/integ-runner: Total time (26.7s) | /codebuild/output/src371907408/src/github.com/aws/aws-cdk/node_modules/typescript/bin/tsc (11.8s)
@aws-cdk/integ-runner: $ cdk-test
@aws-cdk/integ-runner: PASS test/runner/integration-tests.test.js
@aws-cdk/integ-runner: PASS test/runner/private/integ-manifest.test.js
@aws-cdk/integ-runner: PASS test/runner/integ-test-suite.test.js
@aws-cdk/integ-runner: PASS test/runner/private/cloud-assembly.test.js
@aws-cdk/integ-runner: PASS test/runner/snapshot-test-runner.test.js
@aws-cdk/integ-runner: PASS test/runner/integ-test-runner.test.js
@aws-cdk/integ-runner: FAIL test/workers/integ-worker.test.js
@aws-cdk/integ-runner:   � test runner › has snapshot
@aws-cdk/integ-runner:     expect(received).toEqual(expected) // deep equality
@aws-cdk/integ-runner:     - Expected  - 1
@aws-cdk/integ-runner:     + Received  + 6
@aws-cdk/integ-runner:     - Array []
@aws-cdk/integ-runner:     + Array [
@aws-cdk/integ-runner:     +   Object {
@aws-cdk/integ-runner:     +     "discoveryRoot": "test/test-data",
@aws-cdk/integ-runner:     +     "fileName": "test/test-data/xxxxx.test-with-snapshot.js",
@aws-cdk/integ-runner:     +   },
@aws-cdk/integ-runner:     + ]
@aws-cdk/integ-runner:       150 |     ]));
@aws-cdk/integ-runner:       151 |
@aws-cdk/integ-runner:     > 152 |     expect(results).toEqual([]);
@aws-cdk/integ-runner:           |                     ^
@aws-cdk/integ-runner:       153 |   });
@aws-cdk/integ-runner:       154 |
@aws-cdk/integ-runner:       155 |   test('deploy failed', () => {
@aws-cdk/integ-runner:       at Object.<anonymous> (test/workers/integ-worker.test.ts:152:21)
@aws-cdk/integ-runner: PASS test/workers/snapshot-worker.test.js
@aws-cdk/integ-runner: =============================== Coverage summary ===============================
@aws-cdk/integ-runner: Statements   : 81.1% ( 571/704 )
@aws-cdk/integ-runner: Branches     : 71.94% ( 377/524 )
@aws-cdk/integ-runner: Functions    : 81.1% ( 103/127 )
@aws-cdk/integ-runner: Lines        : 81.21% ( 549/676 )
@aws-cdk/integ-runner: ================================================================================
@aws-cdk/integ-runner: Test Suites: 1 failed, 7 passed, 8 total
@aws-cdk/integ-runner: Tests:       1 failed, 63 passed, 64 total
@aws-cdk/integ-runner: Snapshots:   0 total
@aws-cdk/integ-runner: Time:        4.398 s
@aws-cdk/integ-runner: Ran all test suites.
@aws-cdk/integ-runner: Error: /codebuild/output/src371907408/src/github.com/aws/aws-cdk/node_modules/jest/bin/jest.js exited with error code 1
@aws-cdk/integ-runner: Tests failed. Total time (5.4s) | /codebuild/output/src371907408/src/github.com/aws/aws-cdk/node_modules/jest/bin/jest.js (5.4s)
@aws-cdk/integ-runner: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@aws-cdk/integ-runner: error Command failed with exit code 1.
@aws-cdk/integ-runner: info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command.
@aws-cdk/integ-runner: error Command failed with exit code 1.
@aws-cdk/integ-runner: info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command.
lerna ERR! yarn run build+test exited 1 in '@aws-cdk/integ-runner'

@misterjoshua
Copy link
Contributor Author

misterjoshua commented Aug 16, 2022

@TheRealAmazonKendra I see that in #20149 @skinny85 had the exact same error. You may have been right then that this is a transient issue. A retry may fix the problem. Can we simply run @Mergifyio update to fix it?

@TheRealAmazonKendra
Copy link
Contributor

@Mergifyio update

@mergify
Copy link
Contributor

mergify bot commented Aug 16, 2022

update

✅ Branch has been successfully updated

@TheRealAmazonKendra
Copy link
Contributor

@Mergifyio requeue

@mergify
Copy link
Contributor

mergify bot commented Aug 16, 2022

requeue

❌ This pull request head commit has not been previously disembarked from queue.

@TheRealAmazonKendra
Copy link
Contributor

We've seen a bit of this error and I'm not sure what the cause is, but it's definitely not your change so let's see if this corrects itself on update.

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: c5f075d
  • 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 Aug 16, 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).

@mergify mergify bot merged commit e48cf15 into aws:main Aug 16, 2022
@misterjoshua misterjoshua deleted the add-watch-concurrency branch August 17, 2022 03:19
Naumel added a commit that referenced this pull request Aug 18, 2022
mergify bot pushed a commit that referenced this pull request Aug 18, 2022
Naumel added a commit that referenced this pull request Aug 18, 2022
rix0rrr pushed a commit that referenced this pull request Aug 19, 2022
This PR adds #20345's `--concurrency` to `cdk watch` mode. Given that `cdk watch` is a wrapper around `deploy`, this is a simple matter of passing the `concurrency` option along.

Fixes #21597

----

### All Submissions:

* [x] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md)

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-new-unconventional-dependencies)

### New Features

* [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)?
	* [ ] 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*
mergify bot pushed a commit that referenced this pull request Aug 25, 2022
Re-rolls #20345, after it had to be reverted in #21664.

Includes the fix necessary to make sure that `--exclusively` works (#21663), and includes `cdk watch --concurrency` as well (#21598).

Closes #21663.
josephedward pushed a commit to josephedward/aws-cdk that referenced this pull request Aug 30, 2022
This PR adds aws#20345's `--concurrency` to `cdk watch` mode. Given that `cdk watch` is a wrapper around `deploy`, this is a simple matter of passing the `concurrency` option along.

Fixes aws#21597

----

### All Submissions:

* [x] Have you followed the guidelines in our [Contributing guide?](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md)

### Adding new Unconventional Dependencies:

* [ ] This PR adds new unconventional dependencies following the process described [here](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md/#adding-new-unconventional-dependencies)

### New Features

* [ ] Have you added the new feature to an [integration test](https://github.com/aws/aws-cdk/blob/main/INTEGRATION_TESTS.md)?
	* [ ] 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*
josephedward pushed a commit to josephedward/aws-cdk that referenced this pull request Aug 30, 2022
josephedward pushed a commit to josephedward/aws-cdk that referenced this pull request Aug 30, 2022
Re-rolls aws#20345, after it had to be reverted in aws#21664.

Includes the fix necessary to make sure that `--exclusively` works (aws#21663), and includes `cdk watch --concurrency` as well (aws#21598).

Closes aws#21663.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature-request A feature should be added or improved. p2 pr-linter/exempt-integ-test The PR linter will not require integ test changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

(cli): add cdk watch --concurrency N
3 participants