openstack/openstack-helm
Code Issues Proposed changes

Merge "Check transaction before begin"

Browse Source
This commit is contained in:
Zuul
2025-05-29 19:19:43 +00:00
committed by Gerrit Code Review
parent 55afeeb90e 559d486b77
commit 9f9ff49e82
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
barbican/templates/bin/_simple_crypto_kek_rewrap.py.tpl
View File

@ -54,7 +54,10 @@ class KekRewrap(object):
)
def rewrap_kek(self, project, kek):
with self.db_session.begin():
db_begin_fn = self.db_session.begin_nested if (
self.db_session.in_transaction()) else self.db_session.begin
with db_begin_fn():
plugin_meta = kek.plugin_meta
# try to unwrap with the target kek, and if successful, skip
@ -90,7 +93,9 @@ class KekRewrap(object):
def get_keks_for_project(self, project):
keks = []
with self.db_session.begin() as transaction:
db_begin_fn = self.db_session.begin_nested if (
self.db_session.in_transaction()) else self.db_session.begin
with db_begin_fn() as transaction:
print('Retrieving KEKs for Project {}'.format(project.external_id))
query = transaction.session.query(models.KEKDatum)
query = query.filter_by(project_id=project.id)
@ -104,7 +109,9 @@ class KekRewrap(object):
print('Retrieving all available projects')
projects = []
with self.db_session.begin() as transaction:
db_begin_fn = self.db_session.begin_nested if (
self.db_session.in_transaction()) else self.db_session.begin
with db_begin_fn() as transaction:
projects = transaction.session.query(models.Project).all()
return projects