Map cluster-wide proxy env variable for compatibility with Vector expectations

Signed-off-by: Vitalii Parfonov <[email protected]>

Author: vparfonov

internal/collector/vector/run_script.go

@@ -11,6 +11,22 @@ VECTOR_DATA_DIR=%s
 echo "Creating the directory used for persisting Vector state $VECTOR_DATA_DIR"
 mkdir -p ${VECTOR_DATA_DIR}
 
+# Remap lowercase to uppercase if it's set
+if [ -z "${HTTP_PROXY:-}" ] && [ -n "${http_proxy:-}" ]; then
+  export HTTP_PROXY="$http_proxy"
+  echo "Setting HTTP_PROXY=${HTTP_PROXY}"
+fi
+if [ -z "${HTTPS_PROXY:-}" ] && [ -n "${https_proxy:-}" ]; then
+  export HTTPS_PROXY="$https_proxy"
+  echo "Setting HTTPS_PROXY=${HTTPS_PROXY}"
+fi
+if [ -z "${NO_PROXY:-}" ] && [ -n "${no_proxy:-}" ]; then
+  export NO_PROXY="$no_proxy"
+  echo "Setting NO_PROXY=${NO_PROXY}" 
+fi
+
+
+
 echo "Checking for buffer lock files"
 # Vector does not appear to release locks when the process terminates. Try to clean up for restart
 pushd ${VECTOR_DATA_DIR}

test/functional/misc/vector_api_cli_test.go

@@ -1,12 +1,11 @@
-//go:build !fluentd
-
 package misc
 
 import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	logging "github.com/openshift/cluster-logging-operator/api/logging/v1"
 	"github.com/openshift/cluster-logging-operator/internal/constants"
+	"github.com/openshift/cluster-logging-operator/internal/runtime"
 	"github.com/openshift/cluster-logging-operator/test/framework/functional"
 	testfw "github.com/openshift/cluster-logging-operator/test/functional"
 )
@@ -36,5 +35,19 @@ var _ = Describe("[Functional][Misc][API_CLI] Functional test", func() {
 			out, _ := framework.RunCommand(constants.CollectorName, `curl`, `-sv`, `-m`, `5`, `--connect-timeout`, `3`, `http://127.0.0.1:8686/health`)
 			Expect(out).To(ContainSubstring(`{"ok":true}`))
 		})
+		It("should remap Proxy env variable from lowercase to uppercase if it's set", func() {
+			envVisitor := func(b *runtime.PodBuilder) error {
+				b.GetContainer(constants.CollectorName).AddEnvVar("http_proxy", "http://my_proxy:8080")
+				b.GetContainer(constants.CollectorName).AddEnvVar("https_proxy", "https://my_proxy:9090")
+				b.GetContainer(constants.CollectorName).AddEnvVar("no_proxy", "my-host,your-host")
+				return nil
+			}
+			Expect(framework.DeployWithVisitor(envVisitor)).To(BeNil())
+			out, err := framework.ReadCollectorLogs()
+			Expect(err).To(BeNil())
+			Expect(out).To(ContainSubstring(`Setting HTTP_PROXY=http://my_proxy:8080`))
+			Expect(out).To(ContainSubstring(`Setting HTTPS_PROXY=https://my_proxy:9090`))
+			Expect(out).To(ContainSubstring(`Setting NO_PROXY=my-host,your-host`))
+		})
 	})
 })