Merge pull request #314 from myii/feat/manage-map.jinja-verification-…

…for-XYZ feat(cert): review PRs 36 & 37
myii · Apr 14, 2021 · 63d283c · 63d283c
2 parents b4bcc0c + 6ec7485
commit 63d283c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
@@ -142,6 +142,7 @@ ssf_node_anchors:
           driver:
             run_options: {}
         map_jinja:
+          context: 'with'
           dir: ''
           filename: 'map.jinja'
           verification: {}

diff --git a/ssf/files/default/formula/_mapdata/init.sls b/ssf/files/default/formula/_mapdata/init.sls
@@ -6,8 +6,9 @@ ${ "# vim: ft=sls" }
 <% dir = map_jinja["dir"] %>\
 <% filename = map_jinja["filename"] %>\
 <% import_vars = map_jinja["verification"]["import"] %>\
+<% with_or_without = map_jinja["context"] %>\
 % for import_var in import_vars:
-{%- from tplroot ~ "${ dir }/${ filename }" import ${ import_var } with context %}
+{%- from tplroot ~ "${ dir }/${ filename }" import ${ import_var } ${with_or_without} context %}
 % endfor
 
 {%- set _mapdata = {

diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml
@@ -850,11 +850,13 @@ ssf:
                     - ._mapdata
                     - .
         map_jinja:
+          context: 'without'
           verification:
-            import: ['map']
+            import: ['mapdata']
         platforms_matrix: *platforms_matrix_without_gentoo
         travis: *travis_do_not_use_single_job_for_linters
-      semrel_files: *semrel_files_default
+        use_libsaltcli: true
+      semrel_files: *semrel_files_inc_map_jinja_verifier
     chrony:
       context:
         git: