summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-04-16 12:20:22 +0000
committerGerrit Code Review <review@openstack.org>2021-04-16 12:20:22 +0000
commit3d59521635d1e8e9f684eabf8449a4e1a3868624 (patch)
tree5218eb23b6a4b0fd27fe5a7e617816093eaa0284
parent3dd070ffac6f2d18fecf3202d2b209baaf6dcfc5 (diff)
parentdcfe3ad0fbc59287fbc30469e32de9378925b0f6 (diff)
downloadoslo-utils-3d59521635d1e8e9f684eabf8449a4e1a3868624.tar.gz
Merge "strutils: Stop masking encryption_key_id"
-rw-r--r--oslo_utils/strutils.py2
-rw-r--r--oslo_utils/tests/test_strutils.py3
2 files changed, 1 insertions, 4 deletions
diff --git a/oslo_utils/strutils.py b/oslo_utils/strutils.py
index dad63da..5f33fdd 100644
--- a/oslo_utils/strutils.py
+++ b/oslo_utils/strutils.py
@@ -59,7 +59,7 @@ _SANITIZE_KEYS = ['adminpass', 'admin_pass', 'password', 'admin_password',
'auth_token', 'new_pass', 'auth_password', 'secret_uuid',
'secret', 'sys_pswd', 'token', 'configdrive',
'chappassword', 'encrypted_key', 'private_key',
- 'encryption_key_id', 'fernetkey', 'sslkey', 'passphrase',
+ 'fernetkey', 'sslkey', 'passphrase',
'cephclusterfsid', 'octaviaheartbeatkey', 'rabbitcookie',
'cephmanilaclientkey', 'pacemakerremoteauthkey',
'designaterndckey', 'cephadminkey', 'heatauthencryptionkey',
diff --git a/oslo_utils/tests/test_strutils.py b/oslo_utils/tests/test_strutils.py
index 5964b61..5a78166 100644
--- a/oslo_utils/tests/test_strutils.py
+++ b/oslo_utils/tests/test_strutils.py
@@ -499,9 +499,6 @@ class MaskPasswordTestCase(test_base.BaseTestCase):
payload = """body: {"rescue": {"password": "1234567"}}"""
expected = """body: {"rescue": {"password": "***"}}"""
self.assertEqual(expected, strutils.mask_password(payload))
- payload = """body: {"rescue": {"encryption_key_id": "1234567"}}"""
- expected = """body: {"rescue": {"encryption_key_id": "***"}}"""
- self.assertEqual(expected, strutils.mask_password(payload))
def test_xml_message(self):
payload = """<?xml version="1.0" encoding="UTF-8"?>