feat: [OCISDEV-285] Add Cli to delete personal spaces (#11701)

* Add Cli to delete personal spaces

* fix EnsurePersonalSpace

* Purge disabled spaces 'personal' or 'project'

* bump reva

* update the test

Author: 2403905

changelog/unreleased/add-cli-delete-personal.md

@@ -0,0 +1,5 @@
+Enhancement: Add Cli to delete personal spaces
+
+Add Cli to delete the trashed personal spaces.
+
+https://github.com/owncloud/ocis/pull/11555

coverage.out

@@ -78,23 +78,6 @@ func EnsurePersonalSpace(ctx context.Context, client gateway.GatewayAPIClient, u
 		}
 		return nil
 	}
-	if errors.Is(err, ErrNotFound) {
-		req := &storageprovider.CreateStorageSpaceRequest{
-			Type:  _spaceTypePersonal,
-			Owner: &userv1beta1.User{Id: &userv1beta1.UserId{OpaqueId: user.GetId()}},
-			Name:  user.GetDisplayName(),
-		}
-		cRes, cerr := client.CreateStorageSpace(ctx, req)
-		if cerr != nil {
-			return fmt.Errorf("failed to create personal space: %w", cerr)
-		}
-		if cRes.GetStatus().GetCode() == cs3rpc.Code_CODE_ALREADY_EXISTS {
-			return nil
-		}
-		if cRes.GetStatus().GetCode() != cs3rpc.Code_CODE_OK {
-			return errorcode.NewFromStatusCode(cRes.GetStatus().GetCode(), cRes.GetStatus().GetMessage())
-		}
-	}
 	return nil
 }
 

ocis-pkg/shared/storage_utils.go

@@ -72,35 +72,27 @@ func TestEnsurePersonalSpace(t *testing.T) {
 		require.NoError(t, err)
 	})
 
-	t.Run("creates when not found", func(t *testing.T) {
+	t.Run("no-op when not found", func(t *testing.T) {
 		gw := cs3mocks.NewGatewayAPIClient(t)
 		gw.EXPECT().ListStorageSpaces(mock.Anything, mock.Anything, mock.Anything).Return(&storageprovider.ListStorageSpacesResponse{
 			Status:        okStatus(),
 			StorageSpaces: []*storageprovider.StorageSpace{},
 		}, nil).Once()
 
-		gw.EXPECT().CreateStorageSpace(mock.Anything, mock.Anything, mock.Anything).Return(&storageprovider.CreateStorageSpaceResponse{
-			Status: okStatus(),
-		}, nil).Once()
-
 		user := libregraph.NewUser("User Three", "user3")
 		user.SetId("user3")
 
 		err := EnsurePersonalSpace(context.Background(), gw, *user)
 		require.NoError(t, err)
 	})
 
-	t.Run("create returns already exists treated as success", func(t *testing.T) {
+	t.Run("no-op when not found (empty spaces)", func(t *testing.T) {
 		gw := cs3mocks.NewGatewayAPIClient(t)
 		gw.EXPECT().ListStorageSpaces(mock.Anything, mock.Anything, mock.Anything).Return(&storageprovider.ListStorageSpacesResponse{
 			Status:        okStatus(),
 			StorageSpaces: []*storageprovider.StorageSpace{},
 		}, nil).Once()
 
-		gw.EXPECT().CreateStorageSpace(mock.Anything, mock.Anything, mock.Anything).Return(&storageprovider.CreateStorageSpaceResponse{
-			Status: status(cs3rpc.Code_CODE_ALREADY_EXISTS, "exists"),
-		}, nil).Once()
-
 		user := libregraph.NewUser("User Four", "user4")
 		user.SetId("user4")
 

ocis-pkg/shared/storage_utils_test.go

@@ -459,47 +459,6 @@ var _ = Describe("AppRoleAssignments", func() {
 
 			Expect(rr.Code).To(Equal(http.StatusInternalServerError))
 		})
-
-		It("returns error when EnsurePersonalSpace fails for non-UserLight role", func() {
-			userRoleAssignment := &settingsmsg.UserRoleAssignment{
-				Id:          "some-appRoleAssignment-ID",
-				AccountUuid: "user1",
-				RoleId:      "some-appRole-ID",
-			}
-			roleService.On("ListRoleAssignments", mock.Anything, mock.Anything, mock.Anything).Return(&settings.ListRoleAssignmentsResponse{Assignments: []*settingsmsg.UserRoleAssignment{}}, nil)
-			roleService.On("AssignRoleToUser", mock.Anything, mock.Anything, mock.Anything).Return(&settings.AssignRoleToUserResponse{Assignment: userRoleAssignment}, nil)
-
-			// Reset the mock and set up the failing scenario
-			gatewayClient.ExpectedCalls = nil
-			gatewayClient.On("GetUser", mock.Anything, mock.Anything).Return(&userv1beta1.GetUserResponse{
-				Status: &rpc.Status{Code: rpc.Code_CODE_OK},
-				User:   currentUser,
-			}, nil)
-			gatewayClient.On("ListStorageSpaces", mock.Anything, mock.Anything).Return(&storageprovider.ListStorageSpacesResponse{
-				Status:        &rpc.Status{Code: rpc.Code_CODE_OK},
-				StorageSpaces: []*storageprovider.StorageSpace{},
-			}, nil)
-			gatewayClient.On("CreateStorageSpace", mock.Anything, mock.Anything).Return(&storageprovider.CreateStorageSpaceResponse{
-				Status: &rpc.Status{Code: rpc.Code_CODE_INTERNAL, Message: "internal error"},
-			}, nil)
-
-			ara := libregraph.NewAppRoleAssignmentWithDefaults()
-			ara.SetAppRoleId("some-appRole-ID")
-			ara.SetPrincipalId("user1")
-			ara.SetResourceId(cfg.Application.ID)
-
-			araJson, err := json.Marshal(ara)
-			Expect(err).ToNot(HaveOccurred())
-
-			r := httptest.NewRequest(http.MethodPost, "/graph/v1.0/users/user1/appRoleAssignments", bytes.NewBuffer(araJson))
-			rctx := chi.NewRouteContext()
-			rctx.URLParams.Add("userID", "user1")
-			r = r.WithContext(context.WithValue(revactx.ContextSetUser(ctx, currentUser), chi.RouteCtxKey, rctx))
-			svc.CreateAppRoleAssignment(rr, r)
-
-			Expect(rr.Code).To(Equal(http.StatusInternalServerError))
-		})
-
 	})
 
 	Describe("DeleteAppRoleAssignment", func() {

services/graph/pkg/service/v0/approleassignments_test.go

@@ -140,6 +140,55 @@ ocis storage-users uploads sessions --expired=true --clean
 ocis storage-users uploads sessions --processing=true --has-virus=false --resume
 ```
 
+### Manage Spaces
+
+This command set provides commands to manage spaces, including purging disabled spaces that exceed the retention period.
+
+```bash
+ocis storage-users spaces <command>
+```
+
+```plaintext
+COMMANDS:
+   purge  Purge disabled spaces that exceed the retention period
+```
+
+#### Purge (delete permanently) Disabled Spaces
+
+Purge disabled spaces of a specific type that have exceeded the retention period. This command helps delete permanently the spaces that have been disabled and are no longer needed.
+
+```bash
+ocis storage-users spaces purge [command options]
+```
+
+**Options:**
+- `--dry-run, -d` - Only show what would be purged without actually purging (default: true)
+- `--type, -t` - Type of spaces to purge: 'personal' or 'project' (required)
+- `--space-id, -s` - Specific space ID to purge (optional, omit to process all spaces)
+- `--retention-period, -r` - Retention period for disabled spaces (default: '336h', e.g., '14d', '720h')
+- `--verbose, -v` - Enable verbose logging (default: false)
+
+**Examples:**
+
+```bash
+# Dry run to see what would be purged (recommended first step)
+ocis storage-users spaces purge --type=personal
+
+# Purge all disabled personal spaces older than 14 days
+ocis storage-users spaces purge --type=personal --retention-period=14d --dry-run=false
+
+# Purge a specific project space
+ocis storage-users spaces purge --type=project --space-id='f46bae39-b2e4-48c7-a1bc-26169b1ffc2e$2d274464-0d11-4334-9f66-391cbe38c8a5!2d274464-0d11-4334-9f66-391cbe38c8a5' --dry-run=false
+
+# Purge with verbose logging
+ocis storage-users spaces purge --type=personal --verbose --dry-run=false
+```
+
+**Important Notes:**
+- Only processes spaces that are in 'trashed' state
+- The `--dry-run` flag defaults to `true` to prevent accidental purging
+- Retention period supports human-readable formats (e.g., '336h', '14d', '720h')
+
 ### Manage Trash-Bin Items
 
 This command set provides commands to get an overview of trash-bin items, restore items and purge old items of `personal` spaces and `project` spaces (spaces that have been created manually). `trash-bin` commands require a `spaceID` as parameter. See [List all spaces

services/storage-users/README.md

@@ -17,6 +17,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 		// interaction with this service
 		Uploads(cfg),
 		TrashBin(cfg),
+		Spaces(cfg),
 
 		// infos about this service
 		Health(cfg),