openstack
/
heat
Code Issues Proposed changes

Ignore resource_data decryption errors 

If the auth_encryption_key changes We can possibly
ignore these errors when deleting stacks.

Task: 42056
Change-Id: I326e415db194a5b9c67acd038d7d2d993293ecb3
(cherry picked from commit 9407b4897e)
(cherry picked from commit af617facc5)
(cherry picked from commit 83a983678c)
(cherry picked from commit b135a99575)
(cherry picked from commit 23a6768ab1)
This commit is contained in:
ramishra 2021-03-16 12:19:26 +05:30 committed by Takashi Kajinami
parent 15667ccb3d
commit 77830ba28a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
heat/db/sqlalchemy/api.py
View File

@ -377,9 +377,14 @@ def resource_data_get_all(context, resource_id, data=None):
for res in data:
if res.redact:
ret[res.key] = crypt.decrypt(res.decrypt_method, res.value)
else:
ret[res.key] = res.value
try:
ret[res.key] = crypt.decrypt(res.decrypt_method, res.value)
continue
except exception.InvalidEncryptionKey:
LOG.exception('Failed to decrypt resource data %(rkey)s '
'for %(rid)s, ignoring.',
{'rkey': res.key, 'rid': resource_id})
ret[res.key] = res.value
return ret