From 63bc0c1db93899273627462cb177c1481502e9fc Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Fri, 1 Apr 2022 22:25:07 +0000 Subject: Fix delete zone transfer request with scoped token This patch fixes an issue were deleting a zone transfer request with a scoped token may fail. Change-Id: I4522796ac056630c63798830e8f8d92628f14a37 (cherry picked from commit 6f847aeb5a309eb6e70dee58057fef01886573f6) (cherry picked from commit 276a9fbe89f84dd43ed0495a5445eb9fd4cc56ef) --- designate/storage/impl_sqlalchemy/__init__.py | 2 ++ .../fix-zone-transfer-request-scoped-token-fc9d3be407e1a50a.yaml | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 releasenotes/notes/fix-zone-transfer-request-scoped-token-fc9d3be407e1a50a.yaml diff --git a/designate/storage/impl_sqlalchemy/__init__.py b/designate/storage/impl_sqlalchemy/__init__.py index fe46a88b..3a8234e6 100644 --- a/designate/storage/impl_sqlalchemy/__init__.py +++ b/designate/storage/impl_sqlalchemy/__init__.py @@ -1492,6 +1492,8 @@ class SQLAlchemyStorage(sqlalchemy_base.SQLAlchemy, storage_base.Storage): # all_tenants was not used, we don't know what records to return, # so return an empty list. if not context.project_id: + if one: + return objects.ZoneTransferRequest() return objects.ZoneTransferRequestList() query = query.where(or_( diff --git a/releasenotes/notes/fix-zone-transfer-request-scoped-token-fc9d3be407e1a50a.yaml b/releasenotes/notes/fix-zone-transfer-request-scoped-token-fc9d3be407e1a50a.yaml new file mode 100644 index 00000000..77d1fa86 --- /dev/null +++ b/releasenotes/notes/fix-zone-transfer-request-scoped-token-fc9d3be407e1a50a.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixed a bug where deleting a zone transfer request may fail when using + a system scoped token. -- cgit v1.2.1