Skip to content

Commit 63d283c

Browse files
authored
Merge pull request #314 from myii/feat/manage-map.jinja-verification-for-XYZ
feat(cert): review PRs 36 & 37
2 parents b4bcc0c + 6ec7485 commit 63d283c

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

ssf/defaults.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ ssf_node_anchors:
142142
driver:
143143
run_options: {}
144144
map_jinja:
145+
context: 'with'
145146
dir: ''
146147
filename: 'map.jinja'
147148
verification: {}

ssf/files/default/formula/_mapdata/init.sls

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ ${ "# vim: ft=sls" }
66
<% dir = map_jinja["dir"] %>\
77
<% filename = map_jinja["filename"] %>\
88
<% import_vars = map_jinja["verification"]["import"] %>\
9+
<% with_or_without = map_jinja["context"] %>\
910
% for import_var in import_vars:
10-
{%- from tplroot ~ "${ dir }/${ filename }" import ${ import_var } with context %}
11+
{%- from tplroot ~ "${ dir }/${ filename }" import ${ import_var } ${with_or_without} context %}
1112
% endfor
1213
1314
{%- set _mapdata = {

ssf/formulas.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -850,11 +850,13 @@ ssf:
850850
- ._mapdata
851851
- .
852852
map_jinja:
853+
context: 'without'
853854
verification:
854-
import: ['map']
855+
import: ['mapdata']
855856
platforms_matrix: *platforms_matrix_without_gentoo
856857
travis: *travis_do_not_use_single_job_for_linters
857-
semrel_files: *semrel_files_default
858+
use_libsaltcli: true
859+
semrel_files: *semrel_files_inc_map_jinja_verifier
858860
chrony:
859861
context:
860862
git:

0 commit comments

Comments
 (0)