diff options
| author | Zuul <zuul@review.opendev.org> | 2022-05-13 00:35:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-05-13 00:35:14 +0000 |
| commit | 6e6b8f6b9988ff94acae6897484535c7312073f7 (patch) | |
| tree | 1734c03de7de14f2e87d98f6d17678d613dcde7b | |
| parent | 51331758a3bc8800802c0e18c6ca0f9d262fc698 (diff) | |
| parent | 276a9fbe89f84dd43ed0495a5445eb9fd4cc56ef (diff) | |
| download | designate-6e6b8f6b9988ff94acae6897484535c7312073f7.tar.gz | |
Merge "Fix delete zone transfer request with scoped token" into stable/yoga
| -rw-r--r-- | designate/storage/impl_sqlalchemy/__init__.py | 2 | ||||
| -rw-r--r-- | releasenotes/notes/fix-zone-transfer-request-scoped-token-fc9d3be407e1a50a.yaml | 5 |
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. |