Add require option to tower.get

If set to True it will raise a KeyError instead of returning None if the
pillar key is not found.

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Add require option to tower.get
 
 ## [1.5.2] - 2021-02-10
 ### Fixed

README.md

@@ -376,14 +376,16 @@ The above example demonstrates different usages. The first example will only wor
 
 The `tower` pillar object is available in all rendering engines and can be used for low-level interaction with the ext_pillar engine. Some available functions are:
 
-##### tower.get(key, default=None)
+##### tower.get(key, default=None, require=False)
 
 Get a pillar value by given traverse path:
 
 ```python
 tower.get('my:pillar:key')
 ```
 
+If `require=True` is set, `default` will be ignored and a KeyError will be raised if the pillar key is not found.
+
 ##### tower.update(dict)
 
 Merges given dictionary into the pillar data.

salt_tower/pillar/tower.py

@@ -80,8 +80,13 @@ def __init__(self, minion_id, env, pillar):
             )
             self._default_renderers = "jinja|yaml"
 
-    def get(self, key, default=None, **kwargs):
-        return traverse_dict_and_list(self, key, default, **kwargs)
+    def get(self, key, default=None, require=False, **kwargs):
+        if require:
+            default = KeyError(f"Pillar key missing: {key}")
+        value = traverse_dict_and_list(self, key, default, **kwargs)
+        if isinstance(value, KeyError):
+            raise value
+        return value
 
     def update(self, obj, merge=True, **kwargs):
         if merge:

test/pillar/test_tower_tower.py

@@ -32,6 +32,9 @@ def test_get_default(tower):
 def test_get_default_value(tower):
     assert tower.get('pillar:none', default=5) == 5
 
+def test_get_default_require(tower):
+    with pytest.raises(KeyError):
+        tower.get('pillar:none', require=True)
 
 def test_update(tower):
     tower.update({

tox.ini

@@ -10,6 +10,7 @@ envlist =
 [testenv]
 deps =
     pytest
+    salt: salt
     salt3002: salt~=3002.0
     salt3001: salt~=3001.0
     salt3000: salt~=3000.0