refactor: moving jinja to libs subfolder

saltstack-formulas · Nov 16, 2022 · 8a974c7 · 8a974c7
1 parent 21ef5f5
commit 8a974c7
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 19 deletions.
diff --git a/TEMPLATE/_mapdata/init.sls b/TEMPLATE/_mapdata/init.sls
@@ -3,7 +3,7 @@
 ---
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split("/")[0] %}
-{%- from tplroot ~ "/jinja/map.jinja" import mapdata with context %}
+{%- from tplroot ~ "/libs/map.jinja" import mapdata with context %}
 
 {%- set _mapdata = {
       "values": mapdata,

diff --git a/TEMPLATE/config/clean.sls b/TEMPLATE/config/clean.sls
@@ -4,7 +4,7 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_service_clean = tplroot ~ '.service.clean' %}
-{%- from tplroot ~ "/jinja/map.jinja" import mapdata as TEMPLATE with context %}
+{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
 
 include:
   - {{ sls_service_clean }}

diff --git a/TEMPLATE/config/file.sls b/TEMPLATE/config/file.sls
@@ -4,8 +4,8 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_package_install = tplroot ~ '.package.install' %}
-{%- from tplroot ~ "/jinja/map.jinja" import mapdata as TEMPLATE with context %}
-{%- from tplroot ~ "/jinja/libtofs.jinja" import files_switch with context %}
+{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
+{%- from tplroot ~ "/libs/libtofs.jinja" import files_switch with context %}
 
 include:
   - {{ sls_package_install }}

diff --git a/TEMPLATE/jinja/libmapstack.jinja → TEMPLATE/libs/libmapstack.jinja b/TEMPLATE/jinja/libmapstack.jinja → TEMPLATE/libs/libmapstack.jinja
@@ -3,7 +3,7 @@
 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split("/")[0] %}
-{%- from tplroot ~ "/jinja/libmatchers.jinja" import parse_matchers, query_map with context %}
+{%- from tplroot ~ "/libs/libmatchers.jinja" import parse_matchers, query_map with context %}
 
 {%- set _default_config_dirs = [
       "parameters/",

diff --git a/TEMPLATE/jinja/libmatchers.jinja → TEMPLATE/libs/libmatchers.jinja b/TEMPLATE/jinja/libmatchers.jinja → TEMPLATE/libs/libmatchers.jinja
@@ -3,7 +3,7 @@
 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split("/")[0] %}
-{%- from tplroot ~ "/jinja/libsaltcli.jinja" import cli with context %}
+{%- from tplroot ~ "/libs/libsaltcli.jinja" import cli with context %}
 
 {%- set query_map = {
       "C": "config.get",

diff --git a/TEMPLATE/jinja/libsaltcli.jinja → TEMPLATE/libs/libsaltcli.jinja b/TEMPLATE/jinja/libsaltcli.jinja → TEMPLATE/libs/libsaltcli.jinja
diff --git a/TEMPLATE/jinja/libtofs.jinja → TEMPLATE/libs/libtofs.jinja b/TEMPLATE/jinja/libtofs.jinja → TEMPLATE/libs/libtofs.jinja
diff --git a/TEMPLATE/jinja/map.jinja → TEMPLATE/libs/map.jinja b/TEMPLATE/jinja/map.jinja → TEMPLATE/libs/map.jinja
@@ -3,7 +3,7 @@
 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split("/")[0] %}
-{%- from tplroot ~ "/jinja/libmapstack.jinja" import mapstack with context %}
+{%- from tplroot ~ "/libs/libmapstack.jinja" import mapstack with context %}
 
 {#- Where to lookup parameters source files #}
 {%- set formula_param_dir = tplroot ~ "/parameters" %}
@@ -63,4 +63,4 @@
 
 {#- Per formula post-processing of `mapdata` if it exists #}
 {%- do salt["log.debug"]("map.jinja: post-processing of 'mapdata'") %}
-{%- include tplroot ~ "/jinja/post-map.jinja" ignore missing %}
+{%- include tplroot ~ "/libs/post-map.jinja" ignore missing %}
diff --git a/TEMPLATE/package/clean.sls b/TEMPLATE/package/clean.sls
@@ -4,7 +4,7 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_config_clean = tplroot ~ '.config.clean' %}
-{%- from tplroot ~ "/jinja/map.jinja" import mapdata as TEMPLATE with context %}
+{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
 
 include:
   - {{ sls_config_clean }}

diff --git a/TEMPLATE/package/install.sls b/TEMPLATE/package/install.sls
@@ -3,7 +3,7 @@
 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
-{%- from tplroot ~ "/jinja/map.jinja" import mapdata as TEMPLATE with context %}
+{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
 
 TEMPLATE-package-install-pkg-installed:
   pkg.installed:

diff --git a/TEMPLATE/service/clean.sls b/TEMPLATE/service/clean.sls
@@ -3,7 +3,7 @@
 
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
-{%- from tplroot ~ "/jinja/map.jinja" import mapdata as TEMPLATE with context %}
+{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
 
 TEMPLATE-service-clean-service-dead:
   service.dead:

diff --git a/TEMPLATE/service/running.sls b/TEMPLATE/service/running.sls
@@ -4,7 +4,7 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_config_file = tplroot ~ '.config.file' %}
-{%- from tplroot ~ "/jinja/map.jinja" import mapdata as TEMPLATE with context %}
+{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
 
 include:
   - {{ sls_config_file }}

diff --git a/TEMPLATE/subcomponent/config/clean.sls b/TEMPLATE/subcomponent/config/clean.sls
@@ -4,7 +4,7 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_service_clean = tplroot ~ '.service.clean' %}
-{%- from tplroot ~ "/jinja/map.jinja" import mapdata as TEMPLATE with context %}
+{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
 
 include:
   - {{ sls_service_clean }}

diff --git a/TEMPLATE/subcomponent/config/file.sls b/TEMPLATE/subcomponent/config/file.sls
@@ -4,8 +4,8 @@
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- set sls_config_file = tplroot ~ '.config.file' %}
-{%- from tplroot ~ "/jinja/map.jinja" import mapdata as TEMPLATE with context %}
-{%- from tplroot ~ "/jinja/libtofs.jinja" import files_switch with context %}
+{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
+{%- from tplroot ~ "/libs/libtofs.jinja" import files_switch with context %}
 
 include:
   - {{ sls_config_file }}

diff --git a/docs/map.jinja.rst b/docs/map.jinja.rst
@@ -458,7 +458,7 @@ Here is the best way to use it in an ``sls`` file:
 
     {#- Get the `tplroot` from `tpldir` #}
     {%- set tplroot = tpldir.split("/")[0] %}
-    {%- from tplroot ~ "/jinja/map.jinja" import mapdata as TEMPLATE with context %}
+    {%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
 
     test-does-nothing-but-display-TEMPLATE-as-json:
       test.nop:
@@ -480,8 +480,8 @@ Here is an example based on `template-formula/TEMPLATE/config/file.sls`_:
     {#- Get the `tplroot` from `tpldir` #}
     {%- set tplroot = tpldir.split('/')[0] %}
     {%- set sls_package_install = tplroot ~ '.package.install' %}
-    {%- from tplroot ~ "/jinja/map.jinja" import mapdata as TEMPLATE with context %}
-    {%- from tplroot ~ "/jinja/libtofs.jinja" import files_switch with context %}
+    {%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
+    {%- from tplroot ~ "/libs/libtofs.jinja" import files_switch with context %}
 
     include:
       - {{ sls_package_install }}
@@ -536,7 +536,7 @@ This ``sls`` file expose a ``TEMPLATE`` context variable to the jinja template w
 .. _roots: https://docs.saltproject.io/en/latest/ref/file_server/all/salt.fileserver.roots.html
 .. _gitfs: https://docs.saltproject.io/en/latest/topics/tutorials/gitfs.html
 .. _salt.slsutil.merge: https://docs.saltproject.io/en/latest/ref/modules/all/salt.modules.slsutil.html#salt.modules.slsutil.merge
-.. _traverse: https://docs.saltproject.io/en/latest/topics/jinja/index.html#traverse
+.. _traverse: https://docs.saltproject.io/en/latest/topics/libs/index.html#traverse
 .. _salt-ssh: https://docs.saltproject.io/en/latest/topics/ssh/
 .. _template-formula/TEMPLATE/config/file.sls: https://github.com/saltstack-formulas/template-formula/blob/master/TEMPLATE/config/file.sls
 .. _bug 58726: https://github.com/saltstack/salt/issues/58726