add api version header to api requests from the cli (#244)

contrib/pkg/client/bind.go

@@ -1,7 +1,6 @@
 package client
 
 import (
-	"bytes"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -33,16 +32,9 @@ func Bind(
 	if err != nil {
 		return "", nil, fmt.Errorf("error encoding request body: %s", err)
 	}
-	req, err := http.NewRequest(
-		http.MethodPut,
-		url,
-		bytes.NewBuffer(json),
-	)
+	req, err := newRequest(http.MethodPut, url, username, password, json)
 	if err != nil {
-		return "", nil, fmt.Errorf("error building request: %s", err)
-	}
-	if username != "" || password != "" {
-		addAuthHeader(req, username, password)
+		return "", nil, err
 	}
 	httpClient := &http.Client{}
 	resp, err := httpClient.Do(req)

contrib/pkg/client/catalog.go

@@ -17,12 +17,9 @@ func GetCatalog(
 	password string,
 ) (service.Catalog, error) {
 	url := fmt.Sprintf("%s/v2/catalog", getBaseURL(host, port))
-	req, err := http.NewRequest(http.MethodGet, url, nil)
+	req, err := newRequest(http.MethodGet, url, username, password, nil)
 	if err != nil {
-		return nil, fmt.Errorf("error building request: %s", err)
-	}
-	if username != "" || password != "" {
-		addAuthHeader(req, username, password)
+		return nil, err
 	}
 	httpClient := &http.Client{}
 	resp, err := httpClient.Do(req)

contrib/pkg/client/common.go

@@ -1,7 +1,29 @@
 package client
 
-import "fmt"
+import (
+	"bytes"
+	"fmt"
+	"net/http"
+)
 
 func getBaseURL(host string, port int) string {
 	return fmt.Sprintf("http://%s:%d", host, port)
 }
+
+func newRequest(
+	method string,
+	url string,
+	username string,
+	password string,
+	body []byte,
+) (*http.Request, error) {
+	req, err := http.NewRequest(method, url, bytes.NewBuffer(body))
+	if err != nil {
+		return nil, fmt.Errorf("error building request: %s", err)
+	}
+	if username != "" || password != "" {
+		req.SetBasicAuth(username, password)
+	}
+	req.Header.Add("X-Broker-API-Version", "2.13")
+	return req, nil
+}

contrib/pkg/client/deprovision.go

@@ -18,16 +18,9 @@ func Deprovision(
 		getBaseURL(host, port),
 		instanceID,
 	)
-	req, err := http.NewRequest(
-		http.MethodDelete,
-		url,
-		nil,
-	)
+	req, err := newRequest(http.MethodDelete, url, username, password, nil)
 	if err != nil {
-		return fmt.Errorf("error building request: %s", err)
-	}
-	if username != "" || password != "" {
-		addAuthHeader(req, username, password)
+		return err
 	}
 	q := req.URL.Query()
 	q.Add("accepts_incomplete", "true")

contrib/pkg/client/poll.go

@@ -24,16 +24,9 @@ func Poll(
 		getBaseURL(host, port),
 		instanceID,
 	)
-	req, err := http.NewRequest(
-		http.MethodGet,
-		url,
-		nil,
-	)
+	req, err := newRequest(http.MethodGet, url, username, password, nil)
 	if err != nil {
-		return "", fmt.Errorf("error building request: %s", err)
-	}
-	if username != "" || password != "" {
-		addAuthHeader(req, username, password)
+		return "", err
 	}
 	q := req.URL.Query()
 	q.Add("operation", operation)

contrib/pkg/client/provision.go

@@ -1,7 +1,6 @@
 package client
 
 import (
-	"bytes"
 	"fmt"
 	"net/http"
 
@@ -36,16 +35,9 @@ func Provision(
 	if err != nil {
 		return "", fmt.Errorf("error encoding request body: %s", err)
 	}
-	req, err := http.NewRequest(
-		http.MethodPut,
-		url,
-		bytes.NewBuffer(json),
-	)
+	req, err := newRequest(http.MethodPut, url, username, password, json)
 	if err != nil {
-		return "", fmt.Errorf("error building request: %s", err)
-	}
-	if username != "" || password != "" {
-		addAuthHeader(req, username, password)
+		return "", err
 	}
 	q := req.URL.Query()
 	q.Add("accepts_incomplete", "true")

contrib/pkg/client/unbind.go

@@ -20,16 +20,9 @@ func Unbind(
 		instanceID,
 		bindingID,
 	)
-	req, err := http.NewRequest(
-		http.MethodDelete,
-		url,
-		nil,
-	)
+	req, err := newRequest(http.MethodDelete, url, username, password, nil)
 	if err != nil {
-		return fmt.Errorf("error building request: %s", err)
-	}
-	if username != "" || password != "" {
-		addAuthHeader(req, username, password)
+		return err
 	}
 	httpClient := &http.Client{}
 	resp, err := httpClient.Do(req)

contrib/pkg/client/update.go

@@ -1,7 +1,6 @@
 package client
 
 import (
-	"bytes"
 	"fmt"
 	"net/http"
 
@@ -33,16 +32,9 @@ func Update(
 	if err != nil {
 		return fmt.Errorf("error encoding request body: %s", err)
 	}
-	req, err := http.NewRequest(
-		http.MethodPatch,
-		url,
-		bytes.NewBuffer(json),
-	)
+	req, err := newRequest(http.MethodPatch, url, username, password, json)
 	if err != nil {
-		return fmt.Errorf("error building request: %s", err)
-	}
-	if username != "" || password != "" {
-		addAuthHeader(req, username, password)
+		return err
 	}
 	q := req.URL.Query()
 	q.Add("accepts_incomplete", "true")