Delete policy when test ends

elastic · Aug 22, 2020 · 53ce3f7 · 53ce3f7
1 parent e60b3b5
commit 53ce3f7
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 25 deletions.
diff --git a/internal/kibana/ingestmanager/client.go b/internal/kibana/ingestmanager/client.go
@@ -1,9 +1,5 @@
 package ingestmanager
 
-import (
-	"path"
-)
-
 type Client struct {
 	apiBaseUrl string
 
@@ -13,7 +9,7 @@ type Client struct {
 
 func NewClient(baseUrl, username, password string) (*Client, error) {
 	return &Client{
-		path.Join(baseUrl, "api", "ingest_manager"),
+		baseUrl + "/api/ingest_manager",
 		username,
 		password,
 	}, nil

diff --git a/internal/kibana/ingestmanager/policies.go b/internal/kibana/ingestmanager/policies.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"io/ioutil"
 	"net/http"
-	"path"
+	"strings"
 
 	"github.com/pkg/errors"
 
@@ -47,8 +47,23 @@ func (c *Client) CreatePolicy(p Policy) (*Policy, error) {
 	return &resp.Item, nil
 }
 
+func (c *Client) DeletePolicy(p Policy) error {
+	reqBody := `{ "agentPolicyId": "` + p.ID + `" }`
+
+	statusCode, _, err := c.post("agent_policies/delete", strings.NewReader(reqBody))
+	if err != nil {
+		return errors.Wrap(err, "could not delete policy")
+	}
+
+	if statusCode != 200 {
+		return fmt.Errorf("could not delete policy; API status code = %d", statusCode)
+	}
+
+	return nil
+}
+
 func (c *Client) post(resourcePath string, reqBody io.Reader) (int, []byte, error) {
-	url := path.Join(c.apiBaseUrl, resourcePath)
+	url := c.apiBaseUrl + "/" + resourcePath
 	req, err := http.NewRequest(http.MethodPost, url, reqBody)
 	if err != nil {
 		return 0, nil, errors.Wrapf(err, "could not create POST request to Ingest Manager resource: %s", resourcePath)

diff --git a/internal/testrunner/runners/system/servicedeployer/compose.go b/internal/testrunner/runners/system/servicedeployer/compose.go
@@ -1,10 +1,6 @@
 package servicedeployer
 
 import (
-	"fmt"
-
-	"github.com/pkg/errors"
-
 	"github.com/elastic/elastic-package/internal/common"
 	"github.com/elastic/elastic-package/internal/logger"
 )
@@ -26,16 +22,16 @@ func NewDockerComposeRunner(ymlPath string) (*DockerComposeRunner, error) {
 // SetUp sets up the service and returns any relevant information.
 func (r *DockerComposeRunner) SetUp(ctxt common.MapStr) (common.MapStr, error) {
 	logger.Infof("Setting up service using docker compose runner")
-	v, err := ctxt.GetValue("docker.compose.network")
-	if err != nil {
-		return ctxt, errors.Wrap(err, "could not determine docker compose network to join")
-	}
-
-	network, ok := v.(string)
-	if !ok {
-		return ctxt, fmt.Errorf("expected docker compose network name to be a string, got: %v", v)
-	}
-	r.network = network
+	//v, err := ctxt.GetValue("docker.compose.network")
+	//if err != nil {
+	//	return ctxt, errors.Wrap(err, "could not determine docker compose network to join")
+	//}
+	//
+	//network, ok := v.(string)
+	//if !ok {
+	//	return ctxt, fmt.Errorf("expected docker compose network name to be a string, got: %v", v)
+	//}
+	//r.network = network
 
 	// TODO
 	return ctxt, nil

diff --git a/internal/testrunner/runners/system/system.go b/internal/testrunner/runners/system/system.go
@@ -89,6 +89,7 @@ func (r *runner) run() error {
 	if err != nil {
 		return errors.Wrap(err, "could not create policy")
 	}
+	defer im.DeletePolicy(*policy)
 
 	fmt.Println(policy)
 

diff --git a/internal/testrunner/testrunner.go b/internal/testrunner/testrunner.go
@@ -52,9 +52,10 @@ func FindTestFolders(packageRootPath string, testType TestType, datasets []strin
 	}
 
 	folders := make([]TestFolder, len(paths))
-	for _, p := range paths {
-		parts := filepath.SplitList(p)
-		pkg := parts[0]
+	_, pkg := filepath.Split(packageRootPath)
+	for idx, p := range paths {
+		relP := strings.TrimPrefix(p, packageRootPath)
+		parts := strings.Split(relP, string(filepath.Separator))
 		dataset := parts[2]
 
 		folder := TestFolder{
@@ -63,7 +64,7 @@ func FindTestFolders(packageRootPath string, testType TestType, datasets []strin
 			dataset,
 		}
 
-		folders = append(folders, folder)
+		folders[idx] = folder
 	}
 
 	return folders, nil