Use serverUID for web scp target #23124
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Revert unneeded hostname change Remove comment Get name
|
Changing the |
kimlisa
approved these changes
Mar 15, 2023
lib/web/files.go
Outdated
| @@ -106,7 +106,7 @@ func (f *fileTransfer) download(req fileTransferRequest, httpReq *http.Request, | |||
| return trace.Wrap(err) | |||
| } | |||
|
|
|||
| err = tc.ExecuteSCP(httpReq.Context(), cmd) | |||
| err = tc.ExecuteSCP(httpReq.Context(), req.server, cmd) | |||
There was a problem hiding this comment.
if not too much trouble, can we rename server to serverID?
There was a problem hiding this comment.
No trouble at all! Fixed. much more clear this way.
zmb3
reviewed
Mar 15, 2023
| nodeClient, err := tc.ConnectToNode( | ||
| ctx, | ||
| proxyClient, | ||
| NodeDetails{Addr: nodeAddrs[0], Namespace: tc.Namespace, Cluster: tc.SiteName}, | ||
| NodeDetails{Addr: serverAddr + ":0", Namespace: tc.Namespace, Cluster: tc.SiteName}, |
There was a problem hiding this comment.
Yeah I'm not sure what the :0 is or why it's necessary. Once you figure it out, a comment is probably warranted.
zmb3
reviewed
Mar 15, 2023
zmb3
approved these changes
Mar 15, 2023
avatus
added a commit
that referenced
this pull request
Mar 15, 2023
* Use serverUID for scp target Revert unneeded hostname change Remove comment Get name * Change name to serverId * Fix lint errors * Add comment * Fix comment and signature format
avatus
added a commit
that referenced
this pull request
Mar 15, 2023
* Use serverUID for scp target Revert unneeded hostname change Remove comment Get name * Change name to serverId * Fix lint errors * Add comment * Fix comment and signature format
avatus
added a commit
that referenced
this pull request
Mar 16, 2023
avatus
added a commit
that referenced
this pull request
Mar 16, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #22507
To fix this, I pass the unique server id present in the http request rather than a node name. A similar fix for Connect exists here