From 2e39383a041ba31c944bd7e814ed955c32e3276e Mon Sep 17 00:00:00 2001 From: Michael Jerger Date: Fri, 30 Aug 2024 16:57:22 +0200 Subject: [PATCH] fix monitoring spec errors --- src/dda/backup/monitoring/domain.clj | 8 +++----- src/dda/backup/monitoring/element.clj | 7 +++++++ test/dda/backup/monitoring/domain_test.clj | 1 - 3 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 src/dda/backup/monitoring/element.clj diff --git a/src/dda/backup/monitoring/domain.clj b/src/dda/backup/monitoring/domain.clj index ac80de2..5e44ce0 100644 --- a/src/dda/backup/monitoring/domain.clj +++ b/src/dda/backup/monitoring/domain.clj @@ -1,17 +1,15 @@ (ns dda.backup.monitoring.domain (:require [dda.backup.restic.domain :as rd] + [dda.backup.monitoring.element :as e] [orchestra.core :refer [defn-spec]] [clojure.spec.alpha :as s])) (s/def ::type #{"gauge"}) -(s/def ::labels map?) -(s/def ::metric-value pos?) -(s/def ::metric-element (s/keys :req-un [::labels ::metric-value])) -(s/def ::value (s/+ ::metric-element)) +(s/def ::value (s/+ ::e/metric-element)) (s/def ::metric (s/keys :req-un [::type ::value])) -(s/def ::backup-size (s/spec ::metric-value)) +(s/def ::backup-size (s/spec ::e/value)) (s/def ::docstring string?) (s/def ::__name__ string?) diff --git a/src/dda/backup/monitoring/element.clj b/src/dda/backup/monitoring/element.clj new file mode 100644 index 0000000..809117c --- /dev/null +++ b/src/dda/backup/monitoring/element.clj @@ -0,0 +1,7 @@ +(ns dda.backup.monitoring.element + (:require + [clojure.spec.alpha :as s])) + +(s/def ::labels map?) +(s/def ::value pos?) +(s/def ::metric-element (s/keys :req-un [::labels ::value])) diff --git a/test/dda/backup/monitoring/domain_test.clj b/test/dda/backup/monitoring/domain_test.clj index df383f2..134b032 100644 --- a/test/dda/backup/monitoring/domain_test.clj +++ b/test/dda/backup/monitoring/domain_test.clj @@ -1,7 +1,6 @@ (ns dda.backup.monitoring.domain-test (:require [clojure.test :refer [deftest is are testing run-tests]] - [orchestra.spec.test :as st] [dda.backup.monitoring.domain :as cut])) (deftest should-generate-monitoring-data