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

Deprecate gitfs_env_whitelist and gitfs_env_blacklist

Browse source
This commit is contained in:
ch3ll 2019-12-22 11:53:42 -05:00
parent a419182eb1
commit 80949f17e8
No known key found for this signature in database
GPG key ID: 1124C6796EBDBD8D
5 changed files with 3 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/ref/states/top.rst
View file

@ -379,7 +379,7 @@ disregarded:
With :ref:`GitFS <tutorial-gitfs>`, it can also be helpful to simply manage
each environment's top file separately, and/or manually specify the environment
when executing the highstate to avoid any complicated merging scenarios.
:conf_master:`gitfs_env_whitelist` and :conf_master:`gitfs_env_blacklist` can
:conf_master:`gitfs_saltenv_whitelist` and :conf_master:`gitfs_saltenv_blacklist` can
also be used to hide unneeded branches and tags from GitFS to reduce the number
of top files in play.

6
salt/config/__init__.py
View file

@ -689,8 +689,6 @@ VALID_OPTS = immutabletypes.freeze({
'gitfs_privkey': six.string_types,
'gitfs_pubkey': six.string_types,
'gitfs_passphrase': six.string_types,
'gitfs_env_whitelist': list,
'gitfs_env_blacklist': list,
'gitfs_saltenv_whitelist': list,
'gitfs_saltenv_blacklist': list,
'gitfs_ssl_verify': bool,
@ -1318,8 +1316,6 @@ DEFAULT_MINION_OPTS = immutabletypes.freeze({
'gitfs_privkey': '',
'gitfs_pubkey': '',
'gitfs_passphrase': '',
'gitfs_env_whitelist': [],
'gitfs_env_blacklist': [],
'gitfs_saltenv_whitelist': [],
'gitfs_saltenv_blacklist': [],
'gitfs_global_lock': True,
@ -1563,8 +1559,6 @@ DEFAULT_MASTER_OPTS = immutabletypes.freeze({
'gitfs_privkey': '',
'gitfs_pubkey': '',
'gitfs_passphrase': '',
'gitfs_env_whitelist': [],
'gitfs_env_blacklist': [],
'gitfs_saltenv_whitelist': [],
'gitfs_saltenv_blacklist': [],
'gitfs_global_lock': True,

4
salt/fileserver/gitfs.py
View file

@ -55,8 +55,8 @@ import logging
PER_REMOTE_OVERRIDES = (
'base', 'mountpoint', 'root', 'ssl_verify',
'saltenv_whitelist', 'saltenv_blacklist',
'env_whitelist', 'env_blacklist', 'refspecs',
'disable_saltenv_mapping', 'ref_types', 'update_interval',
'refspecs', 'disable_saltenv_mapping',
'ref_types', 'update_interval',
)
PER_REMOTE_ONLY = ('all_saltenvs', 'name', 'saltenv')

13
salt/utils/gitfs.py
View file

@ -159,8 +159,6 @@ def enforce_types(key, val):
'ssl_verify': bool,
'insecure_auth': bool,
'disable_saltenv_mapping': bool,
'env_whitelist': 'stringlist',
'env_blacklist': 'stringlist',
'saltenv_whitelist': 'stringlist',
'saltenv_blacklist': 'stringlist',
'refspecs': 'stringlist',
@ -391,17 +389,6 @@ class GitProvider(object):
'\'%s\'.', default_refspecs, self.role, self.id
)
for item in ('env_whitelist', 'env_blacklist'):
val = getattr(self, item, None)
if val:
salt.utils.versions.warn_until(
'Neon',
'The gitfs_{0} config option (and {0} per-remote config '
'option) have been renamed to gitfs_salt{0} (and '
'salt{0}). Please update your configuration.'.format(item)
)
setattr(self, 'salt{0}'.format(item), val)
# Discard the conf dictionary since we have set all of the config
# params as attributes
delattr(self, 'conf')

3
tests/unit/fileserver/test_gitfs.py
View file

@ -92,7 +92,6 @@ class GitfsConfigTestCase(TestCase, LoaderModuleMockMixin):
'transport': 'zeromq',
'gitfs_mountpoint': '',
'gitfs_saltenv': [],
'gitfs_env_whitelist': [],
'gitfs_env_blacklist': [],
'gitfs_saltenv_whitelist': [],
'gitfs_saltenv_blacklist': [],
@ -488,7 +487,6 @@ class GitPythonTest(GitFSTestBase, GitFSTestFuncs, TestCase, LoaderModuleMockMix
'transport': 'zeromq',
'gitfs_mountpoint': '',
'gitfs_saltenv': [],
'gitfs_env_whitelist': [],
'gitfs_env_blacklist': [],
'gitfs_saltenv_whitelist': [],
'gitfs_saltenv_blacklist': [],
@ -534,7 +532,6 @@ class Pygit2Test(GitFSTestBase, GitFSTestFuncs, TestCase, LoaderModuleMockMixin)
'transport': 'zeromq',
'gitfs_mountpoint': '',
'gitfs_saltenv': [],
'gitfs_env_whitelist': [],
'gitfs_env_blacklist': [],
'gitfs_saltenv_whitelist': [],
'gitfs_saltenv_blacklist': [],