style(mapstack): variables in macro can't be exported

No need to prefix some of them with underscore `_`.
saltstack-formulas · Jan 8, 2021 · a85ecb2 · a85ecb2
1 parent e512853
commit a85ecb2
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/openssh/libmapstack.jinja b/openssh/libmapstack.jinja
@@ -116,7 +116,7 @@
 {#-       1. the `value` #}
 {#-       3. the `defaults` #}
 {#-       4. the built-in #}
-{%-       set _strategy = matcher.value
+{%-       set strategy = matcher.value
           | traverse(
             "strategy",
             defaults
@@ -125,7 +125,7 @@
               "smart"
             )
           ) %}
-{%-       set _merge_lists = matcher.value
+{%-       set merge_lists = matcher.value
           | traverse(
             "merge_lists",
             defaults
@@ -158,9 +158,9 @@
               ~ "' retrieved with '"
               ~ matcher.query_method ~ "'"
               ~ ", merge: strategy='"
-              ~ _strategy
+              ~ strategy
               ~ "', lists='"
-              ~ _merge_lists
+              ~ merge_lists
               ~ "'"
               ~ ":\n"
               ~ value | yaml(False)
@@ -171,8 +171,8 @@
                 "values": salt["slsutil.merge"](
                   stack["values"],
                   value,
-                  strategy=_strategy,
-                  merge_lists=_merge_lists,
+                  strategy=strategy,
+                  merge_lists=merge_lists,
                 )
               }
             ) %}
@@ -238,12 +238,16 @@
                     | yaml(False)
                 ) %}
 
-{%-             set _strategy = yaml_values
+{#-             `slsutil.merge` options from #}
+{#-             1. the `value` #}
+{#-             3. the `defaults` #}
+{#-             4. the built-in #}
+{%-             set strategy = yaml_values
                   | traverse(
                     "strategy",
                     defaults | traverse("strategy", "smart")
                   ) %}
-{%-             set _merge_lists = yaml_values
+{%-             set merge_lists = yaml_values
                   | traverse(
                     "merge_lists",
                     defaults | traverse("merge_lists", False) | to_bool
@@ -254,8 +258,8 @@
                       stack["values"],
                       yaml_values
                       | traverse("values", {}),
-                      strategy=_strategy,
-                      merge_lists=_merge_lists,
+                      strategy=strategy,
+                      merge_lists=merge_lists,
                     )
                   }
                 ) %}
@@ -264,9 +268,9 @@
                   ~ "merged configuration values from "
                   ~ yaml_name
                   ~ ", merge: strategy='"
-                  ~ _strategy
+                  ~ strategy
                   ~ "', merge_lists='"
-                  ~ _merge_lists
+                  ~ merge_lists
                   ~ "':\n"
                   ~ {"values": stack["values"]}
                   | yaml(False)