summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--designate/storage/impl_sqlalchemy/__init__.py2
-rw-r--r--releasenotes/notes/fix-zone-transfer-request-scoped-token-fc9d3be407e1a50a.yaml5
2 files changed, 7 insertions, 0 deletions
diff --git a/designate/storage/impl_sqlalchemy/__init__.py b/designate/storage/impl_sqlalchemy/__init__.py
index bf70a1dc..93a767b7 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 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.