Use consts for http proxy

Signed-off-by: hmsayem <[email protected]>
kubestash · Jan 1, 2024 · d1cfb2c · d1cfb2c
1 parent f5312de
commit d1cfb2c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/pkg/constants.go b/pkg/constants.go
@@ -33,6 +33,8 @@ const (
 	ResticRegistry = "restic"
 	ResticImage    = "restic"
 	ResticTag      = "0.16.0"
+	EnvHttpProxy   = "HTTP_PROXY"
+	EnvHttpsProxy  = "HTTPS_PROXY"
 )
 
 // Constants for debugging

diff --git a/pkg/download.go b/pkg/download.go
@@ -295,8 +295,8 @@ func (opt *downloadOptions) runRestoreViaDocker(destination string, args []strin
 		"-u", currentUser.Uid,
 		"-v", ScratchDir + ":" + ScratchDir,
 		"-v", opt.destinationDir + ":" + DestinationDir,
-		"--env", "HTTP_PROXY=" + os.Getenv("HTTP_PROXY"),
-		"--env", "HTTPS_PROXY=" + os.Getenv("HTTPS_PROXY"),
+		"--env", fmt.Sprintf("%s=", EnvHttpProxy) + os.Getenv(EnvHttpProxy),
+		"--env", fmt.Sprintf("%s=", EnvHttpsProxy) + os.Getenv(EnvHttpsProxy),
 		"--env-file", filepath.Join(ConfigDir, ResticEnvs),
 		imgRestic.ToContainerImage(),
 	}

diff --git a/pkg/key.go b/pkg/key.go
@@ -139,8 +139,8 @@ func (opt *keyOptions) runCmdViaDocker(args []string) error {
 		"--rm",
 		"-u", currentUser.Uid,
 		"-v", ScratchDir + ":" + ScratchDir,
-		"--env", "HTTP_PROXY=" + os.Getenv("HTTP_PROXY"),
-		"--env", "HTTPS_PROXY=" + os.Getenv("HTTPS_PROXY"),
+		"--env", fmt.Sprintf("%s=", EnvHttpProxy) + os.Getenv(EnvHttpProxy),
+		"--env", fmt.Sprintf("%s=", EnvHttpsProxy) + os.Getenv(EnvHttpsProxy),
 		"--env-file", filepath.Join(ConfigDir, ResticEnvs),
 	}
 

diff --git a/pkg/unlock.go b/pkg/unlock.go
@@ -208,8 +208,8 @@ func (opt *unlockOptions) runCmdViaDocker(args []string) error {
 		"--rm",
 		"-u", currentUser.Uid,
 		"-v", ScratchDir + ":" + ScratchDir,
-		"--env", "HTTP_PROXY=" + os.Getenv("HTTP_PROXY"),
-		"--env", "HTTPS_PROXY=" + os.Getenv("HTTPS_PROXY"),
+		"--env", fmt.Sprintf("%s=", EnvHttpProxy) + os.Getenv(EnvHttpProxy),
+		"--env", fmt.Sprintf("%s=", EnvHttpsProxy) + os.Getenv(EnvHttpsProxy),
 		"--env-file", filepath.Join(ConfigDir, ResticEnvs),
 		imgRestic.ToContainerImage(),
 	}