2
0

style(libtofs.jinja): use Black-inspired Jinja formatting [skip ci]

* Automated using https://github.com/myii/ssf-formula/pull/237
This commit is contained in:
Imran Iqbal 2020-07-19 23:28:36 +01:00
parent 88b5b451b2
commit 76e820c36f

View File

@ -1,40 +1,37 @@
{%- macro files_switch(source_files, {%- macro files_switch(
lookup=None, source_files,
default_files_switch=['id', 'os_family'], lookup=None,
indent_width=6, default_files_switch=["id", "os_family"],
use_subpath=False) %} indent_width=6,
{#- use_subpath=False
) %}
{#-
Returns a valid value for the "source" parameter of a "file.managed" Returns a valid value for the "source" parameter of a "file.managed"
state function. This makes easier the usage of the Template Override and state function. This makes easier the usage of the Template Override and
Files Switch (TOFS) pattern. Files Switch (TOFS) pattern.
Params: Params:
* source_files: ordered list of files to look for * source_files: ordered list of files to look for
* lookup: key under '<tplroot>:tofs:source_files' to prepend to the * lookup: key under "<tplroot>:tofs:source_files" to prepend to the
list of source files list of source files
* default_files_switch: if there's no config (e.g. pillar) * default_files_switch: if there's no config (e.g. pillar)
'<tplroot>:tofs:files_switch' this is the ordered list of grains to "<tplroot>:tofs:files_switch" this is the ordered list of grains to
use as selector switch of the directories under use as selector switch of the directories under
"<path_prefix>/files" "<path_prefix>/files"
* indent_width: indentation of the result value to conform to YAML * indent_width: indentation of the result value to conform to YAML
* use_subpath: defaults to `False` but if set, lookup the source file * use_subpath: defaults to `False` but if set, lookup the source file
recursively from the current state directory up to `tplroot` recursively from the current state directory up to `tplroot`
Example (based on a `tplroot` of `xxx`): Example (based on a `tplroot` of `xxx`):
If we have a state: If we have a state:
Deploy configuration: Deploy configuration:
file.managed: file.managed:
- name: /etc/yyy/zzz.conf - name: /etc/yyy/zzz.conf
- source: {{ files_switch(['/etc/yyy/zzz.conf', '/etc/yyy/zzz.conf.jinja'], - source: {{ files_switch(
lookup='Deploy configuration' ["/etc/yyy/zzz.conf", "/etc/yyy/zzz.conf.jinja"],
) }} lookup="Deploy configuration",
) }}
- template: jinja - template: jinja
In a minion with id=theminion and os_family=RedHat, it's going to be In a minion with id=theminion and os_family=RedHat, it's going to be
rendered as: rendered as:
Deploy configuration: Deploy configuration:
file.managed: file.managed:
- name: /etc/yyy/zzz.conf - name: /etc/yyy/zzz.conf
@ -46,67 +43,73 @@
- salt://xxx/files/default/etc/yyy/zzz.conf - salt://xxx/files/default/etc/yyy/zzz.conf
- salt://xxx/files/default/etc/yyy/zzz.conf.jinja - salt://xxx/files/default/etc/yyy/zzz.conf.jinja
- template: jinja - template: jinja
#} #}
{#- Get the `tplroot` from `tpldir` #} {#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %} {%- set tplroot = tpldir.split("/")[0] %}
{%- set path_prefix = salt['config.get'](tplroot ~ ':tofs:path_prefix', tplroot) %} {%- set path_prefix = salt["config.get"](tplroot ~ ":tofs:path_prefix", tplroot) %}
{%- set files_dir = salt['config.get'](tplroot ~ ':tofs:dirs:files', 'files') %} {%- set files_dir = salt["config.get"](tplroot ~ ":tofs:dirs:files", "files") %}
{%- set files_switch_list = salt['config.get']( {%- set files_switch_list = salt["config.get"](
tplroot ~ ':tofs:files_switch', tplroot ~ ":tofs:files_switch", default_files_switch
default_files_switch ) %}
) %} {#- Lookup source_files (v2), files (v1), or fallback to an empty list #}
{#- Lookup source_files (v2), files (v1), or fallback to an empty list #} {%- set src_files = salt["config.get"](
{%- set src_files = salt['config.get']( tplroot ~ ":tofs:source_files:" ~ lookup,
tplroot ~ ':tofs:source_files:' ~ lookup, salt["config.get"](tplroot ~ ":tofs:files:" ~ lookup, []),
salt['config.get'](tplroot ~ ':tofs:files:' ~ lookup, []) ) %}
) %} {#- Append the default source_files #}
{#- Append the default source_files #} {%- set src_files = src_files + source_files %}
{%- set src_files = src_files + source_files %} {#- Only add to [""] when supporting older TOFS implementations #}
{#- Only add to [''] when supporting older TOFS implementations #} {%- set path_prefix_exts = [""] %}
{%- set path_prefix_exts = [''] %} {%- if use_subpath and tplroot != tpldir %}
{%- if use_subpath and tplroot != tpldir %} {#- Walk directory tree to find {{ files_dir }} #}
{#- Walk directory tree to find {{ files_dir }} #} {%- set subpath_parts = tpldir.lstrip(tplroot).lstrip("/").split("/") %}
{%- set subpath_parts = tpldir.lstrip(tplroot).lstrip('/').split('/') %} {%- for path in subpath_parts %}
{%- for path in subpath_parts %} {%- set subpath = subpath_parts[0 : loop.index] | join("/") %}
{%- set subpath = subpath_parts[0:loop.index] | join('/') %} {%- do path_prefix_exts.append("/" ~ subpath) %}
{%- do path_prefix_exts.append('/' ~ subpath) %} {%- endfor %}
{%- endfor %} {%- endif %}
{%- endif %} {%- for path_prefix_ext in path_prefix_exts | reverse %}
{%- for path_prefix_ext in path_prefix_exts|reverse %} {%- set path_prefix_inc_ext = path_prefix ~ path_prefix_ext %}
{%- set path_prefix_inc_ext = path_prefix ~ path_prefix_ext %} {#- For older TOFS implementation, use `files_switch` from the config #}
{#- For older TOFS implementation, use `files_switch` from the config #} {#- Use the default, new method otherwise #}
{#- Use the default, new method otherwise #} {%- set fsl = salt["config.get"](
{%- set fsl = salt['config.get']( tplroot ~ path_prefix_ext | replace("/", ":") ~ ":files_switch",
tplroot ~ path_prefix_ext|replace('/', ':') ~ ':files_switch', files_switch_list,
files_switch_list ) %}
) %} {#- Append an empty value to evaluate as `default` in the loop below #}
{#- Append an empty value to evaluate as `default` in the loop below #} {%- if "" not in fsl %}
{%- if '' not in fsl %} {%- set fsl = fsl + [""] %}
{%- set fsl = fsl + [''] %} {%- endif %}
{%- endif %} {%- for fs in fsl %}
{%- for fs in fsl %} {%- for src_file in src_files %}
{%- for src_file in src_files %} {%- if fs %}
{%- if fs %} {%- set fs_dirs = salt["config.get"](fs, fs) %}
{%- set fs_dirs = salt['config.get'](fs, fs) %} {%- else %}
{%- else %} {%- set fs_dirs = salt["config.get"](
{%- set fs_dirs = salt['config.get'](tplroot ~ ':tofs:dirs:default', 'default') %} tplroot ~ ":tofs:dirs:default", "default"
{%- endif %} ) %}
{#- Force the `config.get` lookup result as a list where necessary #} {%- endif %}
{#- since we need to also handle grains that are lists #} {#- Force the `config.get` lookup result as a list where necessary #}
{%- if fs_dirs is string %} {#- since we need to also handle grains that are lists #}
{%- set fs_dirs = [fs_dirs] %} {%- if fs_dirs is string %}
{%- endif %} {%- set fs_dirs = [fs_dirs] %}
{%- for fs_dir in fs_dirs %} {%- endif %}
{%- set url = [ {%- for fs_dir in fs_dirs %}
'- salt:/', {#- strip empty elements by using a select #}
path_prefix_inc_ext.strip('/'), {%- set url = (
files_dir.strip('/'), [
fs_dir.strip('/'), "- salt:/",
src_file.strip('/'), path_prefix_inc_ext.strip("/"),
] | select | join('/') %} files_dir.strip("/"),
fs_dir.strip("/"),
src_file.strip("/"),
]
| select
| join("/")
) %}
{{ url | indent(indent_width, true) }} {{ url | indent(indent_width, true) }}
{%- endfor %} {%- endfor %}
{%- endfor %} {%- endfor %}
{%- endfor %} {%- endfor %}
{%- endfor %} {%- endfor %}
{%- endmacro %} {%- endmacro %}