Skip to content

Open-source status page, incident response and uptime monitoring

bug dns checker assertion (#1647)

Thibault Le Ouay26210b89e416
diff --git a/apps/checker/handlers/checker_test.go b/apps/checker/handlers/checker_test.go
index 3624e4664..cc92e9cc8 100644
--- a/apps/checker/handlers/checker_test.go
+++ b/apps/checker/handlers/checker_test.go
@@ -109,7 +109,6 @@ func TestHandler_HTTPCheckerHandler(t *testing.T) {
})
}
-
func TestEvaluateAssertions_raw(t *testing.T) {
// Helper to marshal assertion
marshal := func(a any) json.RawMessage {
@@ -133,8 +132,8 @@ func TestEvaluateAssertions_raw(t *testing.T) {
target := struct {
request.Assertion
Comparator request.StringComparator `json:"compare"`
- Key string `json:"key"`
- Target string `json:"target"`
+ Key string `json:"key"`
+ Target string `json:"target"`
}{
assertion,
request.StringContains,
@@ -156,8 +155,8 @@ func TestEvaluateAssertions_raw(t *testing.T) {
target := struct {
request.Assertion
Comparator request.StringComparator `json:"compare"`
- Key string `json:"key"`
- Target string `json:"target"`
+ Key string `json:"key"`
+ Target string `json:"target"`
}{
assertion,
request.StringContains,
@@ -180,7 +179,7 @@ func TestEvaluateAssertions_raw(t *testing.T) {
target := struct {
request.Assertion
Comparator request.StringComparator `json:"compare"`
- Target string `json:"target"`
+ Target string `json:"target"`
}{
assertion,
request.StringEquals,
@@ -191,7 +190,6 @@ func TestEvaluateAssertions_raw(t *testing.T) {
data := handlers.PingData{Body: "ok"}
res := checker.Response{Status: 200}
-
ok, err := handlers.EvaluateHTTPAssertions(raw, data, res)
assert.False(t, ok)
assert.NoError(t, err)
@@ -203,7 +201,7 @@ func TestEvaluateAssertions_raw(t *testing.T) {
target := struct {
request.Assertion
Comparator request.StringComparator `json:"compare"`
- Target string `json:"target"`
+ Target string `json:"target"`
}{
assertion,
request.StringEquals,
@@ -214,7 +212,6 @@ func TestEvaluateAssertions_raw(t *testing.T) {
data := handlers.PingData{Body: "success"}
res := checker.Response{Status: 200}
-
ok, err := handlers.EvaluateHTTPAssertions(raw, data, res)
assert.True(t, ok)
assert.NoError(t, err)
@@ -225,7 +222,7 @@ func TestEvaluateAssertions_raw(t *testing.T) {
target := struct {
request.Assertion
Comparator request.NumberComparator `json:"compare"`
- Target int64 `json:"target"`
+ Target int64 `json:"target"`
}{
assertion,
request.NumberEquals,
@@ -236,7 +233,6 @@ func TestEvaluateAssertions_raw(t *testing.T) {
data := handlers.PingData{}
res := checker.Response{Status: 200}
-
ok, err := handlers.EvaluateHTTPAssertions(raw, data, res)
assert.True(t, ok)
assert.NoError(t, err)
diff --git a/apps/checker/handlers/dns.go b/apps/checker/handlers/dns.go
index 5efcfdda9..8479aefab 100644
--- a/apps/checker/handlers/dns.go
+++ b/apps/checker/handlers/dns.go
@@ -164,19 +164,21 @@ func (h Handler) DNSHandler(c *gin.Context) {
// Status update logic
switch {
- case !isSuccessful && req.Status != "error":
+ case !isSuccessful:
log.Ctx(ctx).Debug().Msg("DNS check failed assertions")
- checker.UpdateStatus(ctx, checker.UpdateData{
- MonitorId: req.MonitorID,
- Status: "error",
- Region: h.Region,
- Message: err.Error(),
- CronTimestamp: req.CronTimestamp,
- Latency: latency,
- })
data.RequestStatus = "error"
data.Error = 1
data.ErrorMessage = err.Error()
+ if req.Status != "error" {
+ checker.UpdateStatus(ctx, checker.UpdateData{
+ MonitorId: req.MonitorID,
+ Status: "error",
+ Region: h.Region,
+ Message: err.Error(),
+ CronTimestamp: req.CronTimestamp,
+ Latency: latency,
+ })
+ }
case isSuccessful && req.DegradedAfter > 0 && latency > req.DegradedAfter && req.Status != "degraded":
checker.UpdateStatus(ctx, checker.UpdateData{
MonitorId: req.MonitorID,
@@ -233,7 +235,6 @@ func (h Handler) DNSHandlerRegion(c *gin.Context) {
return
}
-
retry := defaultRetry
if req.Retry != 0 {
retry = int(req.Retry)
@@ -245,7 +246,7 @@ func (h Handler) DNSHandlerRegion(c *gin.Context) {
return
}
- workspaceId , _ := strconv.Atoi(req.WorkspaceID)
+ workspaceId, _ := strconv.Atoi(req.WorkspaceID)
statusMap := map[string]string{
"active": "success",
@@ -366,7 +367,7 @@ func EvaluateDNSAssertions(rawAssertions []json.RawMessage, response *checker.Dn
return false, fmt.Errorf("unable to parse assertion: %w", err)
}
var isSuccessfull bool
- switch assert.Record {
+ switch assert.Key {
case request.RecordA:
isSuccessfull = assert.RecordEvaluate(response.A)
case request.RecordAAAA:
@@ -380,7 +381,7 @@ func EvaluateDNSAssertions(rawAssertions []json.RawMessage, response *checker.Dn
case request.RecordTXT:
isSuccessfull = assert.RecordEvaluate(response.TXT)
default:
- return false, fmt.Errorf("unknown record type in assertion: %s", assert.Record)
+ return false, fmt.Errorf("unknown record type in assertion: %s", assert.Key)
}
if !isSuccessfull {
return false, nil
diff --git a/apps/checker/handlers/dns_test.go b/apps/checker/handlers/dns_test.go
index 57ba56e86..d478804f7 100644
--- a/apps/checker/handlers/dns_test.go
+++ b/apps/checker/handlers/dns_test.go
@@ -21,8 +21,6 @@ type DNSResult struct {
TXT []string
}
-
-
func TestFormatDNSResult(t *testing.T) {
tests := []struct {
name string
@@ -105,7 +103,6 @@ func TestFormatDNSResult(t *testing.T) {
}
}
-
func TestEvaluateDNSAssertions(t *testing.T) {
type args struct {
rawAssertions []json.RawMessage
@@ -121,7 +118,7 @@ func TestEvaluateDNSAssertions(t *testing.T) {
name: "A record matches",
args: args{
rawAssertions: []json.RawMessage{
- json.RawMessage(`{"record":"A","compare":"eq","target":"1.2.3.4"}`),
+ json.RawMessage(`{"key":"A","compare":"eq","target":"1.2.3.4"}`),
},
response: &checker.DnsResponse{
A: []string{"1.2.3.4", "5.6.7.8"},
@@ -134,7 +131,7 @@ func TestEvaluateDNSAssertions(t *testing.T) {
name: "CNAME does not match",
args: args{
rawAssertions: []json.RawMessage{
- json.RawMessage(`{"record":"CNAME","compare":"eq","target":"not-example.com"}`),
+ json.RawMessage(`{"key":"CNAME","compare":"eq","target":"not-example.com"}`),
},
response: &checker.DnsResponse{
CNAME: "example.com",
@@ -143,11 +140,24 @@ func TestEvaluateDNSAssertions(t *testing.T) {
wantSuccess: false,
wantErr: false,
},
+ {
+ name: "CNAME Contains",
+ args: args{
+ rawAssertions: []json.RawMessage{
+ json.RawMessage(`{"version":"v1","type":"dnsRecord","key":"CNAME","compare":"contains","target":"openstatus.dev"}`),
+ },
+ response: &checker.DnsResponse{
+ CNAME: "openstatus.dev.",
+ },
+ },
+ wantSuccess: true,
+ wantErr: false,
+ },
{
name: "Unknown record type",
args: args{
rawAssertions: []json.RawMessage{
- json.RawMessage(`{"record":"FOO","compare":"eq","target":"bar"}`),
+ json.RawMessage(`{"key":"FOO","compare":"eq","target":"bar"}`),
},
response: &checker.DnsResponse{},
},
diff --git a/apps/checker/pkg/assertions/assertions.go b/apps/checker/pkg/assertions/assertions.go
index 541f3a237..82d15976c 100644
--- a/apps/checker/pkg/assertions/assertions.go
+++ b/apps/checker/pkg/assertions/assertions.go
@@ -36,7 +36,7 @@ type StringTargetType struct {
type RecordTarget struct {
Comparator request.RecordComparator `json:"compare"`
Target string `json:"target"`
- Record request.Record `json:"record"`
+ Key request.Record `json:"key"`
}
func (target StringTargetType) StringEvaluate(s string) bool {