From 6f847aeb5a309eb6e70dee58057fef01886573f6 Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Fri, 1 Apr 2022 22:25:07 +0000
Subject: [PATCH] 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
---
 designate/storage/impl_sqlalchemy/__init__.py                | 2 ++
 ...-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 bf70a1dc6..93a767b7d 100644
--- a/designate/storage/impl_sqlalchemy/__init__.py
+++ b/designate/storage/impl_sqlalchemy/__init__.py
@@ -1490,6 +1490,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 000000000..77d1fa86a
--- /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.