#7 Add override of operations headers

Author: lbroudoux

cmd/test.go

@@ -64,6 +64,7 @@ func (c *testComamnd) Execute() {
 	var keycloakClientID string
 	var keycloakClientSecret string
 	var waitFor string
+	var operationsHeaders string
 	var insecureTLS bool
 	var caCertPaths string
 	var verbose bool
@@ -72,6 +73,7 @@ func (c *testComamnd) Execute() {
 	testCmd.StringVar(&keycloakClientID, "keycloakClientId", "", "Keycloak Realm Service Account ClientId")
 	testCmd.StringVar(&keycloakClientSecret, "keycloakClientSecret", "", "Keycloak Realm Service Account ClientSecret")
 	testCmd.StringVar(&waitFor, "waitFor", "5sec", "Time to wait for test to finish")
+	testCmd.StringVar(&operationsHeaders, "operationsHeaders", "", "Override of operations headers as JSON string")
 	testCmd.BoolVar(&insecureTLS, "insecure", false, "Whether to accept insecure HTTPS connection")
 	testCmd.StringVar(&caCertPaths, "caCerts", "", "Comma separated paths of CRT files to add to Root CAs")
 	testCmd.BoolVar(&verbose, "verbose", false, "Produce dumps of HTTP exchanges")
@@ -142,7 +144,7 @@ func (c *testComamnd) Execute() {
 	mc.SetOAuthToken(oauthToken)
 
 	var testResultID string
-	testResultID, err = mc.CreateTestResult(serviceRef, testEndpoint, runnerType)
+	testResultID, err = mc.CreateTestResult(serviceRef, testEndpoint, runnerType, operationsHeaders)
 	if err != nil {
 		fmt.Printf("Got error when invoking Microcks client creating Test: %s", err)
 		os.Exit(1)

pkg/connectors/microcks_client.go

@@ -2,6 +2,7 @@ package connectors
 
 import (
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -14,7 +15,7 @@ import (
 type MicrocksClient interface {
 	GetKeycloakURL() (string, error)
 	SetOAuthToken(oauthToken string)
-	CreateTestResult(serviceID string, testEndpoint string, runnerType string) (string, error)
+	CreateTestResult(serviceID string, testEndpoint string, runnerType string, operationsHeaders string) (string, error)
 	GetTestResult(testResultID string) (*TestResultSummary, error)
 }
 
@@ -31,6 +32,12 @@ type TestResultSummary struct {
 	InProgress     bool   `json:"inProgress"`
 }
 
+// HeaderDTO represents an operation header passed for Test
+type HeaderDTO struct {
+	Name   string `json:"name"`
+	Values string `json:"values"`
+}
+
 type microcksClient struct {
 	APIURL     *url.URL
 	OAuthToken string
@@ -100,7 +107,7 @@ func (c *microcksClient) SetOAuthToken(oauthToken string) {
 	c.OAuthToken = oauthToken
 }
 
-func (c *microcksClient) CreateTestResult(serviceID string, testEndpoint string, runnerType string) (string, error) {
+func (c *microcksClient) CreateTestResult(serviceID string, testEndpoint string, runnerType string, operationsHeaders string) (string, error) {
 	// Ensure we have a correct URL.
 	rel := &url.URL{Path: "tests"}
 	u := c.APIURL.ResolveReference(rel)
@@ -110,6 +117,10 @@ func (c *microcksClient) CreateTestResult(serviceID string, testEndpoint string,
 	input += ("\"serviceId\": \"" + serviceID + "\", ")
 	input += ("\"testEndpoint\": \"" + testEndpoint + "\", ")
 	input += ("\"runnerType\": \"" + runnerType + "\"")
+	if len(operationsHeaders) > 0 && ensureValid(operationsHeaders) {
+		input += (", \"operationsHeaders\": " + operationsHeaders)
+	}
+
 	input += "}"
 
 	req, err := http.NewRequest("POST", u.String(), strings.NewReader(input))
@@ -122,7 +133,7 @@ func (c *microcksClient) CreateTestResult(serviceID string, testEndpoint string,
 	req.Header.Set("Authorization", "Bearer "+c.OAuthToken)
 
 	// Dump request if verbose required.
-	config.DumpRequestIfRequired("Microcks for creating test", req, false)
+	config.DumpRequestIfRequired("Microcks for creating test", req, true)
 
 	resp, err := c.httpClient.Do(req)
 	if err != nil {
@@ -182,3 +193,14 @@ func (c *microcksClient) GetTestResult(testResultID string) (*TestResultSummary,
 
 	return &result, err
 }
+
+func ensureValid(operationsHeaders string) bool {
+	// Unmarshal using a generic interface
+	var headers = map[string][]HeaderDTO{}
+	err := json.Unmarshal([]byte(operationsHeaders), &headers)
+	if err != nil {
+		fmt.Println("Error parsing JSON in operationsHeaders: ", err)
+		return false
+	}
+	return true
+}