Skip to content

Commit

Permalink
Merge ef1b148 into 97df0bd
Browse files Browse the repository at this point in the history
  • Loading branch information
paulineribeyre committed May 2, 2023
2 parents 97df0bd + ef1b148 commit d9a3be4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
5 changes: 5 additions & 0 deletions fence/blueprints/data/indexd.py
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,11 @@ def index_document(self):
"indexd: {}".format(url + self.file_id)
)
raise InternalError("URLs and metadata not found")

# indexd can resolve GUIDs without prefix, but cannot perform other operations
# (such as delete) without the prefix, so make sure `file_id` is the whole GUID
self.file_id = json_response["did"]

return res.json()
except Exception as e:
logger.error(
Expand Down
5 changes: 5 additions & 0 deletions fence/sync/sync_users.py
Original file line number Diff line number Diff line change
Expand Up @@ -1976,6 +1976,11 @@ def _update_authz_in_arborist(
)
)
continue
self.logger.debug(
"updating client `{}` (found {} client IDs)".format(
client_name, len(clients)
)
)
# there may be more than 1 client with this name if credentials are being rotated,
# so we grant access to each client ID
for client in clients:
Expand Down

0 comments on commit d9a3be4

Please sign in to comment.