unify endpoint trailing slash handling

Stephen Gutekanst · Stephen Gutekanst · commit 0c6d0973ac68 · 2018-08-02T01:09:51.000-07:00
diff --git a/cmd/src/api.go b/cmd/src/api.go
@@ -120,10 +120,7 @@ Examples:
 // gqlURL returns the URL to the GraphQL endpoint for the given Sourcegraph
 // instance.
 func gqlURL(endpoint string) string {
-	if !strings.HasSuffix(endpoint, "/") {
-		endpoint = endpoint + "/"
-	}
-	return endpoint + ".api/graphql"
+	return endpoint + "/.api/graphql"
 }
 
 // curlCmd returns the curl command to perform the given GraphQL query. Bash-only.
diff --git a/cmd/src/main.go b/cmd/src/main.go
@@ -9,6 +9,7 @@ import (
 	"os"
 	"os/user"
 	"path/filepath"
+	"strings"
 )
 
 const usageText = `src is a tool that provides access to Sourcegraph instances.
@@ -85,7 +86,7 @@ func readConfig() (*config, error) {
 		cfg.AccessToken = envToken
 	}
 	if *endpoint != "" {
-		cfg.Endpoint = *endpoint
+		cfg.Endpoint = strings.TrimSuffix(*endpoint, "/")
 	}
 	if cfg.Endpoint == "" {
 		cfg.Endpoint = "https://sourcegraph.com"

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import (`
`9`	`9`	`"os"`
`10`	`10`	`"os/user"`
`11`	`11`	`"path/filepath"`
	`12`	`+ "strings"`
`12`	`13`	`)`
`13`	`14`
`14`	`15`	const usageText = `src is a tool that provides access to Sourcegraph instances.
`@@ -85,7 +86,7 @@ func readConfig() (*config, error) {`
`85`	`86`	`cfg.AccessToken = envToken`
`86`	`87`	`}`
`87`	`88`	`if *endpoint != "" {`
`88`		`- cfg.Endpoint = *endpoint`
	`89`	`+ cfg.Endpoint = strings.TrimSuffix(*endpoint, "/")`
`89`	`90`	`}`
`90`	`91`	`if cfg.Endpoint == "" {`
`91`	`92`	`cfg.Endpoint = "https://sourcegraph.com"`