diff options
| author | Zuul <zuul@review.opendev.org> | 2023-04-11 06:44:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-04-11 06:44:24 +0000 |
| commit | db30d18f9d75f70bbc54c2ff9325318c09bf9851 (patch) | |
| tree | 1690385f23d5fc3634375f297b20c15e0ff74a70 | |
| parent | eae86e31a714ee2d456657c90a563ae2b11b9f70 (diff) | |
| parent | 1a49525c547a607743160a33b6a23041378ff177 (diff) | |
| download | heat-db30d18f9d75f70bbc54c2ff9325318c09bf9851.tar.gz | |
Merge "Honor 'hidden' parameter in 'stack environment show' command" into stable/xena
| -rw-r--r-- | heat/engine/service.py | 12 | ||||
| -rw-r--r-- | heat/tests/test_engine_service.py | 3 | ||||
| -rw-r--r-- | releasenotes/notes/honor-hidden-parameter-in-stack-env-show-cmd-062065545dfef82a.yaml | 6 |
3 files changed, 19 insertions, 2 deletions
diff --git a/heat/engine/service.py b/heat/engine/service.py index 00c7f2c61..ddd412a22 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -12,6 +12,7 @@ # under the License. import collections +import copy import datetime import functools import itertools @@ -1350,7 +1351,16 @@ class EngineService(service.ServiceBase): :rtype: dict """ s = self._get_stack(cnxt, stack_identity, show_deleted=True) - return s.raw_template.environment + tmpl = templatem.Template.load(cnxt, s.raw_template_id, s.raw_template) + param_schemata = tmpl.all_param_schemata(tmpl.files) + env = copy.deepcopy(s.raw_template.environment) + for section in [env_fmt.PARAMETERS, env_fmt.PARAMETER_DEFAULTS]: + for param_name in env.get(section, {}).keys(): + if (param_name not in param_schemata + or not param_schemata[param_name].hidden): + continue + env[section][param_name] = str('******') + return env @context.request_context def get_files(self, cnxt, stack_identity): diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py index 875d44dcd..9ce13e308 100644 --- a/heat/tests/test_engine_service.py +++ b/heat/tests/test_engine_service.py @@ -978,11 +978,12 @@ class StackServiceTest(common.HeatTestCase): env = {'parameters': {'KeyName': 'EnvKey'}} tmpl = templatem.Template(t) stack = parser.Stack(self.ctx, 'get_env_stack', tmpl) + stack.store() mock_get_stack = self.patchobject(self.eng, '_get_stack') mock_get_stack.return_value = mock.MagicMock() mock_get_stack.return_value.raw_template.environment = env - self.patchobject(parser.Stack, 'load', return_value=stack) + self.patchobject(templatem.Template, 'load', return_value=tmpl) # Test found = self.eng.get_environment(self.ctx, stack.identifier()) diff --git a/releasenotes/notes/honor-hidden-parameter-in-stack-env-show-cmd-062065545dfef82a.yaml b/releasenotes/notes/honor-hidden-parameter-in-stack-env-show-cmd-062065545dfef82a.yaml new file mode 100644 index 000000000..8a3a366ee --- /dev/null +++ b/releasenotes/notes/honor-hidden-parameter-in-stack-env-show-cmd-062065545dfef82a.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Honor ``hidden`` parameter in get stack environment API. Now values passed + to hidden parameters are replaced by '******', similarly to the other + APIs such as show stack details API. |