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

Use load balancer for companion in e2e tests #4228

Merged
merged 16 commits into from
Feb 2, 2023
Merged

Conversation

mifi
Copy link
Contributor

@mifi mifi commented Nov 22, 2022

also

  • fix lint warnings
  • improve lint config
  • allow customising logger name for companion (makes it easier to debug multi-instances)
  • move corsOrigins into helper
  • log startup message using logger too

Review tip: check individual commits

@mifi
Copy link
Contributor Author

mifi commented Nov 22, 2022

not sure what's the purpose of pull_request_target - seems it's always using the old code

mifi and others added 2 commits December 5, 2022 17:23
Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
doesn't seem to work on node 14
@Murderlon
Copy link
Member

Ideally, we make changes to e2e.yml in a separate PR so we can see the tests actually passing in this PR.

@aduh95
Copy link
Member

aduh95 commented Dec 5, 2022

Ideally, we make changes to e2e.yml in a separate PR so we can see the tests actually passing in this PR.

That's not necessary, we just need to check the result of End-to-end tests / Browser tests (pull_request) (it's the 4th in the list for me) in this PR. The pull_request_target one can be ignored if the other one is green.

what's the purpose of pull_request_target

It's to allow us to test PRs from forks without exposing the repo secrets – it has to run on the old code to avoid a malicious actor leaking those secrets by opening a PR.

@Murderlon
Copy link
Member

Good point, the other one is indeed successful

@mifi mifi requested a review from aduh95 December 12, 2022 13:01
@Murderlon
Copy link
Member

Is this ready to merge?

@mifi
Copy link
Contributor Author

mifi commented Jan 5, 2023

No objections to merging

Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
@aduh95 aduh95 merged commit e966fa7 into main Feb 2, 2023
@aduh95 aduh95 deleted the companion-e2e-load-balancer branch February 2, 2023 10:25
@github-actions github-actions bot mentioned this pull request Feb 13, 2023
github-actions bot added a commit that referenced this pull request Feb 13, 2023
| Package              | Version | Package              | Version |
| -------------------- | ------- | -------------------- | ------- |
| @uppy/audio          |   1.0.4 | @uppy/screen-capture |   3.0.2 |
| @uppy/companion      |   4.3.0 | @uppy/transloadit    |   3.1.1 |
| @uppy/core           |   3.0.6 | @uppy/xhr-upload     |   3.1.0 |
| @uppy/dashboard      |   3.2.2 | uppy                 |   3.5.0 |
| @uppy/locales        |   3.0.6 |                      |         |

- @uppy/transloadit: fix `assemblyOptions` option (Antoine du Hamel / #4316)
- meta: Remove Robodog advice, since it is deprecated (Artur Paikin)
- @uppy/dashboard: fix dashboard acquirers list (Mikael Finstad / #4306)
- @uppy/dashboard: Dashboard: disallow clicking on buttons and links in Dashboard disabled mode (Artur Paikin / #4292)
- @uppy/audio,@uppy/core,@uppy/dashboard,@uppy/screen-capture: Warn more instead of erroring (Artur Paikin / #4302)
- @uppy/locales: Update de_DE.js (Jörn Velten / #4297)
- meta: use load balancer for companion in e2e tests (Mikael Finstad / #4228)
- @uppy/companion: @uppy/companion upgrade grant dependency (Scott Bessler / #4286)
- @uppy/xhr-upload: add `'upload-stalled'` event (Antoine du Hamel / #4247)
- @uppy/locales: minor enhancements and typo fixes for the hungarian translation (KergeKacsa / #4282)
HeavenFox pushed a commit to docsend/uppy that referenced this pull request Jun 27, 2023
HeavenFox pushed a commit to docsend/uppy that referenced this pull request Jun 27, 2023
| Package              | Version | Package              | Version |
| -------------------- | ------- | -------------------- | ------- |
| @uppy/audio          |   1.0.4 | @uppy/screen-capture |   3.0.2 |
| @uppy/companion      |   4.3.0 | @uppy/transloadit    |   3.1.1 |
| @uppy/core           |   3.0.6 | @uppy/xhr-upload     |   3.1.0 |
| @uppy/dashboard      |   3.2.2 | uppy                 |   3.5.0 |
| @uppy/locales        |   3.0.6 |                      |         |

- @uppy/transloadit: fix `assemblyOptions` option (Antoine du Hamel / transloadit#4316)
- meta: Remove Robodog advice, since it is deprecated (Artur Paikin)
- @uppy/dashboard: fix dashboard acquirers list (Mikael Finstad / transloadit#4306)
- @uppy/dashboard: Dashboard: disallow clicking on buttons and links in Dashboard disabled mode (Artur Paikin / transloadit#4292)
- @uppy/audio,@uppy/core,@uppy/dashboard,@uppy/screen-capture: Warn more instead of erroring (Artur Paikin / transloadit#4302)
- @uppy/locales: Update de_DE.js (Jörn Velten / transloadit#4297)
- meta: use load balancer for companion in e2e tests (Mikael Finstad / transloadit#4228)
- @uppy/companion: @uppy/companion upgrade grant dependency (Scott Bessler / transloadit#4286)
- @uppy/xhr-upload: add `'upload-stalled'` event (Antoine du Hamel / transloadit#4247)
- @uppy/locales: minor enhancements and typo fixes for the hungarian translation (KergeKacsa / transloadit#4282)
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.

None yet

3 participants