From 752c872d3bbcda77f70bfb7a6937a10aa4535da8 Mon Sep 17 00:00:00 2001 From: TwinProduction Date: Mon, 25 Jan 2021 20:55:49 -0500 Subject: [PATCH] Rename json parameter condition-results to conditionResults --- core/result.go | 2 +- static/index.html | 4 ++-- storage/memory_test.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/result.go b/core/result.go index acc6f399..032dcb81 100644 --- a/core/result.go +++ b/core/result.go @@ -31,7 +31,7 @@ type Result struct { Errors []string `json:"errors"` // ConditionResults results of the service's conditions - ConditionResults []*ConditionResult `json:"condition-results"` + ConditionResults []*ConditionResult `json:"conditionResults"` // Success whether the result signifies a success or not Success bool `json:"success"` diff --git a/static/index.html b/static/index.html index b08b7b3a..24433b43 100644 --- a/static/index.html +++ b/static/index.html @@ -194,8 +194,8 @@ $("#tooltip-response-time").text(parseInt(serviceResult.duration/1000000) + "ms"); // Populate the condition section let conditions = ""; - for (let i in serviceResult['condition-results']) { - let conditionResult = serviceResult['condition-results'][i]; + for (let i in serviceResult.conditionResults) { + let conditionResult = serviceResult.conditionResults[i]; conditions += (conditionResult.success ? "✓" : "X") + " ~ " + htmlEntities(conditionResult.condition) + "
"; } $("#tooltip-conditions").html(conditions); diff --git a/storage/memory_test.go b/storage/memory_test.go index 21f977e0..fb0d5e91 100644 --- a/storage/memory_test.go +++ b/storage/memory_test.go @@ -194,7 +194,7 @@ func TestInMemoryStore_GetAllAsJSON(t *testing.T) { if err != nil { t.Fatal("shouldn't have returned an error, got", err.Error()) } - expectedOutput := `{"group_name":{"name":"name","group":"group","results":[{"status":200,"hostname":"example.org","duration":150000000,"errors":null,"condition-results":[{"condition":"[STATUS] == 200","success":true},{"condition":"[RESPONSE_TIME] \u003c 500","success":true},{"condition":"[CERTIFICATE_EXPIRATION] \u003c 72h","success":true}],"success":true,"timestamp":"0001-01-01T00:00:00Z"},{"status":200,"hostname":"example.org","duration":750000000,"errors":["error-1","error-2"],"condition-results":[{"condition":"[STATUS] == 200","success":true},{"condition":"[RESPONSE_TIME] \u003c 500","success":false},{"condition":"[CERTIFICATE_EXPIRATION] \u003c 72h","success":false}],"success":false,"timestamp":"0001-01-01T00:00:00Z"}],"uptime":{"7d":0.5,"24h":0.5,"1h":0.5}}}` + expectedOutput := `{"group_name":{"name":"name","group":"group","results":[{"status":200,"hostname":"example.org","duration":150000000,"errors":null,"conditionResults":[{"condition":"[STATUS] == 200","success":true},{"condition":"[RESPONSE_TIME] \u003c 500","success":true},{"condition":"[CERTIFICATE_EXPIRATION] \u003c 72h","success":true}],"success":true,"timestamp":"0001-01-01T00:00:00Z"},{"status":200,"hostname":"example.org","duration":750000000,"errors":["error-1","error-2"],"condition-results":[{"condition":"[STATUS] == 200","success":true},{"condition":"[RESPONSE_TIME] \u003c 500","success":false},{"condition":"[CERTIFICATE_EXPIRATION] \u003c 72h","success":false}],"success":false,"timestamp":"0001-01-01T00:00:00Z"}],"uptime":{"7d":0.5,"24h":0.5,"1h":0.5}}}` if string(output) != expectedOutput { t.Errorf("expected:\n %s\n\ngot:\n %s", expectedOutput, string(output)) }