Add e2e test for notifier

.gitignore

@@ -40,3 +40,4 @@ apiserver.local.config/
 hack/dev/testconfig/searchlight/pki/
 hack/dev/notifier/MAILGUN_API_KEY
 coverage.txt
+test/e2e/junit.xml

pkg/icinga/client.go

@@ -17,8 +17,7 @@ type Config struct {
 }
 
 type Client struct {
-	config     Config
-	pathPrefix string
+	config Config
 }
 
 type APIRequest struct {
@@ -54,34 +53,27 @@ func (c *Client) SetEndpoint(endpoint string) *Client {
 	return c
 }
 
-func (c *Client) Objects() *Client {
-	c.pathPrefix = "/objects"
-	return c
-}
-
 func (c *Client) Hosts(hostName string) *APIRequest {
-	return c.newRequest("/hosts/" + hostName)
+	return c.newRequest("/objects/hosts/" + hostName)
 }
 
 func (c *Client) HostGroups(hostName string) *APIRequest {
-	return c.newRequest("/hostgroups/" + hostName)
+	return c.newRequest("/objects/hostgroups/" + hostName)
 }
 
 func (c *Client) Service(hostName string) *APIRequest {
-	return c.newRequest("/services/" + hostName)
+	return c.newRequest("/objects/services/" + hostName)
 }
 
-func (c *Client) Actions(action string) *APIRequest {
-	c.pathPrefix = ""
-	return c.newRequest("/actions/" + action)
+func (c *Client) Notifications(hostName string) *APIRequest {
+	return c.newRequest("/objects/notifications/" + hostName)
 }
 
-func (c *Client) Notifications(hostName string) *APIRequest {
-	return c.newRequest("/notifications/" + hostName)
+func (c *Client) Actions(action string) *APIRequest {
+	return c.newRequest("/actions/" + action)
 }
 
 func (c *Client) Check() *APIRequest {
-	c.pathPrefix = ""
 	return c.newRequest("")
 }
 

pkg/icinga/common.go

@@ -37,7 +37,7 @@ func (h *commonHost) reconcileIcingaHost(kh IcingaHost) error {
 		return errors.Wrap(err, "Failed to Marshal IcingaObject")
 	}
 
-	resp := h.IcingaClient.Objects().Hosts(host).Create([]string{}, string(jsonStr)).Do()
+	resp := h.IcingaClient.Hosts(host).Create([]string{}, string(jsonStr)).Do()
 	if resp.Err != nil {
 		return errors.Wrap(resp.Err, string(resp.ResponseBody))
 	}
@@ -49,7 +49,7 @@ func (h *commonHost) reconcileIcingaHost(kh IcingaHost) error {
 		return errors.Errorf("Failed to create Icinga Host. Status: %d", resp.Status)
 	}
 
-	resp = h.IcingaClient.Objects().Hosts(host).Update([]string{}, string(jsonStr)).Do()
+	resp = h.IcingaClient.Hosts(host).Update([]string{}, string(jsonStr)).Do()
 	if resp.Err != nil {
 		return errors.Wrap(resp.Err, "Failed to update Icinga Host")
 	}
@@ -71,12 +71,12 @@ func (h *commonHost) deleteIcingaHost(kh IcingaHost) error {
 
 	in := fmt.Sprintf(`{"filter": "match(\"%s\",host.name)"}`, host)
 	var respService ResponseObject
-	if _, err := h.IcingaClient.Objects().Service("").Update([]string{}, in).Do().Into(&respService); err != nil {
+	if _, err := h.IcingaClient.Service("").Update([]string{}, in).Do().Into(&respService); err != nil {
 		return errors.Wrap(err, "can't get Icinga service")
 	}
 
 	if len(respService.Results) == 0 {
-		resp := h.IcingaClient.Objects().Hosts("").Delete([]string{}, in).Params(param).Do()
+		resp := h.IcingaClient.Hosts("").Delete([]string{}, in).Params(param).Do()
 		if resp.Err != nil {
 			return errors.Wrap(err, "can't delete Icinga host")
 		}
@@ -94,7 +94,7 @@ func (h *commonHost) ForceDeleteIcingaHost(kh IcingaHost) error {
 	}
 
 	in := fmt.Sprintf(`{"filter": "match(\"%s\",host.name)"}`, host)
-	resp := h.IcingaClient.Objects().Hosts("").Delete([]string{}, in).Params(param).Do()
+	resp := h.IcingaClient.Hosts("").Delete([]string{}, in).Params(param).Do()
 	if resp.Err != nil {
 		return errors.Wrap(resp.Err, "Failed to delete IcingaHost")
 	}
@@ -118,7 +118,7 @@ func (h *commonHost) createIcingaService(svc string, kh IcingaHost, attrs map[st
 	if err != nil {
 		return errors.WithStack(err)
 	}
-	resp := h.IcingaClient.Objects().Service(host).Create([]string{svc}, string(jsonStr)).Do()
+	resp := h.IcingaClient.Service(host).Create([]string{svc}, string(jsonStr)).Do()
 	if resp.Err != nil {
 		return errors.Wrap(resp.Err, "Failed to create Icinga Service")
 	}
@@ -145,7 +145,7 @@ func (h *commonHost) updateIcingaService(svc string, kh IcingaHost, attrs map[st
 	if err != nil {
 		return errors.WithStack(err)
 	}
-	resp := h.IcingaClient.Objects().Service(host).Update([]string{svc}, string(jsonStr)).Do()
+	resp := h.IcingaClient.Service(host).Update([]string{svc}, string(jsonStr)).Do()
 	if resp.Err != nil {
 		return errors.Wrap(resp.Err, "Failed to update Icinga Service")
 	}
@@ -161,7 +161,7 @@ func (h *commonHost) deleteIcingaService(svc string, kh IcingaHost) error {
 	}
 	in := h.IcingaServiceSearchQuery(svc, kh)
 
-	resp := h.IcingaClient.Objects().Service("").Delete([]string{}, in).Params(param).Do()
+	resp := h.IcingaClient.Service("").Delete([]string{}, in).Params(param).Do()
 	if resp.Err != nil {
 		return errors.Wrap(resp.Err, "Failed to delete Icinga Service")
 	}
@@ -176,7 +176,7 @@ func (h *commonHost) checkIcingaService(svc string, kh IcingaHost) (bool, error)
 	in := h.IcingaServiceSearchQuery(svc, kh)
 	var respService ResponseObject
 
-	if _, err := h.IcingaClient.Objects().Service("").Get([]string{}, in).Do().Into(&respService); err != nil {
+	if _, err := h.IcingaClient.Service("").Get([]string{}, in).Do().Into(&respService); err != nil {
 		return true, errors.Wrap(err, "can't check icinga service")
 	}
 	return len(respService.Results) > 0, nil
@@ -214,7 +214,7 @@ func (h *commonHost) reconcileIcingaNotification(alert api.Alert, kh IcingaHost)
 
 	var resp *APIResponse
 
-	resp = h.IcingaClient.Objects().Notifications(host).Create([]string{alert.GetName(), alert.GetName()}, string(jsonStr)).Do()
+	resp = h.IcingaClient.Notifications(host).Create([]string{alert.GetName(), alert.GetName()}, string(jsonStr)).Do()
 
 	if resp.Err != nil {
 		return errors.Wrap(resp.Err, "Failed to create Icinga Notification")
@@ -227,7 +227,7 @@ func (h *commonHost) reconcileIcingaNotification(alert api.Alert, kh IcingaHost)
 		return errors.Errorf("Failed to create Icinga notification. Status: %d", resp.Status)
 	}
 
-	resp = h.IcingaClient.Objects().Notifications(host).Update([]string{alert.GetName(), alert.GetName()}, string(jsonStr)).Do()
+	resp = h.IcingaClient.Notifications(host).Update([]string{alert.GetName(), alert.GetName()}, string(jsonStr)).Do()
 
 	if resp.Err != nil {
 		return errors.Wrap(resp.Err, "Failed to update Icinga Notification")

pkg/icinga/requester.go

@@ -82,9 +82,8 @@ func (c *Client) newRequest(path string) *APIRequest {
 	}
 	client := &http.Client{Transport: tr}
 
-	c.pathPrefix = c.pathPrefix + path
 	return &APIRequest{
-		uri:      c.config.Endpoint + c.pathPrefix,
+		uri:      c.config.Endpoint + path,
 		client:   client,
 		userName: c.config.BasicAuth.Username,
 		password: c.config.BasicAuth.Password,

plugins/notifier/sms.go

@@ -6,27 +6,47 @@ import (
 	api "github.com/appscode/searchlight/apis/monitoring/v1alpha1"
 )
 
+type SMS struct {
+	AlertName        string
+	NotificationType string
+	ServiceState     string
+	Author           string
+	Comment          string
+	Hostname         string
+}
+
 func (n *notifier) RenderSMS(receiver api.Receiver) string {
 	opts := n.options
-	var msg string
+	m := &SMS{
+		AlertName:        opts.alertName,
+		NotificationType: opts.notificationType,
+		ServiceState:     receiver.State,
+		Author:           opts.author,
+		Comment:          opts.comment,
+		Hostname:         opts.hostname,
+	}
 
-	switch api.AlertType(opts.notificationType) {
+	return m.Render()
+}
+
+func (m *SMS) Render() string {
+	var msg string
+	switch api.AlertType(m.NotificationType) {
 	case api.NotificationAcknowledgement:
-		msg = fmt.Sprintf("Service [%s] for [%s] is in \"%s\" state.\nThis issue is acked.", opts.alertName, opts.hostname, receiver.State)
+		msg = fmt.Sprintf("Service [%s] for [%s] is in \"%s\" state.\nThis issue is acked.", m.AlertName, m.Hostname, m.ServiceState)
 	case api.NotificationRecovery:
-		msg = fmt.Sprintf("Service [%s] for [%s] was in \"%s\" state.\nThis issue is recovered.", opts.alertName, opts.hostname, receiver.State)
+		msg = fmt.Sprintf("Service [%s] for [%s] was in \"%s\" state.\nThis issue is recovered.", m.AlertName, m.Hostname, m.ServiceState)
 	case api.NotificationProblem:
-		msg = fmt.Sprintf("Service [%s] for [%s] is in \"%s\" state.\nCheck this issue in Icingaweb.", opts.alertName, opts.hostname, receiver.State)
+		msg = fmt.Sprintf("Service [%s] for [%s] is in \"%s\" state.\nCheck this issue in Icingaweb.", m.AlertName, m.Hostname, m.ServiceState)
 	default:
-		msg = fmt.Sprintf("Service [%s] for [%s] is in \"%s\" state.", opts.alertName, opts.hostname, receiver.State)
+		msg = fmt.Sprintf("Service [%s] for [%s] is in \"%s\" state.", m.AlertName, m.Hostname, m.ServiceState)
 	}
-	if opts.comment != "" {
-		if opts.author != "" {
-			msg = msg + " " + fmt.Sprintf(`%s says "%s".`, opts.author, opts.comment)
+	if m.Comment != "" {
+		if m.Author != "" {
+			msg = msg + " " + fmt.Sprintf(`%s says "%s".`, m.Author, m.Comment)
 		} else {
-			msg = msg + " " + fmt.Sprintf(`Comment: "%s".`, opts.comment)
+			msg = msg + " " + fmt.Sprintf(`Comment: "%s".`, m.Comment)
 		}
 	}
-
 	return msg
 }

test/e2e/cluster_alert_test.go

@@ -1,4 +1,4 @@
-package e2e_test
+package e2e
 
 import (
 	"strconv"
@@ -35,15 +35,15 @@ var _ = Describe("ClusterAlert", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Check icinga services")
-			f.EventuallyClusterAlertIcingaService(alert.ObjectMeta, alert.Spec).
+			f.EventuallyClusterAlertIcingaService(alert.ObjectMeta).
 				Should(HaveIcingaObject(icingaServiceState))
 
 			By("Delete clusteralert")
 			err = f.DeleteClusterAlert(alert.ObjectMeta)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Wait for icinga services to be deleted")
-			f.EventuallyClusterAlertIcingaService(alert.ObjectMeta, alert.Spec).
+			f.EventuallyClusterAlertIcingaService(alert.ObjectMeta).
 				Should(HaveIcingaObject(IcingaServiceState{}))
 		}
 
@@ -107,15 +107,15 @@ var _ = Describe("ClusterAlert", func() {
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Check icinga services")
-				f.EventuallyClusterAlertIcingaService(alert.ObjectMeta, alert.Spec).
+				f.EventuallyClusterAlertIcingaService(alert.ObjectMeta).
 					Should(HaveIcingaObject(icingaServiceState))
 
 				By("Delete clusteralert")
 				err = f.DeleteClusterAlert(alert.ObjectMeta)
 				Expect(err).NotTo(HaveOccurred())
 
 				By("Wait for icinga services to be deleted")
-				f.EventuallyClusterAlertIcingaService(alert.ObjectMeta, alert.Spec).
+				f.EventuallyClusterAlertIcingaService(alert.ObjectMeta).
 					Should(HaveIcingaObject(IcingaServiceState{}))
 			}
 

test/e2e/e2e_suite_test.go

@@ -1,4 +1,4 @@
-package e2e_test
+package e2e
 
 import (
 	"flag"
@@ -12,7 +12,6 @@ import (
 	cs "github.com/appscode/searchlight/client/clientset/versioned"
 	"github.com/appscode/searchlight/pkg/icinga"
 	"github.com/appscode/searchlight/pkg/operator"
-	"github.com/appscode/searchlight/test/e2e"
 	"github.com/appscode/searchlight/test/e2e/framework"
 	. "github.com/appscode/searchlight/test/e2e/matcher"
 	. "github.com/onsi/ginkgo"
@@ -69,7 +68,7 @@ var _ = BeforeSuite(func() {
 	// Framework
 	root = framework.New(kubeClient, apiExtKubeClient, extClient, nil, provider, storageClass)
 
-	e2e.PrintSeparately("Using namespace " + root.Namespace())
+	framework.PrintSeparately("Using namespace " + root.Namespace())
 
 	// Create namespace
 	err = root.CreateNamespace()
@@ -108,8 +107,8 @@ var _ = BeforeSuite(func() {
 		CACert:   nil,
 	}
 
-	cfg.BasicAuth.Username = e2e.ICINGA_API_USER
-	cfg.BasicAuth.Password = e2e.ICINGA_API_PASSWORD
+	cfg.BasicAuth.Username = ICINGA_API_USER
+	cfg.BasicAuth.Password = ICINGA_API_PASSWORD
 
 	// Icinga Client
 	icingaClient := icinga.NewClient(*cfg)
@@ -120,7 +119,7 @@ var _ = BeforeSuite(func() {
 	Expect(err).NotTo(HaveOccurred())
 	fmt.Println()
 	fmt.Println("Icingaweb2:     ", fmt.Sprintf("http://%v/", icingawebEndpoint))
-	fmt.Println("Login password: ", e2e.ICINGA_WEB_UI_PASSWORD)
+	fmt.Println("Login password: ", ICINGA_WEB_UI_PASSWORD)
 	fmt.Println()
 
 	// Controller
@@ -140,5 +139,5 @@ var _ = AfterSuite(func() {
 	root.CleanClusterAlert()
 	err := root.DeleteNamespace()
 	Expect(err).NotTo(HaveOccurred())
-	e2e.PrintSeparately("Deleted namespace")
+	framework.PrintSeparately("Deleted namespace")
 })