From 983c836653c8959ccbc6045aef714d5fd102c4b1 Mon Sep 17 00:00:00 2001 From: Alex Ababii Date: Tue, 18 Aug 2026 14:28:36 +0200 Subject: [PATCH] cli: restore single item from trash bin, listing on empty thrash bin --- services/storage-users/pkg/command/trash_bin.go | 11 ++++++----- .../expected-failures-decomposed-storage.md | 2 -- tests/acceptance/expected-failures-posix-storage.md | 2 -- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/services/storage-users/pkg/command/trash_bin.go b/services/storage-users/pkg/command/trash_bin.go index 8c3b59f7cc..dc356c48b2 100644 --- a/services/storage-users/pkg/command/trash_bin.go +++ b/services/storage-users/pkg/command/trash_bin.go @@ -306,8 +306,13 @@ func restoreTrashBinItem(cfg *config.Config) *cobra.Command { var found bool var itemRef *provider.RecycleItem + rid, err := storagespace.ParseID(itemID) + if err != nil { + return err + } + opaqueID := rid.GetOpaqueId() for _, item := range res.GetRecycleItems() { - if item.GetKey() == itemID { + if item.GetKey() == opaqueID { itemRef = item found = true break @@ -350,10 +355,6 @@ func listRecycle(ctx context.Context, client gateway.GatewayAPIClient, ref provi if res.Status.Code != rpc.Code_CODE_OK { return nil, fmt.Errorf("%s %s", _retrievingErrorMsg, res.Status.Code) } - if len(res.GetRecycleItems()) == 0 { - fmt.Errorf("The trash-bin is empty. Nothing to restore") - os.Exit(0) - } return res, nil } diff --git a/tests/acceptance/expected-failures-decomposed-storage.md b/tests/acceptance/expected-failures-decomposed-storage.md index 6cdfc971ae..cbce2a0fbc 100644 --- a/tests/acceptance/expected-failures-decomposed-storage.md +++ b/tests/acceptance/expected-failures-decomposed-storage.md @@ -337,8 +337,6 @@ _ocdav: api compatibility, return correct status code_ #### [POSIX: failing CLI commands](https://github.com/opencloud-eu/opencloud/issues/3095) -- [cliCommands/restoreTrashBinItems.feature:11](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/cliCommands/restoreTrashBinItems.feature#L11) -- [cliCommands/restoreTrashBinItems.feature:23](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/cliCommands/restoreTrashBinItems.feature#L23) - [cliCommands/sharesCleanup.feature:12](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/cliCommands/sharesCleanup.feature#L12) ### notification issue #323 diff --git a/tests/acceptance/expected-failures-posix-storage.md b/tests/acceptance/expected-failures-posix-storage.md index f853235f6d..88ab15b819 100644 --- a/tests/acceptance/expected-failures-posix-storage.md +++ b/tests/acceptance/expected-failures-posix-storage.md @@ -339,8 +339,6 @@ _ocdav: api compatibility, return correct status code_ #### [POSIX: failing CLI commands](https://github.com/opencloud-eu/opencloud/issues/3095) -- [cliCommands/restoreTrashBinItems.feature:11](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/cliCommands/restoreTrashBinItems.feature#L11) -- [cliCommands/restoreTrashBinItems.feature:23](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/cliCommands/restoreTrashBinItems.feature#L23) - [cliCommands/sharesCleanup.feature:12](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/cliCommands/sharesCleanup.feature#L12) ### notification issue #323