config: Ensure address has trailing slash

jsok · Aug 10, 2019 · 626cb8e · 626cb8e
1 parent 3d38341
commit 626cb8e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/path_config.go b/path_config.go
@@ -3,6 +3,7 @@ package artifactory
 import (
 	"context"
 	"fmt"
+	"strings"
 
 	"github.com/hashicorp/vault/sdk/framework"
 	"github.com/hashicorp/vault/sdk/logical"
@@ -86,6 +87,9 @@ func (b *backend) pathConfigWrite(ctx context.Context, req *logical.Request, dat
 	if config.Address == "" {
 		return logical.ErrorResponse("address must be set"), nil
 	}
+	if !strings.HasSuffix(config.Address, "/") {
+		config.Address = config.Address + "/"
+	}
 	if config.ApiKey != "" && config.Username != "" {
 		return logical.ErrorResponse("provide either api_key or username, not both"), nil
 	}

diff --git a/path_config_test.go b/path_config_test.go
@@ -83,7 +83,7 @@ func TestConfig_WriteIdempotent(t *testing.T) {
 	b, storage := newBackend(t)
 
 	data := map[string]interface{}{
-		"address": "https://example.com/artifactory",
+		"address": "https://example.com/artifactory/",
 		"api_key": "abc123",
 	}