Browse Source

Merge "Sanitizer some sensitive logs information"

Zuul 8 months ago
parent
commit
e1a3a3f077
2 changed files with 6 additions and 2 deletions
  1. 2
    1
      murano/common/engine.py
  2. 4
    1
      murano/engine/system/heat_stack.py

+ 2
- 1
murano/common/engine.py View File

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

+ 4
- 1
murano/engine/system/heat_stack.py View File

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

Loading…
Cancel
Save