saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #34257 from rallytime/fix-34037

Browse source 
Use 'config_dir' setting instead of CONFIG_DIR in gpg renderer
This commit is contained in:
Mike Place 2016-06-24 10:25:04 -07:00 • committed by GitHub
commit 65c5675a3f
2 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/renderers/gpg.py
View file

@ -123,10 +123,14 @@ def _get_key_dir():
'''
return the location of the GPG key directory
'''
if __salt__['config.get']('gpg_keydir'):
return __salt__['config.get']('gpg_keydir')
else:
return os.path.join(salt.syspaths.CONFIG_DIR, 'gpgkeys')
key_dir = __salt__['config.get']('gpg_keydir')
if not key_dir:
key_dir = os.path.join(
__salt__['config.get']('config_dir'),
'gpgkeys'
)
return key_dir
def _decrypt_ciphertext(cipher):

12
tests/unit/renderers/gpg_test.py
View file

@ -39,18 +39,6 @@ class GPGTestCase(TestCase):
with patch('salt.utils.which', MagicMock(return_value=False)):
self.assertRaises(SaltRenderError, gpg._get_gpg_exec)
def test__get_key_dir(self):
'''
test _get_key_dir
'''
cfg_dir = '/gpg/cfg/dir'
with patch.dict(gpg.__salt__, {'config.get': MagicMock(return_value=cfg_dir)}):
self.assertEqual(gpg._get_key_dir(), cfg_dir)
def_dir = '/etc/salt/gpgkeys'
with patch.dict(gpg.__salt__, {'config.get': MagicMock(return_value=False)}):
self.assertEqual(gpg._get_key_dir(), def_dir)
def test__decrypt_ciphertext(self):
'''
test _decrypt_ciphertext