openstack
/
murano
Code Issues Proposed changes

Merge "Sanitizer some sensitive logs information"

This commit is contained in:
Zuul 2018-08-04 08:16:08 +00:00 committed by Gerrit Code Review
parent e8979853f8 ed7941c346
commit e1a3a3f077
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
murano/common/engine.py
View File

@ -141,8 +141,9 @@ class TaskProcessingEndpoint(object):
result = task_executor.execute()
return result
finally:
s_result = token_sanitizer.TokenSanitizer().sanitize(result)
LOG.info('Finished processing task: {task_desc}'.format(
task_desc=jsonutils.dumps(result)))
task_desc=jsonutils.dumps(s_result)))
class StaticActionEndpoint(object):

5
murano/engine/system/heat_stack.py
View File

@ -23,6 +23,7 @@ from oslo_config import cfg
from oslo_log import log as logging
from murano.common import auth_utils
from murano.common.helpers import token_sanitizer
from murano.dsl import dsl
from murano.dsl import helpers
from murano.dsl import session_local_storage
@ -212,7 +213,9 @@ class HeatStack(object):
def _push(self, object_store=None):
template = copy.deepcopy(self._template)
LOG.debug('Pushing: {template}'.format(template=json.dumps(template)))
s_template = token_sanitizer.TokenSanitizer().sanitize(template)
LOG.debug('Pushing: {template}'.format(
template=json.dumps(s_template)))
object_store = object_store or helpers.get_object_store()
while True:
try: