packages/opentofu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backport: support lower-case http/https_proxy env variables in S3 backend

Browse Source 
(cherry picked from commit ad4e9c485301105e2e8a5baef2f93a9efdee7b2c)
This commit is contained in:
jianli-97 2025-04-10 13:36:58 +08:00 committed by openeuler-sync-bot
parent e10189f371
commit 7e814be2ef
2 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
0001-backport-support-lower-case-http_proxy-or-https_proxy-env-variables-in-S3-backend.patch Normal file
View File

@ -0,0 +1,60 @@
From 547e2c2e8f2c9c5a3fe90a583876dad07f967e0c Mon Sep 17 00:00:00 2001
From: Janos <86970079+janosdebugs@users.noreply.github.com>
Date: Mon, 24 Jun 2024 13:24:12 +0200
Subject: [PATCH] [Backports/1.6] Support lower-case http/https_proxy env
variables in S3 backend (#1742)
Signed-off-by: Janos <86970079+janosdebugs@users.noreply.github.com>
---
CHANGELOG.md | 2 ++
internal/backend/remote-state/s3/backend.go | 17 ++++++++++++++---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac11d9cea29..c260fcb4ee0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ ENHANCEMENTS:
BUG FIXES:
+* Fix bug where lower-case `http_proxy`/`https_proxy` env variables were no longer supported in the S3 backend ([#1594](https://github.com/opentofu/opentofu/issues/1594))
+
## 1.6.2
ENHANCEMENTS:
diff --git a/internal/backend/remote-state/s3/backend.go b/internal/backend/remote-state/s3/backend.go
index 8201baf72a7..35b5717ff23 100644
--- a/internal/backend/remote-state/s3/backend.go
+++ b/internal/backend/remote-state/s3/backend.go
@@ -732,9 +732,10 @@ func (b *Backend) Configure(obj cty.Value) tfdiags.Diagnostics {
// Note: we don't need to read env variables explicitly because they are read implicitly by aws-sdk-base-go:
// see: https://github.com/hashicorp/aws-sdk-go-base/blob/v2.0.0-beta.41/internal/config/config.go#L133
// which relies on: https://cs.opensource.google/go/x/net/+/refs/tags/v0.18.0:http/httpproxy/proxy.go;l=89-96
- HTTPProxy: aws.String(stringAttrDefaultEnvVar(obj, "http_proxy", "HTTP_PROXY")),
- HTTPSProxy: aws.String(stringAttrDefaultEnvVar(obj, "https_proxy", "HTTPS_PROXY")),
- NoProxy: stringAttrDefaultEnvVar(obj, "no_proxy", "NO_PROXY"),
+ //
+ // Note: we are switching to "separate" mode here since the legacy mode is deprecated and should no longer be
+ // used.
+ HTTPProxyMode: awsbase.HTTPProxyModeSeparate,
Insecure: boolAttr(obj, "insecure"),
UseDualStackEndpoint: boolAttr(obj, "use_dualstack_endpoint"),
UseFIPSEndpoint: boolAttr(obj, "use_fips_endpoint"),
@@ -754,6 +755,16 @@ func (b *Backend) Configure(obj cty.Value) tfdiags.Diagnostics {
cfg.UseLegacyWorkflow = true
}
+ if val, ok := stringAttrOk(obj, "http_proxy"); ok {
+ cfg.HTTPProxy = &val
+ }
+ if val, ok := stringAttrOk(obj, "https_proxy"); ok {
+ cfg.HTTPSProxy = &val
+ }
+ if val, ok := stringAttrOk(obj, "no_proxy"); ok {
+ cfg.NoProxy = val
+ }
+
if val, ok := boolAttrOk(obj, "skip_metadata_api_check"); ok {
if val {
cfg.EC2MetadataServiceEnableState = imds.ClientDisabled

6
opentofu.spec
View File

@ -2,12 +2,13 @@
Name: opentofu
Version: 1.6.2
Release: 1
Release: 2
Summary: OpenTofu lets you declaratively manage your cloud infrastructure
License: 0BSD AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND MIT AND MPL-2.0
URL: https://github.com/opentofu/opentofu
Source0: https://github.com/opentofu/opentofu/archive/refs/tags/v%{version}.tar.gz
Source1: %{name}-%{version}-vendor.tar.gz
Patch0001: 0001-backport-support-lower-case-http_proxy-or-https_proxy-env-variables-in-S3-backend.patch
BuildRequires: golang >= 1.20
@ -43,5 +44,8 @@ done
%{_bindir}/tofu
%changelog
* Thu Apr 10 2025 lijian <lijian2@kylinos.cn> - 1.6.2-2
- Backport: support lower-case http/https_proxy env variables in S3 backend
* Tue Mar 05 2024 lijian <lijian2@kylinos.cn> - 1.6.2-1
- Initial package