From 67c2fb4af7adf627849f51e6dc03f698abe3ac27 Mon Sep 17 00:00:00 2001 From: bom Date: Fri, 27 Jan 2023 10:25:59 +0100 Subject: [PATCH] Implement specs as defs and not functions This caused values to be spec valid no matter what --- src/main/cljc/dda/c4k_common/monitoring.cljc | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/cljc/dda/c4k_common/monitoring.cljc b/src/main/cljc/dda/c4k_common/monitoring.cljc index b766790..1effb82 100644 --- a/src/main/cljc/dda/c4k_common/monitoring.cljc +++ b/src/main/cljc/dda/c4k_common/monitoring.cljc @@ -19,19 +19,15 @@ (s/def ::traefik-regex string?) (s/def ::kube-state-regex string?) -(defn config? [input] - (s/keys :req-un [::grafana-cloud-url - ::cluster-name - ::cluster-stage])) +(def config? (s/keys :req-un [::grafana-cloud-url + ::cluster-name + ::cluster-stage])) -(defn auth? [input] - (s/keys :req-un [::grafana-cloud-user ::grafana-cloud-password])) +(def auth? (s/keys :req-un [::grafana-cloud-user ::grafana-cloud-password])) -(defn storage? [input] - (s/keys :opt-un [::pvc-storage-class-name])) +(def storage? (s/keys :opt-un [::pvc-storage-class-name])) -(defn filter-regex? [input] - (s/keys :req-un [::node-regex ::traefik-regex ::kube-state-regex])) +(def filter-regex? (s/keys :req-un [::node-regex ::traefik-regex ::kube-state-regex])) (def metric-regex {:node-regex (str "node_cpu_sec.+|node_load[0-9]+|node_memory_Buf.*|node_memory_Mem.*|"