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

Backport of Document support for ssh over SOCKS5 into v1.7 #34738

Merged
merged 1 commit into from
Feb 27, 2024

Conversation

teamterraform
Copy link
Contributor

Backport

This PR is auto-generated from #33969 to be assessed for backporting due to the inclusion of the label 1.7-backport.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@crw
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: unable to process merge commit: "d04e5a09156eb18b75bf6ec0835ed1c1609d6c79", automatic backport requires rebase workflow

The below text is copied from the body of the original PR.


Fixes #17754, surprisingly.

golang.org/x/net/proxy.FromURL (which Terraform uses to add support for HTTP and HTTPS) supports socks5 out of the box:

https://cs.opensource.google/go/x/net/+/refs/tags/v0.15.0:proxy/proxy.go;l=91


Overview of commits

@crw crw marked this pull request as ready for review February 27, 2024 21:13
@crw crw merged commit d2c8b31 into v1.7 Feb 27, 2024
6 checks passed
@crw crw deleted the backport/document-socks5-support/basically-open-jaguar branch February 27, 2024 21:13
Copy link
Contributor

Reminder for the merging maintainer: if this is a user-visible change, please update the changelog on the appropriate release branch.

Copy link
Contributor

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 29, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants