feat: use `semantic-release` cross-formula standard structure
* Semi-automated using https://github.com/myii/ssf-formula/pull/31
* Includes:
- Update TOFS
- Use `bin/kitchen`
- Use `dist: bionic` in Travis
- Add `yamllint` and apply rules
- Use `pillars_from_files` throughout
- Replace EOL images in Kitchen & Travis
- Add `develop` images in Kitchen & Travis
* Fix (or ignore) errors shown below:
```bash
salt-formula$ yamllint -s .
./pillar.example
1:1 warning missing document start "---" (document-start)
5:23 warning truthy value should be one of [false, true] (truthy)
8:25 warning truthy value should be one of [false, true] (truthy)
11:25 warning truthy value should be one of [false, true] (truthy)
19:21 warning truthy value should be one of [false, true] (truthy)
40:89 error line too long (108 > 88 characters) (line-length)
41:89 error line too long (112 > 88 characters) (line-length)
43:89 error line too long (112 > 88 characters) (line-length)
45:89 error line too long (110 > 88 characters) (line-length)
47:89 error line too long (89 > 88 characters) (line-length)
74:27 warning truthy value should be one of [false, true] (truthy)
82:9 error wrong indentation: expected 10 but found 8 (indentation)
101:14 warning truthy value should be one of [false, true] (truthy)
102:20 warning truthy value should be one of [false, true] (truthy)
103:89 error line too long (119 > 88 characters) (line-length)
121:7 warning comment not indented like content (comments-indentation)
122:24 error syntax error: found character '%' that cannot start any token
310:89 error line too long (102 > 88 characters) (line-length)
330:89 error line too long (113 > 88 characters) (line-length)
433:1 error too many blank lines (1 > 0) (empty-lines)
./salt/osmap.yaml
4:2 error syntax error: found character '%' that cannot start any token
6:89 error line too long (93 > 88 characters) (line-length)
22:89 error line too long (137 > 88 characters) (line-length)
23:89 error line too long (134 > 88 characters) (line-length)
33:89 error line too long (149 > 88 characters) (line-length)
34:89 error line too long (146 > 88 characters) (line-length)
./salt/osfamilymap.yaml
4:2 error syntax error: found character '%' that cannot start any token
6:89 error line too long (94 > 88 characters) (line-length)
24:89 error line too long (149 > 88 characters) (line-length)
25:89 error line too long (146 > 88 characters) (line-length)
39:89 error line too long (105 > 88 characters) (line-length)
40:89 error line too long (127 > 88 characters) (line-length)
56:89 error line too long (101 > 88 characters) (line-length)
./salt/ospyvermap.yaml
4:1 warning missing document start "---" (document-start)
./salt/defaults.yaml
3:1 warning missing document start "---" (document-start)
7:21 warning truthy value should be one of [false, true] (truthy)
8:12 warning truthy value should be one of [false, true] (truthy)
9:23 warning truthy value should be one of [false, true] (truthy)
10:19 warning truthy value should be one of [false, true] (truthy)
14:25 warning truthy value should be one of [false, true] (truthy)
15:25 warning truthy value should be one of [false, true] (truthy)
16:27 warning truthy value should be one of [false, true] (truthy)
17:27 warning truthy value should be one of [false, true] (truthy)
39:28 warning truthy value should be one of [false, true] (truthy)
41:28 warning truthy value should be one of [false, true] (truthy)
45:24 warning truthy value should be one of [false, true] (truthy)
49:30 warning truthy value should be one of [false, true] (truthy)
54:28 warning truthy value should be one of [false, true] (truthy)
63:25 warning truthy value should be one of [false, true] (truthy)
68:15 warning truthy value should be one of [false, true] (truthy)
```
5 лет назад |
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115 |
- {%- macro files_switch(
- source_files,
- lookup=None,
- default_files_switch=["id", "os_family"],
- indent_width=6,
- use_subpath=False
- ) %}
- {#-
- Returns a valid value for the "source" parameter of a "file.managed"
- state function. This makes easier the usage of the Template Override and
- Files Switch (TOFS) pattern.
- Params:
- * source_files: ordered list of files to look for
- * lookup: key under "<tplroot>:tofs:source_files" to prepend to the
- list of source files
- * default_files_switch: if there's no config (e.g. pillar)
- "<tplroot>:tofs:files_switch" this is the ordered list of grains to
- use as selector switch of the directories under
- "<path_prefix>/files"
- * indent_width: indentation of the result value to conform to YAML
- * use_subpath: defaults to `False` but if set, lookup the source file
- recursively from the current state directory up to `tplroot`
- Example (based on a `tplroot` of `xxx`):
- If we have a state:
- Deploy configuration:
- file.managed:
- - name: /etc/yyy/zzz.conf
- - source: {{ files_switch(
- ["/etc/yyy/zzz.conf", "/etc/yyy/zzz.conf.jinja"],
- lookup="Deploy configuration",
- ) }}
- - template: jinja
- In a minion with id=theminion and os_family=RedHat, it's going to be
- rendered as:
- Deploy configuration:
- file.managed:
- - name: /etc/yyy/zzz.conf
- - source:
- - salt://xxx/files/theminion/etc/yyy/zzz.conf
- - salt://xxx/files/theminion/etc/yyy/zzz.conf.jinja
- - salt://xxx/files/RedHat/etc/yyy/zzz.conf
- - salt://xxx/files/RedHat/etc/yyy/zzz.conf.jinja
- - salt://xxx/files/default/etc/yyy/zzz.conf
- - salt://xxx/files/default/etc/yyy/zzz.conf.jinja
- - template: jinja
- #}
- {#- Get the `tplroot` from `tpldir` #}
- {%- set tplroot = tpldir.split("/")[0] %}
- {%- set path_prefix = salt["config.get"](tplroot ~ ":tofs:path_prefix", tplroot) %}
- {%- set files_dir = salt["config.get"](tplroot ~ ":tofs:dirs:files", "files") %}
- {%- set files_switch_list = salt["config.get"](
- tplroot ~ ":tofs:files_switch", default_files_switch
- ) %}
- {#- Lookup source_files (v2), files (v1), or fallback to an empty list #}
- {%- set src_files = salt["config.get"](
- tplroot ~ ":tofs:source_files:" ~ lookup,
- salt["config.get"](tplroot ~ ":tofs:files:" ~ lookup, []),
- ) %}
- {#- Append the default source_files #}
- {%- set src_files = src_files + source_files %}
- {#- Only add to [""] when supporting older TOFS implementations #}
- {%- set path_prefix_exts = [""] %}
- {%- if use_subpath and tplroot != tpldir %}
- {#- Walk directory tree to find {{ files_dir }} #}
- {%- set subpath_parts = tpldir.lstrip(tplroot).lstrip("/").split("/") %}
- {%- for path in subpath_parts %}
- {%- set subpath = subpath_parts[0 : loop.index] | join("/") %}
- {%- do path_prefix_exts.append("/" ~ subpath) %}
- {%- endfor %}
- {%- endif %}
- {%- for path_prefix_ext in path_prefix_exts | reverse %}
- {%- set path_prefix_inc_ext = path_prefix ~ path_prefix_ext %}
- {#- For older TOFS implementation, use `files_switch` from the config #}
- {#- Use the default, new method otherwise #}
- {%- set fsl = salt["config.get"](
- tplroot ~ path_prefix_ext | replace("/", ":") ~ ":files_switch",
- files_switch_list,
- ) %}
- {#- Append an empty value to evaluate as `default` in the loop below #}
- {%- if "" not in fsl %}
- {%- set fsl = fsl + [""] %}
- {%- endif %}
- {%- for fs in fsl %}
- {%- for src_file in src_files %}
- {%- if fs %}
- {%- set fs_dirs = salt["config.get"](fs, fs) %}
- {%- else %}
- {%- set fs_dirs = salt["config.get"](
- tplroot ~ ":tofs:dirs:default", "default"
- ) %}
- {%- endif %}
- {#- Force the `config.get` lookup result as a list where necessary #}
- {#- since we need to also handle grains that are lists #}
- {%- if fs_dirs is string %}
- {%- set fs_dirs = [fs_dirs] %}
- {%- endif %}
- {%- for fs_dir in fs_dirs %}
- {#- strip empty elements by using a select #}
- {%- set url = (
- [
- "- salt:/",
- path_prefix_inc_ext.strip("/"),
- files_dir.strip("/"),
- fs_dir.strip("/"),
- src_file.strip("/"),
- ]
- | select
- | join("/")
- ) %}
- {{ url | indent(indent_width, true) }}
- {%- endfor %}
- {%- endfor %}
- {%- endfor %}
- {%- endfor %}
- {%- endmacro %}
|