chore: fix junit test

chore: test fixes
flanksource · Oct 5, 2023 · 5a4ec50 · 5a4ec50
1 parent 768a9d3
commit 5a4ec50
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 51 deletions.
diff --git a/checks/metrics.go b/checks/metrics.go
@@ -41,24 +41,21 @@ func getOrAddPrometheusMetric(name, metricType string, labelNames []string) (pro
 }
 
 func getWithEnvironment(ctx *context.Context, r *pkg.CheckResult) *context.Context {
-	templateInput := map[string]any{
-		"result": r.Data,
-		"canary": map[string]any{
-			"name":      r.Canary.GetName(),
-			"namespace": r.Canary.GetNamespace(),
-			"labels":    r.Canary.GetLabels(),
-			"id":        r.Canary.GetPersistedID(),
-		},
-		"check": map[string]any{
-			"name":        r.Check.GetName(),
-			"id":          r.Canary.GetCheckID(r.Check.GetName()),
-			"description": r.Check.GetDescription(),
-			"labels":      r.Check.GetLabels(),
-			"endpoint":    r.Check.GetEndpoint(),
-			"duration":    time.Millisecond * time.Duration(r.GetDuration()),
-		},
+	r.Data["canary"] = map[string]any{
+		"name":      r.Canary.GetName(),
+		"namespace": r.Canary.GetNamespace(),
+		"labels":    r.Canary.GetLabels(),
+		"id":        r.Canary.GetPersistedID(),
 	}
-	return ctx.New(templateInput)
+	r.Data["check"] = map[string]any{
+		"name":        r.Check.GetName(),
+		"id":          r.Canary.GetCheckID(r.Check.GetName()),
+		"description": r.Check.GetDescription(),
+		"labels":      r.Check.GetLabels(),
+		"endpoint":    r.Check.GetEndpoint(),
+		"duration":    time.Millisecond * time.Duration(r.GetDuration()),
+	}
+	return ctx.New(r.Data)
 }
 
 func getLabels(ctx *context.Context, metric external.Metrics) (map[string]string, []string, error) {

diff --git a/fixtures/k8s/junit_pass.yaml b/fixtures/k8s/junit_pass.yaml
@@ -2,21 +2,18 @@ apiVersion: canaries.flanksource.com/v1
 kind: Canary
 metadata:
   name: junit-pass
+  labels:
+    part-of: canary-tools
 spec:
   interval: 120
-  owner: DBAdmin
   severity: high
   junit:
     - testResults: "/tmp/junit-results/"
       name: junit-pass
+      test:
+        expr: results.failed == 0 && results.passed > 0
       display:
-        template: |
-          ✅ {{.results.passed}} ❌ {{.results.failed}} in 🕑 {{.results.duration}}
-          {{  range $r := .results.suites}}
-          {{- if gt (conv.ToInt $r.failed)  0 }}
-            {{$r.name}} ✅ {{$r.passed}} ❌ {{$r.failed}} in 🕑 {{$r.duration}}
-          {{- end }}
-          {{- end }}
+        expr: "string(results.failed) + ' of ' +  string(results.passed)"
       spec:
         containers:
           - name: jes
@@ -25,26 +22,19 @@ spec:
       metrics:
         - name: junit_check_pass_count
           type: gauge
-          value: "result.results.passed"
+          value: results.passed
           labels:
-            - name: name
-              value: junit_check_pass_count
-            - name: check_name
-              valueExpr: check.name
+            - name: suite_name
+              valueExpr: results.suites[0].name
         - name: junit_check_failed_count
           type: gauge
-          value: "result.results.failed"
+          value: results.failed
           labels:
-            - name: name
-              value: junit_check_fail_count
-            - name: check_name
-              valueExpr: check.name
+            - name: part_of
+              valueExpr: canary.labels['part-of']
         - name: junit_check_duration_ms
           type: histogram
-          value: "check.duration"
+          value: results.duration * 1000.0
           labels:
-            - name: name
-              value: junit_check_duration_ms
-            - name: check_name
-              valueExpr: check.name
-
+            - name: suite_name
+              valueExpr: results.suites[0].name
diff --git a/fixtures/minimal/http_auth.yaml b/fixtures/minimal/http_auth.yaml
@@ -4,9 +4,11 @@ metadata:
   name: http-basic-auth
 spec:
   http:
-    - endpoint: https://httpbin.demo.aws.flanksource.com/basic-auth/hello/world
+    - name: access-denied
+      endpoint: https://httpbin.demo.aws.flanksource.com/basic-auth/hello/world
       responseCodes: [401]
-    - endpoint: https://httpbin.demo.aws.flanksource.com/basic-auth/hello/world
+    - name: ok
+      endpoint: https://httpbin.demo.aws.flanksource.com/basic-auth/hello/world
       responseCodes: [200]
       username:
         value: hello

diff --git a/fixtures/minimal/http_pass_single.yaml b/fixtures/minimal/http_pass_single.yaml
@@ -14,14 +14,14 @@ spec:
       metrics:
         - name: httpbin_2xx_count
           type: counter
-          value: "result.code == 200 ? 1 : 0"
+          value: "code == 200 ? 1 : 0"
           labels:
             - name: name
               value: httpbin_2xx_count
             - name: check_name
               valueExpr: check.name
             - name: status_class
-              valueExpr: string(result.code).charAt(0)
+              valueExpr: string(code).charAt(0)
     - name: http-param-tests
       url: https://httpbin.demo.aws.flanksource.com/status/200
       responseCodes: [201, 200, 301]

diff --git a/fixtures/minimal/metrics-multiple.yaml b/fixtures/minimal/metrics-multiple.yaml
@@ -12,7 +12,7 @@ spec:
       metrics:
         - name: exchange_rate
           type: gauge
-          value: result.json.rates.GBP
+          value: json.rates.GBP
           labels:
             - name: "from"
               value: "USD"
@@ -21,7 +21,7 @@ spec:
 
         - name: exchange_rate
           type: gauge
-          value: result.json.rates.EUR
+          value: json.rates.EUR
           labels:
             - name: "from"
               value: "USD"
@@ -30,12 +30,12 @@ spec:
 
         - name: exchange_rate
           type: gauge
-          value: result.json.rates.ILS
+          value: json.rates.ILS
           labels:
             - name: "from"
               value: "USD"
             - name: to
               value: ILS
         - name: exchange_rate_api
           type: histogram
-          value: result.elapsed.getMilliseconds()
+          value: elapsed.getMilliseconds()
diff --git a/fixtures/minimal/metrics.yaml b/fixtures/minimal/metrics.yaml
@@ -17,10 +17,10 @@ spec:
             - name: check_name
               valueExpr: check.name
             - name: code
-              valueExpr: result.code
+              valueExpr: code
         - name: httpbin_2xx_duration
           type: counter
-          value: result.elapsed.getMilliseconds()
+          value: elapsed.getMilliseconds()
           labels:
             - name: check_name
               valueExpr: check.name
diff --git a/fixtures/minimal/icmp_pass.yaml → fixtures/quarantine/icmp_pass.yaml b/fixtures/minimal/icmp_pass.yaml → fixtures/quarantine/icmp_pass.yaml