fix(outages): create a dedicated patch route for outages

Author: Diane LAKESTANI

go.mod

@@ -35,7 +35,6 @@ require (
 
 require (
 	cloud.google.com/go v0.56.0 // indirect
-	dario.cat/mergo v1.0.1 // indirect
 	github.com/Azure/azure-sdk-for-go v41.3.0+incompatible // indirect
 	github.com/Azure/go-autorest/autorest v0.10.0 // indirect
 	github.com/Azure/go-autorest/autorest/adal v0.8.3 // indirect

go.sum

@@ -23,8 +23,6 @@ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
 contrib.go.opencensus.io/exporter/ocagent v0.4.12/go.mod h1:450APlNTSR6FrvC3CTRqYosuDstRB9un7SOx2k/9ckA=
-dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
-dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/Azure/azure-sdk-for-go v32.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=

handlers/routes.go

@@ -128,6 +128,7 @@ func Router() *mux.Router {
 	api.Handle("/api/services/{id}/failures", authenticated(servicesDeleteFailuresHandler, false)).Methods("DELETE")
 	api.Handle("/api/services/{id}/hits", scoped(apiServiceHitsHandler)).Methods("GET")
 	api.Handle("/api/services/{id}/hits", authenticated(apiServiceHitsDeleteHandler, false)).Methods("DELETE")
+	api.Handle("/api/services/{id}/outages", authenticated(apiServiceOutagePatchHandler, false)).Methods("PATCH")
 
 	// API SERVICE CHART DATA Routes
 	api.Handle("/api/services/{id}/hits_data", http.HandlerFunc(apiServiceDataHandler)).Methods("GET")

handlers/services.go

@@ -8,7 +8,6 @@ import (
 	"github.com/statping-ng/statping-ng/types/hits"
 	"github.com/statping-ng/statping-ng/types/services"
 	"github.com/statping-ng/statping-ng/utils"
-	"dario.cat/mergo"
 	"net/http"
 )
 
@@ -78,7 +77,12 @@ func apiCreateServiceHandler(w http.ResponseWriter, r *http.Request) {
 type servicePatchReq struct {
 	Online  bool   `json:"online"`
 	Issue   string `json:"issue,omitempty"`
-	Latency int64  `json:"latency,omitempty"`
+	Latency int64    `json:"latency,omitempty"`
+}
+
+type serviceOutagePatchReq struct {
+	IsOutageEnabled bool 	`json:"is_outage_enabled"`
+	OutageType 		string 	`json:"outage_type"`
 }
 
 func apiServicePatchHandler(w http.ResponseWriter, r *http.Request) {
@@ -102,7 +106,7 @@ func apiServicePatchHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if !req.Online {
-		services.RecordFailure(service, issueDefault, "trigger", service.OutageType)
+		services.RecordFailure(service, issueDefault, "trigger", "offline")
 	} else {
 		services.RecordSuccess(service)
 	}
@@ -115,39 +119,55 @@ func apiServicePatchHandler(w http.ResponseWriter, r *http.Request) {
 	sendJsonAction(service, "update", w, r)
 }
 
-func apiServiceUpdateHandler(w http.ResponseWriter, r *http.Request) {
+func apiServiceOutagePatchHandler(w http.ResponseWriter, r *http.Request) {
 	service, err := findService(r)
 	if err != nil {
 		sendErrorJson(err, w, r)
 		return
 	}
-
-	var updateData services.Service
-	if err := DecodeJSON(r, &updateData); err != nil {
+	var req serviceOutagePatchReq
+	if err := DecodeJSON(r, &req); err != nil {
 		sendErrorJson(err, w, r)
 		return
 	}
 
-	// Merge updateData in service by overriding the values
-	if err := mergo.Merge(service, updateData, mergo.WithOverride, mergo.WithOverwriteWithEmptyValue); err != nil {
+	service.IsOutageEnabled = req.IsOutageEnabled
+	service.OutageType = req.OutageType
+
+	issueDefault := "Service was triggered to be outaged"
+
+	if req.IsOutageEnabled {
+		services.RecordFailure(service, issueDefault, "trigger", service.OutageType)
+	} else {
+		services.RecordSuccess(service)
+	}
+
+	if err := service.Update(); err != nil {
 		sendErrorJson(err, w, r)
 		return
 	}
 
+	sendJsonAction(service, "update", w, r)
+}
+
+func apiServiceUpdateHandler(w http.ResponseWriter, r *http.Request) {
+	service, err := findService(r)
+	if err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
+	if err := DecodeJSON(r, &service); err != nil {
+		sendErrorJson(err, w, r)
+		return
+	}
 	if err := service.Update(); err != nil {
 		sendErrorJson(err, w, r)
 		return
 	}
 	go service.CheckService(true)
-	log.Info("Service updated: ", service)
-	if service.IsOutageEnabled {
-		services.RecordFailure(service, "Outage set ("+service.OutageType+")", "outage", service.OutageType)
-	}
-
 	sendJsonAction(service, "update", w, r)
 }
 
-
 func apiServiceDataHandler(w http.ResponseWriter, r *http.Request) {
 	service, err := findService(r)
 	if err != nil {

types/services/services_test_alerts_test.go

@@ -269,7 +269,7 @@ func runNotifyTests(t *testing.T, notif *exampleNotifier, tests ...notifyTest) {
 			if test.OnSuccess {
 				RecordSuccess(test.Service)
 			} else {
-				RecordFailure(test.Service, "test issue", "lookup")
+				RecordFailure(test.Service, "test issue", "lookup", "test")
 			}
 
 			assert.Equal(t, test.ExpectedSuccess, notif.success)