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 backend/s3: Adds https_proxy and no_proxy parameters into v1.6 #34247

Merged
merged 2 commits into from
Nov 15, 2023

Conversation

teamterraform
Copy link
Contributor

Backport

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

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


Adds parameters https_proxy and no_proxy to correctly configure proxies.

Fixes #33987
Fixes #34183

Target Release

1.6.4

Draft CHANGELOG entry

BUG FIXES

  • backend/s3: Adds https_proxy and no_proxy parameters to allow fully specifying proxy configuration

Overview of commits

@teamterraform teamterraform requested a review from a team as a code owner November 15, 2023 15:08
@teamterraform teamterraform force-pushed the backport/s3/b-proxy-settings/roughly-central-guinea branch from 2e66a3d to a7faf38 Compare November 15, 2023 15:08
@teamterraform teamterraform force-pushed the backport/s3/b-proxy-settings/roughly-central-guinea branch from 0a27a04 to fe2ce3d Compare November 15, 2023 15:08
Copy link
Member

@jar-b jar-b left a comment

Choose a reason for hiding this comment

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

LGTM 👍

% TF_ACC=1 go test -count=1 ./internal/backend/remote-state/s3/...
ok      github.com/hashicorp/terraform/internal/backend/remote-state/s3 146.945s

@kmoe kmoe merged commit 54465e1 into v1.6 Nov 15, 2023
6 checks passed
Copy link
Contributor

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

@jar-b jar-b deleted the backport/s3/b-proxy-settings/roughly-central-guinea branch November 15, 2023 15:57
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 Dec 16, 2023
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.

4 participants