Merging ingestmanager client into generic kibana client (#210)

* Merging ingestmanager client into generic kibana client

* Refactoring: using helper get method on kibana client

* Formatting

* Fixing path construction in URLs

* Extracting API prefixes to consts

* Removing unused field

* Fixing sprintf arg

* Remove t.Log call

* Rename URL prefix definitions file

Author: ycombinator

internal/fields/validate_test.go

@@ -184,9 +184,6 @@ func Test_parseElementValue(t *testing.T) {
 
 		t.Run(test.key, func(t *testing.T) {
 			err := parseElementValue(test.key, test.definition, test.value)
-			if err != nil {
-				t.Log(err)
-			}
 			if test.fail {
 				require.Error(t, err)
 			} else {

internal/kibana/ingestmanager/client_agents.go renamed to internal/kibana/agents.go

@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-package ingestmanager
+package kibana
 
 import (
 	"encoding/json"
@@ -23,7 +23,7 @@ type Agent struct {
 
 // ListAgents returns the list of agents enrolled with Fleet.
 func (c *Client) ListAgents() ([]Agent, error) {
-	statusCode, respBody, err := c.get("agents")
+	statusCode, respBody, err := c.get(fmt.Sprintf("%s/agents", FleetAPI))
 	if err != nil {
 		return nil, errors.Wrap(err, "could not list agents")
 	}
@@ -47,7 +47,7 @@ func (c *Client) ListAgents() ([]Agent, error) {
 func (c *Client) AssignPolicyToAgent(a Agent, p Policy) error {
 	reqBody := `{ "policy_id": "` + p.ID + `" }`
 
-	path := fmt.Sprintf("agents/%s/reassign", a.ID)
+	path := fmt.Sprintf("%s/agents/%s/reassign", FleetAPI, a.ID)
 	statusCode, respBody, err := c.put(path, []byte(reqBody))
 	if err != nil {
 		return errors.Wrap(err, "could not assign policy to agent")
@@ -66,7 +66,7 @@ func (c *Client) AssignPolicyToAgent(a Agent, p Policy) error {
 
 func (c *Client) getTotalAgentForPolicy(p Policy) (int, error) {
 	kuery := url.QueryEscape(fmt.Sprintf("fleet-agents.policy_id:\"%s\"", p.ID))
-	path := fmt.Sprintf("agents?kuery=%s", kuery)
+	path := fmt.Sprintf("%s/agents?kuery=%s", FleetAPI, kuery)
 	statusCode, respBody, err := c.get(path)
 	if err != nil {
 		return 0, errors.Wrapf(err, "could not check agent status; API status code = %d; policy ID = %s; response body = %s", statusCode, p.ID, string(respBody))
@@ -94,7 +94,7 @@ func (c *Client) waitUntilPolicyAssigned(p Policy) error {
 	var assigned bool
 	for !assigned {
 		kuery := url.QueryEscape(fmt.Sprintf("fleet-agents.policy_id:\"%s\" and fleet-agents.policy_revision:*", p.ID))
-		path := fmt.Sprintf("agents?kuery=%s", kuery)
+		path := fmt.Sprintf("%s/agents?kuery=%s", FleetAPI, kuery)
 		statusCode, respBody, err := c.get(path)
 		if err != nil {
 			return errors.Wrapf(err, "could not check agent status; API status code = %d; policy ID = %s; response body = %s", statusCode, p.ID, string(respBody))

internal/kibana/client.go

@@ -5,8 +5,15 @@
 package kibana
 
 import (
+	"bytes"
+	"io/ioutil"
+	"net/http"
+	"net/url"
 	"os"
 
+	"github.com/pkg/errors"
+
+	"github.com/elastic/elastic-package/internal/logger"
 	"github.com/elastic/elastic-package/internal/stack"
 )
 
@@ -33,3 +40,56 @@ func NewClient() (*Client, error) {
 		password: password,
 	}, nil
 }
+
+func (c *Client) get(resourcePath string) (int, []byte, error) {
+	return c.sendRequest(http.MethodGet, resourcePath, nil)
+}
+
+func (c *Client) post(resourcePath string, body []byte) (int, []byte, error) {
+	return c.sendRequest(http.MethodPost, resourcePath, body)
+}
+
+func (c *Client) put(resourcePath string, body []byte) (int, []byte, error) {
+	return c.sendRequest(http.MethodPut, resourcePath, body)
+}
+
+func (c *Client) sendRequest(method, resourcePath string, body []byte) (int, []byte, error) {
+	reqBody := bytes.NewReader(body)
+	base, err := url.Parse(c.host)
+	if err != nil {
+		return 0, nil, errors.Wrapf(err, "could not create base URL from host: %v", c.host)
+	}
+
+	rel, err := url.Parse(resourcePath)
+	if err != nil {
+		return 0, nil, errors.Wrapf(err, "could not create relative URL from resource path: %v", resourcePath)
+	}
+
+	u := base.ResolveReference(rel)
+
+	logger.Debugf("%s %s", method, u)
+	logger.Debugf("%s", body)
+
+	req, err := http.NewRequest(method, u.String(), reqBody)
+	if err != nil {
+		return 0, nil, errors.Wrapf(err, "could not create %v request to Kibana API resource: %s", method, resourcePath)
+	}
+
+	req.SetBasicAuth(c.username, c.password)
+	req.Header.Add("content-type", "application/json")
+	req.Header.Add("kbn-xsrf", stack.DefaultVersion)
+
+	client := http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		return 0, nil, errors.Wrap(err, "could not send request to Kibana API")
+	}
+
+	defer resp.Body.Close()
+	body, err = ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return resp.StatusCode, nil, errors.Wrap(err, "could not read response body")
+	}
+
+	return resp.StatusCode, body, nil
+}

internal/kibana/dashboards.go

@@ -6,8 +6,7 @@ package kibana
 
 import (
 	"encoding/json"
-	"io/ioutil"
-	"net/http"
+	"fmt"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -33,27 +32,16 @@ func (c *Client) Export(dashboardIDs []string) ([]common.MapStr, error) {
 		query.WriteByte('&')
 	}
 
-	request, err := http.NewRequest(http.MethodGet, c.host+"/api/kibana/dashboards/export"+query.String(), nil)
+	path := fmt.Sprintf("%s/dashboards/export%s", CoreAPI, query.String())
+	statusCode, respBody, err := c.get(path)
 	if err != nil {
-		return nil, errors.Wrap(err, "building HTTP request failed")
-	}
-	request.SetBasicAuth(c.username, c.password)
-
-	response, err := http.DefaultClient.Do(request)
-	if err != nil {
-		return nil, errors.Wrap(err, "sending HTTP request failed")
-	}
-	defer response.Body.Close()
-
-	body, err := ioutil.ReadAll(response.Body)
-	if err != nil {
-		return nil, errors.Wrap(err, "reading response body failed")
+		return nil, errors.Wrapf(err, "could not export dashboards; API status code = %d; response body = %s", statusCode, string(respBody))
 	}
 
 	var exported exportedType
-	err = json.Unmarshal(body, &exported)
+	err = json.Unmarshal(respBody, &exported)
 	if err != nil {
-		return nil, errors.Wrapf(err, "unmarshalling response failed (body: \n%s)", string(body))
+		return nil, errors.Wrapf(err, "unmarshalling response failed (body: \n%s)", string(respBody))
 	}
 
 	var multiErr multierror.Error

internal/kibana/ingestmanager/client.go

@@ -2,7 +2,7 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-package ingestmanager
+package kibana
 
 import (
 	"encoding/json"
@@ -28,7 +28,7 @@ func (c *Client) CreatePolicy(p Policy) (*Policy, error) {
 		return nil, errors.Wrap(err, "could not convert policy (request) to JSON")
 	}
 
-	statusCode, respBody, err := c.post("agent_policies", reqBody)
+	statusCode, respBody, err := c.post(fmt.Sprintf("%s/agent_policies", FleetAPI), reqBody)
 	if err != nil {
 		return nil, errors.Wrap(err, "could not create policy")
 	}
@@ -52,7 +52,7 @@ func (c *Client) CreatePolicy(p Policy) (*Policy, error) {
 func (c *Client) DeletePolicy(p Policy) error {
 	reqBody := `{ "agentPolicyId": "` + p.ID + `" }`
 
-	statusCode, respBody, err := c.post("agent_policies/delete", []byte(reqBody))
+	statusCode, respBody, err := c.post(fmt.Sprintf("%s/agent_policies/delete", FleetAPI), []byte(reqBody))
 	if err != nil {
 		return errors.Wrap(err, "could not delete policy")
 	}
@@ -122,7 +122,7 @@ func (c *Client) AddPackageDataStreamToPolicy(r PackageDataStream) error {
 		return errors.Wrap(err, "could not convert policy-package (request) to JSON")
 	}
 
-	statusCode, respBody, err := c.post("package_policies", reqBody)
+	statusCode, respBody, err := c.post(fmt.Sprintf("%s/package_policies", FleetAPI), reqBody)
 	if err != nil {
 		return errors.Wrap(err, "could not add package to policy")
 	}

internal/kibana/ingestmanager/client_policies.go renamed to internal/kibana/policies.go

@@ -7,8 +7,6 @@ package kibana
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
-	"net/http"
 	"sort"
 	"strings"
 
@@ -93,25 +91,14 @@ func (c *Client) FindDashboards() (DashboardSavedObjects, error) {
 }
 
 func (c *Client) findDashboardsNextPage(page int) (*savedObjectsResponse, error) {
-	request, err := http.NewRequest(http.MethodGet, fmt.Sprintf("%s%s%d", c.host, fmt.Sprintf("/api/saved_objects/_find?type=dashboard&fields=title&per_page=%d&page=", findDashboardsPerPage), page), nil)
+	path := fmt.Sprintf("%s/_find?type=dashboard&fields=title&per_page=%d&page=%d", SavedObjectsAPI, findDashboardsPerPage, page)
+	statusCode, respBody, err := c.get(path)
 	if err != nil {
-		return nil, errors.Wrap(err, "building HTTP request failed")
-	}
-	request.SetBasicAuth(c.username, c.password)
-
-	response, err := http.DefaultClient.Do(request)
-	if err != nil {
-		return nil, errors.Wrap(err, "sending HTTP request failed")
-	}
-	defer response.Body.Close()
-
-	body, err := ioutil.ReadAll(response.Body)
-	if err != nil {
-		return nil, errors.Wrap(err, "reading response body failed")
+		return nil, errors.Wrapf(err, "could not find dashboards; API status code = %d; response body = %s", statusCode, string(respBody))
 	}
 
 	var r savedObjectsResponse
-	err = json.Unmarshal(body, &r)
+	err = json.Unmarshal(respBody, &r)
 	if err != nil {
 		return nil, errors.Wrap(err, "unmarshalling response failed")
 	}

internal/kibana/saved_objects.go

@@ -0,0 +1,16 @@
+// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+// or more contributor license agreements. Licensed under the Elastic License;
+// you may not use this file except in compliance with the Elastic License.
+
+package kibana
+
+const (
+	// CoreAPI is the prefix for all Kibana Core API resources.
+	CoreAPI = "/api/kibana"
+
+	// SavedObjectsAPI is the prefix for all Kibana Saved Objects API resources.
+	SavedObjectsAPI = "/api/saved_objects"
+
+	// FleetAPI is the prefix for all Kibana Fleet API resources.
+	FleetAPI = "/api/fleet"
+)