Fix URL parsing (#148)

Author: vvbogdanov87

client/client.go

@@ -41,6 +41,7 @@ type Client struct {
 	sessionKey string
 	auth       [2]string
 	host       string
+	path       string
 	httpClient *http.Client
 	userAgent  string
 	urlEncoded bool
@@ -77,7 +78,7 @@ func getEnv(key, defaultValue string) string {
 }
 
 func (c *Client) BuildSplunkURL(queryValues url.Values, urlPathParts ...string) url.URL {
-	buildPath := ""
+	buildPath := c.path
 	for _, pathPart := range urlPathParts {
 		pathPart = strings.ReplaceAll(pathPart, " ", "+") // url parameters cannot have spaces
 		buildPath = path.Join(buildPath, pathPart)
@@ -277,13 +278,14 @@ func NewDefaultSplunkdClient() (*Client, error) {
 }
 
 // NewSplunkdClient creates a Client with custom values passed in
-func NewSplunkdClient(sessionKey string, auth [2]string, host string, httpClient *http.Client) (*Client, error) {
+func NewSplunkdClient(sessionKey string, auth [2]string, host string, path string, httpClient *http.Client) (*Client, error) {
 	c, err := NewDefaultSplunkdClient()
 	if err != nil {
 		return nil, err
 	}
 	c.auth = auth
 	c.host = host
+	c.path = path
 	c.sessionKey = sessionKey
 	if httpClient != nil {
 		c.httpClient = httpClient
@@ -292,13 +294,14 @@ func NewSplunkdClient(sessionKey string, auth [2]string, host string, httpClient
 }
 
 // NewSplunkdClient creates a Client with custom values passed in
-func NewSplunkdClientWithAuthToken(authToken string, auth [2]string, host string, httpClient *http.Client) (*Client, error) {
+func NewSplunkdClientWithAuthToken(authToken string, auth [2]string, host string, path string, httpClient *http.Client) (*Client, error) {
 	c, err := NewDefaultSplunkdClient()
 	if err != nil {
 		return nil, err
 	}
 	c.auth = auth
 	c.host = host
+	c.path = path
 	c.authToken = authToken
 	if httpClient != nil {
 		c.httpClient = httpClient

splunk/provider.go

@@ -1,6 +1,7 @@
 package splunk
 
 import (
+	"net/url"
 	"time"
 
 	"github.com/splunk/terraform-provider-splunk/client"
@@ -113,18 +114,25 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 		return nil, err
 	}
 
+	u, err := url.Parse(d.Get("url").(string))
+	if err != nil {
+		return nil, err
+	}
+
 	if token, ok := d.GetOk("auth_token"); ok {
 		splunkdClient, err = client.NewSplunkdClientWithAuthToken(token.(string),
 			[2]string{d.Get("username").(string), d.Get("password").(string)},
-			d.Get("url").(string),
+			u.Host,
+			u.Path,
 			httpClient)
 		if err != nil {
 			return splunkdClient, err
 		}
 	} else {
 		splunkdClient, err = client.NewSplunkdClient("",
 			[2]string{d.Get("username").(string), d.Get("password").(string)},
-			d.Get("url").(string),
+			u.Host,
+			u.Path,
 			httpClient)
 		if err != nil {
 			return splunkdClient, err

splunk/provider_test.go

@@ -36,7 +36,7 @@ func newTestClient() (*client.Client, error) {
 		[2]string{os.Getenv("SPLUNK_USERNAME"),
 			os.Getenv("SPLUNK_PASSWORD")},
 		os.Getenv("SPLUNK_URL"),
-
+		"",
 		http)
 }