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

Skip type-checking for several gitfs/git_pillar/winrepo params

Browse source 
In some edge cases, the branch/directory paths used here could have
values loaded as int/float/etc., which is not a problem for
salt.utils.gitfs since it normalizes these values to strings. Therefore,
this commit removes them from VALID_OPTS so that we skip type-checking
to avoid spurious warnings in the log file.
This commit is contained in:
Erik Johnson 2018-03-02 20:41:29 -06:00
parent a0716643e4
commit 5889b36646
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
salt/config/__init__.py
View file

@ -600,10 +600,11 @@ VALID_OPTS = {
# Frequency of the proxy_keep_alive, in minutes
'proxy_keep_alive_interval': int,
'git_pillar_base': str,
'git_pillar_branch': str,
'git_pillar_env': str,
'git_pillar_root': str,
# NOTE: git_pillar_base, git_pillar_branch, git_pillar_env, and
# git_pillar_root omitted here because their values could conceivably be
# loaded as non-string types, which is OK because git_pillar will normalize
# them to strings. But rather than include all the possible types they
# could be, we'll just skip type-checking.
'git_pillar_ssl_verify': bool,
'git_pillar_global_lock': bool,
'git_pillar_user': str,
@ -615,10 +616,11 @@ VALID_OPTS = {
'git_pillar_refspecs': list,
'git_pillar_includes': bool,
'git_pillar_verify_config': bool,
# NOTE: gitfs_base, gitfs_mountpoint, and gitfs_root omitted here because
# their values could conceivably be loaded as non-string types, which is OK
# because gitfs will normalize them to strings. But rather than include all
# the possible types they could be, we'll just skip type-checking.
'gitfs_remotes': list,
'gitfs_mountpoint': str,
'gitfs_root': str,
'gitfs_base': str,
'gitfs_user': str,
'gitfs_password': str,
'gitfs_insecure_auth': bool,
@ -820,6 +822,10 @@ VALID_OPTS = {
# (used by win_pkg.py, minion only)
'winrepo_source_dir': str,
# NOTE: winrepo_branch omitted here because its value could conceivably be
# loaded as a non-string type, which is OK because winrepo will normalize
# them to strings. But rather than include all the possible types it could
# be, we'll just skip type-checking.
'winrepo_dir': str,
'winrepo_dir_ng': str,
'winrepo_cachefile': str,
@ -827,7 +833,6 @@ VALID_OPTS = {
'winrepo_cache_expire_min': int,
'winrepo_remotes': list,
'winrepo_remotes_ng': list,
'winrepo_branch': str,
'winrepo_ssl_verify': bool,
'winrepo_user': str,
'winrepo_password': str,