make all datasources and recipients strict

lausser · Feb 16, 2024 · aaea250 · aaea250
1 parent 9cdb7ca
commit aaea250
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 7 deletions.
diff --git a/Changelog b/Changelog
@@ -1,3 +1,5 @@
+* 2024-02-16 10.2.1.2
+  make all datasources and recipients strict
 * 2024-02-16 10.2.1.1
   check type of datarecipient_prometheus_snmp strict
 * 2024-02-16 10.2.1

diff --git a/recipes/default/classes/datarecipient_coshsh_default.py b/recipes/default/classes/datarecipient_coshsh_default.py
@@ -18,7 +18,7 @@
 logger = logging.getLogger('coshsh')
 
 def __dr_ident__(params={}):
-    if coshsh.util.compare_attr("type", params, "datarecipient_coshsh_default"):
+    if coshsh.util.compare_attr("type", params, "^datarecipient_coshsh_default$"):
         return DatarecipientCoshshDefault
 
 

diff --git a/recipes/default/classes/datarecipient_discard.py b/recipes/default/classes/datarecipient_discard.py
@@ -15,7 +15,7 @@
 
 
 def __dr_ident__(params={}):
-    if compare_attr("type", params, "discard"):
+    if compare_attr("type", params, "^discard$"):
         return DrDiscard
 
 

diff --git a/recipes/default/classes/datasource_csvfile.py b/recipes/default/classes/datasource_csvfile.py
@@ -23,11 +23,11 @@
 logger = logging.getLogger('coshsh')
 
 def __ds_ident__(params={}):
-    if coshsh.util.compare_attr("type", params, "recipe_csv"):
+    if coshsh.util.compare_attr("type", params, "^recipe_csv$"):
         # csv-files have names like self.name+'_'+self.recipe_name+'_*.csv
         # recommendation is to use CsvFile and add a coshsh_filter column
         return CsvFileRecipe
-    if coshsh.util.compare_attr("type", params, "csv"):
+    if coshsh.util.compare_attr("type", params, "^csv$"):
         return CsvFile
 
 class CommentedFile:

diff --git a/recipes/default/classes/datasource_discard.py b/recipes/default/classes/datasource_discard.py
@@ -15,7 +15,7 @@
 
 
 def __ds_ident__(params={}):
-    if coshsh.util.compare_attr("type", params, "discard"):
+    if coshsh.util.compare_attr("type", params, "^discard$"):
         return DsDiscard
 
 

diff --git a/recipes/default/classes/datasource_simplesample.py b/recipes/default/classes/datasource_simplesample.py
@@ -21,7 +21,7 @@
 logger = logging.getLogger('coshsh')
 
 def __ds_ident__(params={}):
-    if coshsh.util.compare_attr("type", params, "simplesample"):
+    if coshsh.util.compare_attr("type", params, "^simplesample$"):
         return SimpleSample
 
 

diff --git a/setup.py b/setup.py
@@ -54,7 +54,7 @@ def run(self):
 
 
 setup(name='coshsh',
-      version='10.2.1.1',
+      version='10.2.1.2',
       setup_requires=['wheel'],
       description='Coshsh - config generator for monitoring systems',
       long_description=open('README.md').read(),