Fix tests broken by url parse

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.4.31
+* Fix: URL parsing of Splunk client path
+
 ## 1.4.30
 * Suppress defaults when planning changes to Jira service desk params
 

splunk/provider.go

@@ -113,12 +113,15 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
-
-	u, err := url.Parse(d.Get("url").(string))
+	// Ensure scheme to parse host and path
+	providerUrl := d.Get("url").(string)
+	if !hasScheme(providerUrl) {
+		providerUrl = "http://" + providerUrl // add http scheme so url.Parse works
+	}
+	u, err := url.Parse(providerUrl)
 	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)},
@@ -147,3 +150,9 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	provider.Client = splunkdClient
 	return provider, nil
 }
+
+// hasScheme checks if a string has an "://"
+func hasScheme(providerUrl string) bool {
+	parsed, err := url.Parse(providerUrl)
+	return err == nil && parsed.Scheme != "" && parsed.Host != ""
+}

splunk/provider_test.go

@@ -1,6 +1,7 @@
 package splunk
 
 import (
+	"net/url"
 	"os"
 	"testing"
 	"time"
@@ -31,11 +32,22 @@ func newTestClient() (*client.Client, error) {
 	if err != nil {
 		return nil, err
 	}
+	// Parse splunk url host
+	SPLUNK_URL := (os.Getenv("SPLUNK_URL"))
+	if !hasScheme(SPLUNK_URL) {
+		SPLUNK_URL = "http://" + SPLUNK_URL // add http scheme so url.Parse works
+	}
+	u, err := url.Parse(SPLUNK_URL)
+	if err != nil {
+		return nil, err
+	}
+	host := u.Host
+
 	return client.NewSplunkdClient(
 		"",
 		[2]string{os.Getenv("SPLUNK_USERNAME"),
 			os.Getenv("SPLUNK_PASSWORD")},
-		os.Getenv("SPLUNK_URL"),
+		host,
 		"",
 		http)
 }