Merge pull request #90 from harness/make-proxy-port-configurable

(FFM-5131) Make proxy port configurable

Author: conormurray95

cmd/ff-proxy/main.go

@@ -79,10 +79,6 @@ func (i *keys) Set(value string) error {
 	return nil
 }
 
-const (
-	port = 8000
-)
-
 var (
 	debug                 bool
 	bypassAuth            bool
@@ -110,6 +106,7 @@ var (
 	flagStreamEnabled     bool
 	generateOfflineConfig bool
 	configDir             string
+	port                  int
 )
 
 const (
@@ -137,6 +134,7 @@ const (
 	generateOfflineConfigEnv = "GENERATE_OFFLINE_CONFIG"
 	configDirEnv             = "CONFIG_DIR"
 	pprofEnabledEnv          = "PPROF"
+	portEnv                  = "PORT"
 
 	bypassAuthFlag            = "bypass-auth"
 	debugFlag                 = "debug"
@@ -162,6 +160,7 @@ const (
 	generateOfflineConfigFlag = "generate-offline-config"
 	configDirFlag             = "config-dir"
 	flagPollIntervalFlag      = "flag-poll-interval"
+	portFlag                  = "port"
 )
 
 func init() {
@@ -190,6 +189,7 @@ func init() {
 	flag.BoolVar(&flagStreamEnabled, flagStreamEnabledFlag, true, "should the proxy connect to Harness in streaming mode to get flag changes")
 	flag.BoolVar(&generateOfflineConfig, generateOfflineConfigFlag, false, "if true the proxy will produce offline config in the /config directory then terminate")
 	flag.StringVar(&configDir, configDirFlag, "/config", "specify a custom path to search for the offline config directory. Defaults to /config")
+	flag.IntVar(&port, portFlag, 8000, "port the relay proxy service is exposed on, default's to 8000")
 	sdkClients = newSDKClientMap()
 
 	loadFlagsFromEnv(map[string]string{
@@ -217,6 +217,7 @@ func init() {
 		generateOfflineConfigEnv: generateOfflineConfigFlag,
 		configDirEnv:             configDirFlag,
 		flagPollIntervalEnv:      flagPollIntervalFlag,
+		portEnv:                  portFlag,
 	})
 
 	flag.Parse()

docker-compose.yml

@@ -20,6 +20,7 @@ services:
       - API_KEYS=${API_KEYS}
       - TARGET_POLL_DURATION=${TARGET_POLL_DURATION}
       - GENERATE_OFFLINE_CONFIG=${GENERATE_OFFLINE_CONFIG}
+      - PORT=${PORT}
     build:
       context: ./
       dockerfile: ./Dockerfile

docker-entrypoint.sh

@@ -31,4 +31,16 @@ if [ -v target ]; then
 	echo "* ${target},over_http" > /etc/pushpin/routes
 fi
 
+# Update routes file to use $PORT if set
+if [ -w /etc/pushpin/routes ]; then
+  if [ -n "${PORT}" ]; then
+    echo "Setting internal relay proxy port to ${PORT}"
+    sed -i \
+		-e "s/8000/${PORT}/g" \
+		/etc/pushpin/routes
+  fi
+else
+	echo "docker-entrypoint.sh: unable to write to /etc/pushpin/routes, readonly"
+fi
+
 exec "$@"

tests/e2e/testhelpers/setup/main.go

@@ -36,7 +36,8 @@ ORG_IDENTIFIER=%s
 ADMIN_SERVICE_TOKEN=%s
 API_KEYS=%s
 AUTH_SECRET=my_secret
-REDIS_ADDRESS=redis:6379`
+REDIS_ADDRESS=redis:6379
+PORT=9000`
 
 var generateOfflineConfigTemplate = `ACCOUNT_IDENTIFIER=%s
 ORG_IDENTIFIER=%s