Merge b575030dd6 into 6898f5bb02

2025-04-17 10:10:28 +00:00 · 2025-03-10 23:35:14 +05:00 · 2025-03-10 23:35:14 +05:00 · 12c5ccce53
commit 12c5ccce53
parent 6898f5bb02 b575030dd6
33 changed files with 139 additions and 17 deletions
--- a/TEMPLATE/libmatchers.jinja
+++ b/TEMPLATE/libmatchers.jinja
@ -161,28 +161,39 @@
          ) %}
 {%-     endif %}

-{#-     Add `merge:` option to `salt["config.get"]` if configured #}
-{%-     if cli not in ["ssh", "unknown"] and parsed.query_method == "config.get" and config_get_strategy %}
-{%-       set query_opts = {
-            "merge": config_get_strategy,
-            "delimiter": parsed.query_delimiter,
-          } %}
+{#-     Defaults for query #}
+{%-     set query_opts = {
+          "delimiter": parsed.query_delimiter,
+        } %}
+{%-     set query_opts_msg = (
+          ", delimiter='"
+          ~ parsed.query_delimiter
+          ~ "'"
+        ) %}
+
+{#-     Add `merge:` option to `salt["config.get"]` if config_get_strategy is provided #}
+{%-     if parsed.query_method == "config.get" and config_get_strategy %}
+{%-       do query_opts.update(
+            {
+              "merge": config_get_strategy
+            }
+          ) %}
 {%-       set query_opts_msg = (
-            ", delimiter='"
-            ~ parsed.query_delimiter
+            query_opts_msg
            ~ "', merge: strategy='"
            ~ config_get_strategy
            ~ "'"
          ) %}
-{%-     else %}
-{%-       if cli in ["ssh", "unknown"] %}
-{%-         do salt["log.warning"](
-              log_prefix
-              ~ "the 'delimiter' and 'merge' options of 'config.get' are skipped when the salt command type is '"
-              ~ cli
-              ~ "'"
-            ) %}
-{%-       endif %}
+{%-     endif  %}
+
+{#-     Reset 'query_opts' and 'query_opts_msg' if 'cli' is 'ssh' or 'unknown' #}
+{%-     if cli in ["ssh", "unknown"] %}
+{%-       do salt["log.warning"](
+            log_prefix
+            ~ "the 'delimiter' and 'merge' options of 'config.get' are skipped when the salt command type is '"
+            ~ cli
+            ~ "'"
+          ) %}
 {%-       set query_opts = {} %}
 {%-       set query_opts_msg = "" %}
 {%-     endif %}
--- a/bin/convert-formula.sh
+++ b/bin/convert-formula.sh
@ -64,6 +64,8 @@ convert_formula() {

  git mv TEMPLATE "$NEW_NAME"

+  git mv test/salt/states/TEMPLATE "test/salt/states/$NEW_NAME"
+
  # Replace TEMPLATE within sls and jinja files with py-safe formula name
  # due to python limitations on identifier names (no hyphen)
  # including when specifying jinja context variables
--- a/kitchen.yml
+++ b/kitchen.yml
@ -19,6 +19,11 @@ provisioner:
    - .git
  pillars_from_directories:
    - test/salt/pillar
+  dependencies:
+    - name: parameters
+      path: ./test/salt/states
+    - name: TEMPLATE
+      path: ./test/salt/states

 platforms:
  ## SALT `tiamat`
--- a/test/integration/default/files/_mapdata/almalinux-8.yaml
+++ b/test/integration/default/files/_mapdata/almalinux-8.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/amazonlinux-1.yaml
+++ b/test/integration/default/files/_mapdata/amazonlinux-1.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: cronie
  rootgroup: root
--- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml
+++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/arch-base-latest.yaml
+++ b/test/integration/default/files/_mapdata/arch-base-latest.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/centos-6.yaml
+++ b/test/integration/default/files/_mapdata/centos-6.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: cronie
  rootgroup: root
--- a/test/integration/default/files/_mapdata/centos-7.yaml
+++ b/test/integration/default/files/_mapdata/centos-7.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/centos-8.yaml
+++ b/test/integration/default/files/_mapdata/centos-8.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/debian-10.yaml
+++ b/test/integration/default/files/_mapdata/debian-10.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/debian-11.yaml
+++ b/test/integration/default/files/_mapdata/debian-11.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/debian-9.yaml
+++ b/test/integration/default/files/_mapdata/debian-9.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/fedora-31.yaml
+++ b/test/integration/default/files/_mapdata/fedora-31.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/fedora-32.yaml
+++ b/test/integration/default/files/_mapdata/fedora-32.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/fedora-33.yaml
+++ b/test/integration/default/files/_mapdata/fedora-33.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/fedora-34.yaml
+++ b/test/integration/default/files/_mapdata/fedora-34.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/fedora-35.yaml
+++ b/test/integration/default/files/_mapdata/fedora-35.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/fedora-36.yaml
+++ b/test/integration/default/files/_mapdata/fedora-36.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
+++ b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: app-shells/bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
+++ b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: app-shells/bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/opensuse-15.yaml
+++ b/test/integration/default/files/_mapdata/opensuse-15.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
+++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/oraclelinux-7.yaml
+++ b/test/integration/default/files/_mapdata/oraclelinux-7.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/oraclelinux-8.yaml
+++ b/test/integration/default/files/_mapdata/oraclelinux-8.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/rockylinux-8.yaml
+++ b/test/integration/default/files/_mapdata/rockylinux-8.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/ubuntu-16.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/ubuntu-18.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/ubuntu-20.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/integration/default/files/_mapdata/ubuntu-22.yaml
+++ b/test/integration/default/files/_mapdata/ubuntu-22.yaml
@ -20,7 +20,10 @@ values:
    - C@TEMPLATE:lookup
    - C@TEMPLATE
    - Y:G@id
+    - Y:I:!@nested!pillar
  master: template-master
+  nested:
+    added_in_value: yaml
  pkg:
    name: bash
  rootgroup: root
--- a/test/salt/pillar/default.sls
+++ b/test/salt/pillar/default.sls
@ -55,3 +55,7 @@ TEMPLATE:
  # Just for testing purposes
  winner: pillar
  added_in_pillar: pillar_value
+  nested:
+    added_in_value: pillar
+nested:
+  pillar: nested_pillar_value
--- a/test/salt/states/TEMPLATE/parameters/nested!pillar/nested_pillar_value.yaml
+++ b/test/salt/states/TEMPLATE/parameters/nested!pillar/nested_pillar_value.yaml
@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Used to test custom delimiters
+---
+values:
+  nested:
+    added_in_value: yaml
+...
--- a/test/salt/states/parameters/map_jinja.yaml
+++ b/test/salt/states/parameters/map_jinja.yaml
@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+#
+# Used to test custom delimiters
+---
+merge_lists: true
+values:
+  sources:
+    - Y:I:!@nested!pillar
+...