cli: ignore trailing / in repository server URL (#569)

Fixes #557
kopia · Aug 30, 2020 · 965160d · 965160d
1 parent 0dbaae1
commit 965160d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cli/command_repository_connect_server.go b/cli/command_repository_connect_server.go
@@ -23,7 +23,7 @@ func runConnectAPIServerCommand(ctx context.Context) error {
 	}
 
 	as := &repo.APIServerInfo{
-		BaseURL:                             *connectAPIServerURL,
+		BaseURL:                             strings.TrimSuffix(*connectAPIServerURL, "/"),
 		TrustedServerCertificateFingerprint: strings.ToLower(*connectAPIServerCertFingerprint),
 	}
 

diff --git a/tests/end_to_end_test/api_server_repository_test.go b/tests/end_to_end_test/api_server_repository_test.go
@@ -71,7 +71,7 @@ func TestAPIServerRepository(t *testing.T) {
 	defer e2.RunAndExpectSuccess(t, "repo", "disconnect")
 
 	e2.RunAndExpectSuccess(t, "repo", "connect", "server",
-		"--url", sp.baseURL,
+		"--url", sp.baseURL+"/",
 		"--server-cert-fingerprint", sp.sha256Fingerprint,
 		"--override-username", "foo",
 		"--override-hostname", "bar",