Skip to content

fix(_mapdata): single variable should be at top level under values #287

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 14, 2021
Merged

fix(_mapdata): single variable should be at top level under values #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79e57eb
fix(_mapdata): single variable should be at top level under `values`
baby-gnu Jan 12, 2021
96e79f7
chore: remove defunct `map_jinja:version`
myii Jan 14, 2021
0b9bbb9
chore: finalise `_mapdata` PR
myii Jan 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ssf/defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ ssf_node_anchors:
# An alternative method could be to use:
# `git describe --abbrev=0 --tags`
# yamllint disable rule:line-length rule:quoted-strings
title: "test(map): verify '`'map.jinja'`' dump using '`'_mapdata'`' state"
body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/286'
title: "fix(_mapdata): ensure map data is directly under '`'values'`'"
body: '* Semi-automated using https://github.com/myii/ssf-formula/pull/287'
# yamllint enable rule:line-length rule:quoted-strings
github:
owner: 'saltstack-formulas'
Expand Down Expand Up @@ -134,7 +134,6 @@ ssf_node_anchors:
map_jinja:
filename: 'map.jinja'
verification: {}
version: 3
platforms:
# Could use `opensuse-leap` throughout since `/` never used at this end
# Would have to modify the `if` in the `kitchen.yml` template(s), though
Expand Down
4 changes: 2 additions & 2 deletions ssf/files/default/formula/_mapdata/init.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ ${ "# vim: ft=sls" }
% endfor

{%- set _mapdata = {
% if map_jinja["version"] > 3:
"values": mapdata,
% if len(import_vars) == 1:
"values": ${ import_vars[0] },
% else:
"values": {
% for import_var in import_vars:
Expand Down
1 change: 0 additions & 1 deletion ssf/formulas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3391,7 +3391,6 @@ ssf:
map_jinja:
verification:
import: ['mapdata']
version: 5
platforms: *platforms_new
platforms_matrix: *platforms_matrix_new_mainly_master_images
use_libsaltcli: true
Expand Down