Skip to content

Open-source status page, incident response and uptime monitoring

🐛 private location (#1477)

Thibault Le Ouay840df35fea13
diff --git a/apps/checker/pkg/job/http_job.go b/apps/checker/pkg/job/http_job.go
index a93c013cd..1e2dab1f4 100644
--- a/apps/checker/pkg/job/http_job.go
+++ b/apps/checker/pkg/job/http_job.go
@@ -15,6 +15,44 @@ import (
"github.com/openstatushq/openstatus/apps/checker/request"
)
+func ProtoNumberAssertionToComparator(assertion v1.NumberComparator) (request.NumberComparator, error) {
+ switch assertion {
+ case v1.NumberComparator_NUMBER_COMPARATOR_EQUAL:
+ return request.NumberEquals, nil
+ case v1.NumberComparator_NUMBER_COMPARATOR_NOT_EQUAL:
+ return request.NumberNotEquals, nil
+ case v1.NumberComparator_NUMBER_COMPARATOR_GREATER_THAN:
+ return request.NumberGreaterThan, nil
+ case v1.NumberComparator_NUMBER_COMPARATOR_GREATER_THAN_OR_EQUAL:
+ return request.NumberGreaterThanEqual, nil
+ case v1.NumberComparator_NUMBER_COMPARATOR_LESS_THAN:
+ return request.NumberLowerThan, nil
+ case v1.NumberComparator_NUMBER_COMPARATOR_LESS_THAN_OR_EQUAL:
+ return request.NumberLowerThanEqual, nil
+ default:
+
+ }
+ return "", fmt.Errorf("unknown comparator type: %v", assertion)
+}
+
+func ProtoStringAssertionToComparator(assertion v1.StringComparator) (request.StringComparator, error) {
+ switch assertion {
+ case v1.StringComparator_STRING_COMPARATOR_CONTAINS:
+ return request.StringContains, nil
+ case v1.StringComparator_STRING_COMPARATOR_NOT_CONTAINS:
+ return request.StringNotContains, nil
+ case v1.StringComparator_STRING_COMPARATOR_EQUAL:
+ return request.StringEquals, nil
+ case v1.StringComparator_STRING_COMPARATOR_NOT_EQUAL:
+ return request.StringNotEquals, nil
+ case v1.StringComparator_STRING_COMPARATOR_EMPTY:
+ return request.StringEmpty, nil
+ case v1.StringComparator_STRING_COMPARATOR_NOT_EMPTY:
+ return request.StringNotEmpty, nil
+ }
+ return "", fmt.Errorf("unknown comparator type: %v", assertion)
+}
+
func (jr jobRunner) HTTPJob(ctx context.Context, monitor *v1.HTTPMonitor) (*HttpPrivateRegionData, error) {
retry := monitor.Retry
@@ -103,8 +141,13 @@ func (jr jobRunner) HTTPJob(ctx context.Context, monitor *v1.HTTPMonitor) (*Http
return nil, fmt.Errorf("error while parsing headers %s: %w", req.URL, err)
}
for _, assertion := range monitor.HeaderAssertions {
+
+ a, err := ProtoStringAssertionToComparator(assertion.Comparator)
+ if err != nil {
+ return nil, fmt.Errorf("error while parsing header assertion comparator: %w", err)
+ }
assert := assertions.HeaderTarget{
- Comparator: request.StringComparator(assertion.Comparator.String()),
+ Comparator: a,
Target: assertion.Target,
Key: assertion.Key,
}
@@ -114,8 +157,13 @@ func (jr jobRunner) HTTPJob(ctx context.Context, monitor *v1.HTTPMonitor) (*Http
if len(monitor.StatusCodeAssertions) > 0 {
for _, assertion := range monitor.StatusCodeAssertions {
+ a, err := ProtoNumberAssertionToComparator(assertion.Comparator)
+ if err != nil {
+ return nil, fmt.Errorf("error while parsing header assertion comparator: %w", err)
+ }
+
assert := assertions.StatusTarget{
- Comparator: request.NumberComparator(assertion.Comparator.String()),
+ Comparator: a,
Target: assertion.Target,
}
isSuccessful = isSuccessful && assert.StatusEvaluate(int64(res.Status))
@@ -123,8 +171,12 @@ func (jr jobRunner) HTTPJob(ctx context.Context, monitor *v1.HTTPMonitor) (*Http
}
if len(monitor.BodyAssertions) > 0 {
for _, assertion := range monitor.BodyAssertions {
+ a, err := ProtoStringAssertionToComparator(assertion.Comparator)
+ if err != nil {
+ return nil, fmt.Errorf("error while parsing header assertion comparator: %w", err)
+ }
assert := assertions.StringTargetType{
- Comparator: request.StringComparator(assertion.Comparator.String()),
+ Comparator: a,
Target: assertion.Target,
}
isSuccessful = isSuccessful && assert.StringEvaluate(res.Body)
diff --git a/apps/checker/pkg/job/http_job_test.go b/apps/checker/pkg/job/http_job_test.go
index 1ac106f39..d1078c97a 100644
--- a/apps/checker/pkg/job/http_job_test.go
+++ b/apps/checker/pkg/job/http_job_test.go
@@ -6,6 +6,8 @@ import (
"github.com/openstatushq/openstatus/apps/checker/pkg/job"
v1 "github.com/openstatushq/openstatus/apps/checker/proto/private_location/v1"
+ "github.com/openstatushq/openstatus/apps/checker/request"
+ "github.com/stretchr/testify/assert"
)
// Save original checker.Http for restoration
@@ -50,3 +52,96 @@ func TestHTTPJob_Failure(t *testing.T) {
t.Errorf("expected data to be nil on error, got %+v", data)
}
}
+
+func TestProtoStringAssertionToComparator(t *testing.T) {
+ tests := []struct {
+ name string
+ input v1.StringComparator
+ want request.StringComparator
+ expectErr bool
+ }{
+ {
+ name: "Contains",
+ input: v1.StringComparator_STRING_COMPARATOR_CONTAINS,
+ want: request.StringContains,
+ expectErr: false,
+ },
+ {
+ name: "NotContains",
+ input: v1.StringComparator_STRING_COMPARATOR_NOT_CONTAINS,
+ want: request.StringNotContains,
+ expectErr: false,
+ },
+ {
+ name: "Equals",
+ input: v1.StringComparator_STRING_COMPARATOR_EQUAL,
+ want: request.StringEquals,
+ expectErr: false,
+ },
+ {
+ name: "NotEquals",
+ input: v1.StringComparator_STRING_COMPARATOR_NOT_EQUAL,
+ want: request.StringNotEquals,
+ expectErr: false,
+ },
+ {
+ name: "Empty",
+ input: v1.StringComparator_STRING_COMPARATOR_EMPTY,
+ want: request.StringEmpty,
+ expectErr: false,
+ },
+ {
+ name: "NotEmpty",
+ input: v1.StringComparator_STRING_COMPARATOR_NOT_EMPTY,
+ want: request.StringNotEmpty,
+ expectErr: false,
+ },
+ {
+ name: "Unknown",
+ input: v1.StringComparator(999),
+ want: "",
+ expectErr: true,
+ },
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ got, err := job.ProtoStringAssertionToComparator(tt.input)
+ if tt.expectErr {
+ assert.Error(t, err)
+ } else {
+ assert.NoError(t, err)
+ assert.Equal(t, tt.want, got)
+ }
+ })
+ }
+}
+
+func TestProtoNumberAssertionToComparator(t *testing.T) {
+ tests := []struct {
+ name string
+ input v1.NumberComparator
+ want request.NumberComparator
+ expectErr bool
+ }{
+ {"Equal", v1.NumberComparator_NUMBER_COMPARATOR_EQUAL, request.NumberEquals, false},
+ {"NotEqual", v1.NumberComparator_NUMBER_COMPARATOR_NOT_EQUAL, request.NumberNotEquals, false},
+ {"GreaterThan", v1.NumberComparator_NUMBER_COMPARATOR_GREATER_THAN, request.NumberGreaterThan, false},
+ {"GreaterThanOrEqual", v1.NumberComparator_NUMBER_COMPARATOR_GREATER_THAN_OR_EQUAL, request.NumberGreaterThanEqual, false},
+ {"LessThan", v1.NumberComparator_NUMBER_COMPARATOR_LESS_THAN, request.NumberLowerThan, false},
+ {"LessThanOrEqual", v1.NumberComparator_NUMBER_COMPARATOR_LESS_THAN_OR_EQUAL, request.NumberLowerThanEqual, false},
+ {"Unknown", v1.NumberComparator(999), "", true},
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ got, err := job.ProtoNumberAssertionToComparator(tt.input)
+ if tt.expectErr {
+ assert.Error(t, err)
+ } else {
+ assert.NoError(t, err)
+ assert.Equal(t, tt.want, got)
+ }
+ })
+ }
+}