Remove trailing slash from SRC_ENDPOINT (#167)

mrnugget · web-flow · commit da0ce74dd9fd · 2020-03-30T17:13:38.000+02:00
diff --git a/cmd/src/main.go b/cmd/src/main.go
@@ -95,7 +95,7 @@ func readConfig() (*config, error) {
 		cfg.AccessToken = envToken
 	}
 	if *endpoint != "" {
-		cfg.Endpoint = strings.TrimSuffix(*endpoint, "/")
+		cfg.Endpoint = *endpoint
 	}
 	if cfg.Endpoint == "" {
 		if endpoint := os.Getenv("SRC_ENDPOINT"); endpoint != "" {
@@ -105,5 +105,8 @@ func readConfig() (*config, error) {
 	if cfg.Endpoint == "" {
 		cfg.Endpoint = "https://sourcegraph.com"
 	}
+
+	cfg.Endpoint = strings.TrimSuffix(cfg.Endpoint, "/")
+
 	return &cfg, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ func readConfig() (*config, error) {`
`95`	`95`	`cfg.AccessToken = envToken`
`96`	`96`	`}`
`97`	`97`	`if *endpoint != "" {`
`98`		`- cfg.Endpoint = strings.TrimSuffix(*endpoint, "/")`
	`98`	`+ cfg.Endpoint = *endpoint`
`99`	`99`	`}`
`100`	`100`	`if cfg.Endpoint == "" {`
`101`	`101`	`if endpoint := os.Getenv("SRC_ENDPOINT"); endpoint != "" {`
`@@ -105,5 +105,8 @@ func readConfig() (*config, error) {`
`105`	`105`	`if cfg.Endpoint == "" {`
`106`	`106`	`cfg.Endpoint = "https://sourcegraph.com"`
`107`	`107`	`}`
	`108`	`+`
	`109`	`+ cfg.Endpoint = strings.TrimSuffix(cfg.Endpoint, "/")`
	`110`	`+`
`108`	`111`	`return &cfg, nil`
`109`	`112`	`}`