variable name change

stripe · Nov 14, 2023 · 892f9cb · 892f9cb
1 parent 413045a
commit 892f9cb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/cmd/integration_test.go b/cmd/integration_test.go
@@ -649,8 +649,8 @@ func startSmokescreen(t *testing.T, useTLS bool, logHook logrus.Hook, httpProxyA
 	}
 
 	if httpProxyAddr != ""{
-		args = append(args, fmt.Sprintf("--transport-http-proxy-addr=%s", httpProxyAddr))
-		args = append(args, fmt.Sprintf("--transport-https-proxy-addr=%s", httpProxyAddr))
+		args = append(args, fmt.Sprintf("--upstream-http-proxy-addr=%s", httpProxyAddr))
+		args = append(args, fmt.Sprintf("--upstream-https-proxy-addr=%s", httpProxyAddr))
 	}
 
 	conf, err := NewConfiguration(args, nil)

diff --git a/cmd/smokescreen.go b/cmd/smokescreen.go
@@ -147,14 +147,14 @@ func NewConfiguration(args []string, logger *log.Logger) (*smokescreen.Config, e
 			Usage: "Allow private ip ranges by default",
 		},
 		cli.StringFlag{
-			Name:  "transport-http-proxy-addr",
+			Name:  "upstream-http-proxy-addr",
 			Value: "",
-			Usage: "Set the smokescreen's HTTP transport proxy address",
+			Usage: "Set Smokescreen's upstream HTTP proxy address",
 		},
 		cli.StringFlag{
-			Name:  "transport-https-proxy-addr",
+			Name:  "upstream-https-proxy-addr",
 			Value: "",
-			Usage: "Set the smokescreen's HTTPS transport proxy address",
+			Usage: "Set Smokescreen's upstream HTTPS proxy address",
 		},
 	}
 
@@ -297,12 +297,12 @@ func NewConfiguration(args []string, logger *log.Logger) (*smokescreen.Config, e
 			}
 		}
 
-		if c.IsSet("transport-http-proxy-addr") {
-			conf.TransportHttpProxyAddr = c.String("transport-http-proxy-addr")
+		if c.IsSet("upstream-http-proxy-addr") {
+			conf.UpstreamHttpProxyAddr = c.String("upstream-http-proxy-addr")
 		}
 
-		if c.IsSet("transport-https-proxy-addr") {
-			conf.TransportHttpsProxyAddr = c.String("transport-https-proxy-addr")
+		if c.IsSet("upstream-https-proxy-addr") {
+			conf.UpstreamHttpsProxyAddr = c.String("upstream-https-proxy-addr")
 		}
 
 		// Setup the connection tracker if there is not yet one in the config

diff --git a/pkg/smokescreen/config.go b/pkg/smokescreen/config.go
@@ -73,9 +73,9 @@ type Config struct {
 	TransportMaxIdleConns        int
 	TransportMaxIdleConnsPerHost int
 
-	// There are the http and https address for the transport proxy
-	TransportHttpProxyAddr  string
-	TransportHttpsProxyAddr string
+	// These are the http and https address for the upstream proxy 
+	UpstreamHttpProxyAddr  string
+	UpstreamHttpsProxyAddr string
 
 	// Used for logging connection time
 	TimeConnect bool

diff --git a/pkg/smokescreen/smokescreen.go b/pkg/smokescreen/smokescreen.go
@@ -433,7 +433,7 @@ func newContext(cfg *Config, proxyType string, req *http.Request) *SmokescreenCo
 }
 
 func BuildProxy(config *Config) *goproxy.ProxyHttpServer {
-	proxy := goproxy.NewProxyHttpServer(goproxy.WithHttpProxyAddr(config.TransportHttpProxyAddr), goproxy.WithHttpsProxyAddr(config.TransportHttpsProxyAddr))
+	proxy := goproxy.NewProxyHttpServer(goproxy.WithHttpProxyAddr(config.UpstreamHttpProxyAddr), goproxy.WithHttpsProxyAddr(config.UpstreamHttpsProxyAddr))
 	proxy.Verbose = false
 	configureTransport(proxy.Tr, config)