ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Revert "make callbacks declare needing whitelisting"

Browse source 
another premature merge
This reverts commit df8ff85787.
This commit is contained in:
Brian Coca 2015-10-22 16:34:51 -04:00
parent 3c1c5b060c
commit 5017a96948
10 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/executor/task_queue_manager.py
View file

@ -150,13 +150,12 @@ class TaskQueueManager:
# the name of the current plugin and type to see if we need to skip # the name of the current plugin and type to see if we need to skip
# loading this callback plugin # loading this callback plugin
callback_type = getattr(callback_plugin, 'CALLBACK_TYPE', None) callback_type = getattr(callback_plugin, 'CALLBACK_TYPE', None)
callback_needs_whitelist = getattr(callback_plugin, 'CALLBACK_NEEDS_WHITELIST', False)
(callback_name, _) = os.path.splitext(os.path.basename(callback_plugin._original_path)) (callback_name, _) = os.path.splitext(os.path.basename(callback_plugin._original_path))
if callback_type == 'stdout': if callback_type == 'stdout':
if callback_name != self._stdout_callback or stdout_callback_loaded: if callback_name != self._stdout_callback or stdout_callback_loaded:
continue continue
stdout_callback_loaded = True stdout_callback_loaded = True
elif callback_needs_whitelist and (C.DEFAULT_CALLBACK_WHITELIST is None or callback_name not in C.DEFAULT_CALLBACK_WHITELIST): elif C.DEFAULT_CALLBACK_WHITELIST is None or callback_name not in C.DEFAULT_CALLBACK_WHITELIST:
continue continue
self._callback_plugins.append(callback_plugin(self._display)) self._callback_plugins.append(callback_plugin(self._display))

3
lib/ansible/plugins/callback/context_demo.py
View file

@ -28,8 +28,7 @@ class CallbackModule(CallbackBase):
""" """
CALLBACK_VERSION = 2.0 CALLBACK_VERSION = 2.0
CALLBACK_TYPE = 'aggregate' CALLBACK_TYPE = 'aggregate'
CALLBACK_NAME = 'context_demo' CALLBACK_TYPE = 'context_demo'
CALLBACK_NEEDS_WHITELIST = True
def v2_on_any(self, *args, **kwargs): def v2_on_any(self, *args, **kwargs):
i = 0 i = 0

3
lib/ansible/plugins/callback/hipchat.py
View file

@ -46,9 +46,8 @@ class CallbackModule(CallbackBase):
""" """
CALLBACK_VERSION = 2.0 CALLBACK_VERSION = 2.0
CALLBACK_TYPE = 'notification' CALLBACK_VERSION = 2.0
CALLBACK_NAME = 'hipchat' CALLBACK_NAME = 'hipchat'
CALLBACK_NEEDS_WHITELIST = True
def __init__(self, display): def __init__(self, display):

1
lib/ansible/plugins/callback/log_plays.py
View file

@ -40,7 +40,6 @@ class CallbackModule(CallbackBase):
CALLBACK_VERSION = 2.0 CALLBACK_VERSION = 2.0
CALLBACK_TYPE = 'notification' CALLBACK_TYPE = 'notification'
CALLBACK_NAME = 'log_plays' CALLBACK_NAME = 'log_plays'
CALLBACK_NEEDS_WHITELIST = True
TIME_FORMAT="%b %d %Y %H:%M:%S" TIME_FORMAT="%b %d %Y %H:%M:%S"
MSG_FORMAT="%(now)s - %(category)s - %(data)s\n\n" MSG_FORMAT="%(now)s - %(category)s - %(data)s\n\n"

1
lib/ansible/plugins/callback/mail.py
View file

@ -74,7 +74,6 @@ class CallbackModule(CallbackBase):
CALLBACK_VERSION = 2.0 CALLBACK_VERSION = 2.0
CALLBACK_TYPE = 'notification' CALLBACK_TYPE = 'notification'
CALLBACK_NAME = 'mail' CALLBACK_NAME = 'mail'
CALLBACK_NEEDS_WHITELIST = True
def v2_runner_on_failed(self, res, ignore_errors=False): def v2_runner_on_failed(self, res, ignore_errors=False):

1
lib/ansible/plugins/callback/osx_say.py
View file

@ -38,7 +38,6 @@ class CallbackModule(CallbackBase):
CALLBACK_VERSION = 2.0 CALLBACK_VERSION = 2.0
CALLBACK_TYPE = 'notification' CALLBACK_TYPE = 'notification'
CALLBACK_NAME = 'osx_say' CALLBACK_NAME = 'osx_say'
CALLBACK_NEEDS_WHITELIST = True
def __init__(self, display): def __init__(self, display):

1
lib/ansible/plugins/callback/profile_tasks.py
View file

@ -69,7 +69,6 @@ class CallbackModule(CallbackBase):
CALLBACK_VERSION = 2.0 CALLBACK_VERSION = 2.0
CALLBACK_TYPE = 'aggregate' CALLBACK_TYPE = 'aggregate'
CALLBACK_NAME = 'profile_tasks' CALLBACK_NAME = 'profile_tasks'
CALLBACK_NEEDS_WHITELIST = True
def __init__(self, display): def __init__(self, display):
self.stats = {} self.stats = {}

1
lib/ansible/plugins/callback/syslog_json.py
View file

@ -26,7 +26,6 @@ class CallbackModule(CallbackBase):
CALLBACK_VERSION = 2.0 CALLBACK_VERSION = 2.0
CALLBACK_TYPE = 'aggregate' CALLBACK_TYPE = 'aggregate'
CALLBACK_NAME = 'syslog_json' CALLBACK_NAME = 'syslog_json'
CALLBACK_NEEDS_WHITELIST = True
def __init__(self, display): def __init__(self, display):

1
lib/ansible/plugins/callback/timer.py
View file

@ -15,7 +15,6 @@ class CallbackModule(CallbackBase):
CALLBACK_VERSION = 2.0 CALLBACK_VERSION = 2.0
CALLBACK_TYPE = 'aggregate' CALLBACK_TYPE = 'aggregate'
CALLBACK_NAME = 'timer' CALLBACK_NAME = 'timer'
CALLBACK_NEEDS_WHITELIST = True
def __init__(self, display): def __init__(self, display):

1
lib/ansible/plugins/callback/tree.py
View file

@ -34,7 +34,6 @@ class CallbackModule(CallbackBase):
CALLBACK_VERSION = 2.0 CALLBACK_VERSION = 2.0
CALLBACK_TYPE = 'aggregate' CALLBACK_TYPE = 'aggregate'
CALLBACK_NAME = 'tree' CALLBACK_NAME = 'tree'
CALLBACK_NEEDS_WHITELIST = True
def __init__(self, display): def __init__(self, display):
super(CallbackModule, self).__init__(display) super(CallbackModule, self).__init__(display)