Fixes after rebase

internal/config/base.go

@@ -70,7 +70,7 @@ func (c *baseCfg) ServicePort() string {
 }
 
 // StripPrefix returns the prefix to strip. Empty string if no prefix.
-func (c *cfg) StripPrefix() string {
+func (c *baseCfg) StripPrefix() string {
 	return c.stripPrefix
 }
 

internal/config/executionspace.go

@@ -25,7 +25,6 @@ import (
 
 type ExecutionSpaceConfig interface {
 	Config
-	StripPrefix() string
 	Hostname() string
 	Timeout() time.Duration
 	ExecutionSpaceWaitTimeout() time.Duration
@@ -60,7 +59,6 @@ func NewExecutionSpaceConfig() ExecutionSpaceConfig {
 		logrus.Panic(err)
 	}
 
-	flag.StringVar(&conf.stripPrefix, "stripprefix", EnvOrDefault("STRIP_PREFIX", ""), "Strip prefix")
 	flag.StringVar(&conf.hostname, "hostname", EnvOrDefault("PROVIDER_HOSTNAME", "http://localhost"), "Host to supply to ESR for starting executors")
 	flag.DurationVar(&conf.timeout, "timeout", defaultTimeout, "Maximum timeout for requests to Execution space provider Service.")
 	flag.DurationVar(&conf.executionSpaceWaitTimeout, "executionSpaceWaitTimeout", executionSpaceWaitTimeout, "Timeout duration to wait when trying to checkout execution space(s)")
@@ -74,11 +72,6 @@ func NewExecutionSpaceConfig() ExecutionSpaceConfig {
 	return &conf
 }
 
-// StripPrefix returns a prefix that is supposed to be stripped from URL.
-func (c *executionSpaceCfg) StripPrefix() string {
-	return c.stripPrefix
-}
-
 // Hostname returns the hostname to use for executors.
 func (c *executionSpaceCfg) Hostname() string {
 	return c.hostname