refactor(map.jinja): standardise v5 structure [skip ci]

* Automated using myii/ssf-formula#382
saltstack-formulas · Oct 26, 2021 · 10db716 · 10db716
1 parent baae08d
commit 10db716
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -20,8 +20,11 @@
 /docs/CHANGELOG.rst                         @saltstack-formulas/ssf
 /docs/TOFS_pattern.rst                      @saltstack-formulas/ssf
 /*/_mapdata/                                @saltstack-formulas/ssf
+/*/libmapstack.jinja                        @saltstack-formulas/ssf
+/*/libmatchers.jinja                        @saltstack-formulas/ssf
 /*/libsaltcli.jinja                         @saltstack-formulas/ssf
 /*/libtofs.jinja                            @saltstack-formulas/ssf
+/*/map.jinja                                @saltstack-formulas/ssf
 /test/integration/**/_mapdata.rb            @saltstack-formulas/ssf
 /test/integration/**/libraries/system.rb    @saltstack-formulas/ssf
 /test/integration/**/inspec.yml             @saltstack-formulas/ssf

diff --git a/cert/libmapstack.jinja b/cert/libmapstack.jinja
@@ -12,7 +12,7 @@
 
 {#- `tplroot` is the directory of the current imported file #}
 {%- set tplroot = tpldir %}
-{%- from tplroot ~ "/libmatchers.jinja" import parse_matchers, query_map %}
+{%- from tplroot ~ "/libmatchers.jinja" import parse_matchers, query_map without context %}
 
 {%- set _default_config_dirs = [
       "parameters/",

diff --git a/cert/libmatchers.jinja b/cert/libmatchers.jinja
@@ -10,9 +10,9 @@
 {{-   raise("Import error: libmatchers.jinja must be imported with absolute path. tplfile='" ~ tplfile ~ "'") }}
 {%- endif %}
 
-{#- Get the `tplroot` from `tpldir` #}
+{#- `tplroot` is the directory of the current imported file #}
 {%- set tplroot = tpldir %}
-{%- from tplroot ~ "/libsaltcli.jinja" import cli %}
+{%- from tplroot ~ "/libsaltcli.jinja" import cli without context %}
 
 {%- set query_map = {
       "C": "config.get",