diff --git a/alerting/provider/provider.go b/alerting/provider/provider.go index 41e8b0fd..06be60c6 100644 --- a/alerting/provider/provider.go +++ b/alerting/provider/provider.go @@ -2,6 +2,9 @@ package provider import ( "github.com/TwinProduction/gatus/alerting/provider/custom" + "github.com/TwinProduction/gatus/alerting/provider/pagerduty" + "github.com/TwinProduction/gatus/alerting/provider/slack" + "github.com/TwinProduction/gatus/alerting/provider/twilio" "github.com/TwinProduction/gatus/core" ) @@ -13,3 +16,11 @@ type AlertProvider interface { // ToCustomAlertProvider converts the provider into a custom.AlertProvider ToCustomAlertProvider(service *core.Service, alert *core.Alert, result *core.Result, resolved bool) *custom.AlertProvider } + +var ( + // Validate interface implementation on compile + _ AlertProvider = (*custom.AlertProvider)(nil) + _ AlertProvider = (*twilio.AlertProvider)(nil) + _ AlertProvider = (*slack.AlertProvider)(nil) + _ AlertProvider = (*pagerduty.AlertProvider)(nil) +) diff --git a/client/client.go b/client/client.go index 1dad7832..cb8df091 100644 --- a/client/client.go +++ b/client/client.go @@ -19,6 +19,8 @@ func GetHTTPClient(insecure bool) *http.Client { insecureHTTPClient = &http.Client{ Timeout: time.Second * 10, Transport: &http.Transport{ + MaxIdleConns: 100, + MaxIdleConnsPerHost: 20, TLSClientConfig: &tls.Config{ InsecureSkipVerify: true, }, @@ -30,6 +32,10 @@ func GetHTTPClient(insecure bool) *http.Client { if secureHTTPClient == nil { secureHTTPClient = &http.Client{ Timeout: time.Second * 10, + Transport: &http.Transport{ + MaxIdleConns: 100, + MaxIdleConnsPerHost: 20, + }, } } return secureHTTPClient diff --git a/core/condition.go b/core/condition.go index cd3ce9a7..ec2c7931 100644 --- a/core/condition.go +++ b/core/condition.go @@ -155,7 +155,11 @@ func sanitizeAndResolve(list []string, result *Result) []string { if err.Error() != "unexpected end of JSON input" { result.Errors = append(result.Errors, err.Error()) } - element = fmt.Sprintf("%s %s", element, InvalidConditionElementSuffix) + if wantLength { + element = fmt.Sprintf("len(%s) %s", element, InvalidConditionElementSuffix) + } else { + element = fmt.Sprintf("%s %s", element, InvalidConditionElementSuffix) + } } else { if wantLength { element = fmt.Sprintf("%d", resolvedElementLength) diff --git a/core/condition_test.go b/core/condition_test.go index 45be961a..5ec95e25 100644 --- a/core/condition_test.go +++ b/core/condition_test.go @@ -126,6 +126,19 @@ func TestCondition_evaluateWithInvalidBodyJSONPathComplex(t *testing.T) { } } +func TestCondition_evaluateWithInvalidBodyJSONPathComplexWithLengthFunction(t *testing.T) { + expectedResolvedCondition := "len([BODY].data.name) (INVALID) == john" + condition := Condition("len([BODY].data.name) == john") + result := &Result{Body: []byte("{\"data\": {\"id\": 1}}")} + condition.evaluate(result) + if result.ConditionResults[0].Success { + t.Errorf("Condition '%s' should have been a failure, because the path was invalid", condition) + } + if result.ConditionResults[0].Condition != expectedResolvedCondition { + t.Errorf("Condition '%s' should have resolved to '%s', but resolved to '%s' instead", condition, expectedResolvedCondition, result.ConditionResults[0].Condition) + } +} + func TestCondition_evaluateWithBodyJSONPathDoublePlaceholders(t *testing.T) { condition := Condition("[BODY].user.firstName != [BODY].user.lastName") result := &Result{Body: []byte("{\"user\": {\"firstName\": \"john\", \"lastName\": \"doe\"}}")}