Skip to content

Commit

Permalink
refactor: moving jinja to separate dir for cleaner layout
Browse files Browse the repository at this point in the history
  • Loading branch information
@vveliev-tc
vveliev-tc committed Nov 16, 2022
1 parent fc04282 commit a5be79d
Show file tree
Hide file tree
Showing 15 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion TEMPLATE/_mapdata/init.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
---
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split("/")[0] %}
{%- from tplroot ~ "/map.jinja" import mapdata with context %}
{%- from tplroot ~ "/libs/map.jinja" import mapdata with context %}
{%- set _mapdata = {
"values": mapdata,
Expand Down
2 changes: 1 addition & 1 deletion TEMPLATE/config/clean.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- set sls_service_clean = tplroot ~ '.service.clean' %}
{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
include:
- {{ sls_service_clean }}
Expand Down
4 changes: 2 additions & 2 deletions TEMPLATE/config/file.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- set sls_package_install = tplroot ~ '.package.install' %}
{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
{%- from tplroot ~ "/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 }}
Expand Down
2 changes: 1 addition & 1 deletion TEMPLATE/libmapstack.jinja → TEMPLATE/libs/libmapstack.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split("/")[0] %}
{%- from tplroot ~ "/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/",
Expand Down
2 changes: 1 addition & 1 deletion TEMPLATE/libmatchers.jinja → TEMPLATE/libs/libmatchers.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split("/")[0] %}
{%- from tplroot ~ "/libsaltcli.jinja" import cli with context %}
{%- from tplroot ~ "/libs/libsaltcli.jinja" import cli with context %}

{%- set query_map = {
"C": "config.get",
Expand Down
0 TEMPLATE/libsaltcli.jinja → TEMPLATE/libs/libsaltcli.jinja
View file
File renamed without changes.
0 TEMPLATE/libtofs.jinja → TEMPLATE/libs/libtofs.jinja
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions TEMPLATE/map.jinja → TEMPLATE/libs/map.jinja
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split("/")[0] %}
{%- from tplroot ~ "/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" %}
Expand Down Expand Up @@ -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 ~ "/post-map.jinja" ignore missing %}
{%- include tplroot ~ "/libs/post-map.jinja" ignore missing %}
2 changes: 1 addition & 1 deletion TEMPLATE/package/clean.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- set sls_config_clean = tplroot ~ '.config.clean' %}
{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
include:
- {{ sls_config_clean }}
Expand Down
2 changes: 1 addition & 1 deletion TEMPLATE/package/install.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/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:
Expand Down
2 changes: 1 addition & 1 deletion TEMPLATE/service/clean.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- from tplroot ~ "/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:
Expand Down
2 changes: 1 addition & 1 deletion TEMPLATE/service/running.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- set sls_config_file = tplroot ~ '.config.file' %}
{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
include:
- {{ sls_config_file }}
Expand Down
2 changes: 1 addition & 1 deletion TEMPLATE/subcomponent/config/clean.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- set sls_service_clean = tplroot ~ '.service.clean' %}
{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
{%- from tplroot ~ "/libs/map.jinja" import mapdata as TEMPLATE with context %}
include:
- {{ sls_service_clean }}
Expand Down
4 changes: 2 additions & 2 deletions TEMPLATE/subcomponent/config/file.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- set sls_config_file = tplroot ~ '.config.file' %}
{%- from tplroot ~ "/map.jinja" import mapdata as TEMPLATE with context %}
{%- from tplroot ~ "/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 }}
Expand Down
6 changes: 3 additions & 3 deletions docs/map.jinja.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ~ "/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:
Expand All @@ -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 ~ "/map.jinja" import mapdata as TEMPLATE with context %}
{%- from tplroot ~ "/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 }}
Expand Down

0 comments on commit a5be79d

Please sign in to comment.