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: websockets for terminal not working on subPath #9795

Merged

Conversation

TomHellier
Copy link
Contributor

@TomHellier TomHellier commented Jun 27, 2022

Fixes #9780

The new Terminal feature on argocd doesn't support running on a subpath. I run argocd across many clusters on an /argocd/ subpath.

This PR adds the ability for the typescript to render the websocket url correctly, whether the subpath is /argocd or /argocd/, as websockets are not very forgiving with multiple /s in a url.

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).

@TomHellier TomHellier force-pushed the 9780-websocks-dont-work-on-subpath branch from b7a001e to 75da2af Compare June 27, 2022 14:04
@TomHellier TomHellier marked this pull request as draft June 27, 2022 14:18
@TomHellier TomHellier force-pushed the 9780-websocks-dont-work-on-subpath branch from 75da2af to deb9309 Compare June 27, 2022 14:38
Signed-off-by: Tom Hellier <me@tomhellier.com>
@TomHellier TomHellier force-pushed the 9780-websocks-dont-work-on-subpath branch from deb9309 to 380ad88 Compare June 27, 2022 14:44
@TomHellier TomHellier marked this pull request as ready for review June 27, 2022 14:49
@codecov
Copy link

codecov bot commented Jun 27, 2022

Codecov Report

Merging #9795 (380ad88) into master (a041bf8) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #9795   +/-   ##
=======================================
  Coverage   45.79%   45.79%           
=======================================
  Files         227      227           
  Lines       26920    26920           
=======================================
  Hits        12327    12327           
  Misses      12911    12911           
  Partials     1682     1682           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a041bf8...380ad88. Read the comment docs.

Copy link
Collaborator

@alexmt alexmt left a comment

Choose a reason for hiding this comment

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

Thank you!

@alexmt alexmt merged commit 0d0d5fc into argoproj:master Jun 27, 2022
@crenshaw-dev crenshaw-dev added the cherry-pick/2.4 Candidate for cherry picking into the 2.4 release branch label Jun 27, 2022
@TomHellier TomHellier deleted the 9780-websocks-dont-work-on-subpath branch June 27, 2022 19:24
alexmt pushed a commit that referenced this pull request Jun 27, 2022
Signed-off-by: Tom Hellier <me@tomhellier.com>
@crenshaw-dev
Copy link
Collaborator

Fix was released with 2.4.3.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick/2.4 Candidate for cherry picking into the 2.4 release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

web terminal url not with rootpath, api use / not rootpath
3 participants