diff options
| author | Zuul <zuul@review.opendev.org> | 2022-06-03 05:29:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-06-03 05:29:05 +0000 |
| commit | 719e757b0c1933ef9e9808296d807691f98fa529 (patch) | |
| tree | ce9ffbf2db1fa082be0a7a5f19d76c08dec0156d | |
| parent | e8ef5f296c4a400a34b321b341a02f36e2330642 (diff) | |
| parent | 8562a683ae3e93de7c5ae5b7d9f4c153e2ed1d70 (diff) | |
| download | designate-719e757b0c1933ef9e9808296d807691f98fa529.tar.gz | |
Merge "Fix delete zone transfer request with scoped token" into stable/wallaby
| -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 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. |