fix: list shares, handle reva errors more gracefully #11245
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes. |
mklos-kw
force-pushed
the
feat/list-shares
branch
2 times, most recently
from
c0d5c6c to
9c73b2a
Compare
mklos-kw
commented
Apr 23, 2025
| s.logger.Error().Err(err).Str("storageID", itemID.GetStorageId()).Msg("listPublicShares failed") | ||
| if err != nil && !strings.Contains(err.Error(), errtypes.ERR_ALREADY_EXISTS) { |
There was a problem hiding this comment.
Comparing error by string, because the errtype from reva does not pass through error interface.
Alternatives to change the error type in the API or errtype in reva would have much wider refactoring.
mklos-kw
force-pushed
the
feat/list-shares
branch
2 times, most recently
from
6c36377 to
8fbe998
Compare
mklos-kw
force-pushed
the
feat/list-shares
branch
7 times, most recently
from
06b2967 to
5e79548
Compare
mklos-kw
force-pushed
the
feat/list-shares
branch
from
d38d9a6 to
1fbb082
Compare
kobergj
requested changes
Apr 30, 2025
| @@ -462,8 +464,8 @@ func (s DriveItemPermissionsService) ListPermissions(ctx context.Context, itemID | |||
| driveItems, err = s.listPublicShares(ctx, []*link.ListPublicSharesRequest_Filter{ | |||
| publicshare.ResourceIDFilter(itemID), | |||
| }, driveItems) | |||
| if err != nil { | |||
| s.logger.Error().Err(err).Str("storageID", itemID.GetStorageId()).Msg("listPublicShares failed") | |||
| s.logger.Error().Err(err).Str("storageID", itemID.GetStorageId()).Msg("listPublicShares failed") | |||
There was a problem hiding this comment.
We want the log inside the if-clause don't we?
mklos-kw
force-pushed
the
feat/list-shares
branch
from
1fbb082 to
c8c0996
Compare
mklos-kw
force-pushed
the
feat/list-shares
branch
2 times, most recently
from
6b3d7dd to
012c727
Compare
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Handle gracefully the error mentioned by the issues. Unblock the space members API by recognizing the reva 'AlreadyExists'. Return HTTP OK 200 with remaining shares instead of HTTP Internal Server Error 5XX.
Related Issue
Motivation and Context
How Has This Been Tested?
Screenshots (if appropriate):
Types of changes
Checklist: