Open-source status page, incident response and uptime monitoring
TypeScript alertingincident-managementmcpmcp-servermonitoringmonitoring-as-codeobservabilityon-callopen-sourcesrestatus-pagestatuspagesynthetic-monitoringterraformtinybirdtursouptimeuptime-checkeruptime-monitor
🚀 Body string assertion (#740)
Thibault Le Ouay326ca31794c3
diff --git a/apps/checker/cmd/main.go b/apps/checker/cmd/main.goindex 23c393649..d37e8d52a 100644--- a/apps/checker/cmd/main.go+++ b/apps/checker/cmd/main.go@@ -123,7 +123,12 @@ func main() {isSuccessfull = isSuccessfull && target.HeaderEvaluate(res.Headers)case request.AssertionTextBody:- fmt.Println("assertion type", assert.AssertionType)+ var target assertions.StringTargetType+ if err := json.Unmarshal(a, &target); err != nil {+ return fmt.Errorf("unable to unmarshal IntTarget: %w", err)+ }+ isSuccessfull = isSuccessfull && target.StringEvaluate(res.Body)+case request.AssertionStatus:var target assertions.StatusTargetif err := json.Unmarshal(a, &target); err != nil {@@ -148,6 +153,8 @@ func main() {// it's in error if not successfulif isSuccessfull {res.Error = 0+ // Small trick to avoid sending the body at the moment to TB+ res.Body = ""} else {res.Error = 1}@@ -194,6 +201,7 @@ func main() {WorkspaceID: req.WorkspaceID,Error: 1,Assertions: assertionAsString,+ Body: "",}); err != nil {log.Ctx(ctx).Error().Err(err).Msg("failed to send event to tinybird")}diff --git a/apps/checker/ping.go b/apps/checker/ping.goindex acb6629f8..b7ed9ac96 100644--- a/apps/checker/ping.go+++ b/apps/checker/ping.go@@ -32,6 +32,7 @@ type PingData struct {Headers string `json:"headers,omitempty"`Error uint8 `json:"error"`Assertions string `json:"assertions"`+ Body string `json:"body,omitempty"`}type Timing struct {@@ -126,7 +127,7 @@ func Ping(ctx context.Context, client *http.Client, inputData request.CheckerReq}defer response.Body.Close()- _, err = io.ReadAll(response.Body)+ body, err := io.ReadAll(response.Body)if err != nil {return PingData{Latency: latency,@@ -167,6 +168,7 @@ func Ping(ctx context.Context, client *http.Client, inputData request.CheckerReqURL: inputData.URL,Timing: string(timingAsString),Headers: string(headersAsString),+ Body: string(body),}, nil}diff --git a/apps/checker/pkg/assertions/assertions.go b/apps/checker/pkg/assertions/assertions.goindex 31a7f1434..2a073660e 100644--- a/apps/checker/pkg/assertions/assertions.go+++ b/apps/checker/pkg/assertions/assertions.go@@ -28,16 +28,16 @@ type HeaderTarget struct {}type StringTargetType struct {- Comparator request.StringComparator- Target string+ Comparator request.StringComparator `json:"compare"`+ Target string `json:"target"`}func (target StringTargetType) StringEvaluate(s string) bool {switch target.Comparator {case request.StringContains:- return strings.Contains(target.Target, s)+ return strings.Contains(s, target.Target)case request.StringNotContains:- return !strings.Contains(target.Target, s)+ return !strings.Contains(s, target.Target)case request.StringEmpty:return s == ""case request.StringNotEmpty: