lxd: Simplify projectIsEmpty

Signed-off-by: Stéphane Graber <[email protected]> (cherry picked from commit 59e53d5206cd3e53b9c57ce18c1758b9f716a5d7) Signed-off-by: Mark Bolton <[email protected]> License: Apache-2.0
canonical · Dec 9, 2024 · 54c4f4e · 54c4f4e
1 parent bc303ce
commit 54c4f4e
Showing 1 changed file with 6 additions and 50 deletions.
diff --git a/lxd/api_project.go b/lxd/api_project.go
@@ -954,65 +954,21 @@ func projectStateGet(d *Daemon, r *http.Request) response.Response {
 
 // Check if a project is empty.
 func projectIsEmpty(ctx context.Context, project *cluster.Project, tx *db.ClusterTx) (bool, error) {
-	instances, err := cluster.GetInstances(ctx, tx.Tx(), cluster.InstanceFilter{Project: &project.Name})
+	usedBy, err := projectUsedBy(ctx, tx, project)
 	if err != nil {
 		return false, err
 	}
 
-	if len(instances) > 0 {
-		return false, nil
-	}
-
-	images, err := cluster.GetImages(ctx, tx.Tx(), cluster.ImageFilter{Project: &project.Name})
-	if err != nil {
-		return false, err
-	}
-
-	if len(images) > 0 {
-		return false, nil
-	}
-
-	profiles, err := cluster.GetProfiles(ctx, tx.Tx(), cluster.ProfileFilter{Project: &project.Name})
-	if err != nil {
-		return false, err
-	}
-
-	if len(profiles) > 0 {
-		// Consider the project empty if it is only used by the default profile.
-		if len(profiles) == 1 && profiles[0].Name == "default" {
-			return true, nil
+	defaultProfile := api.NewURL().Path(version.APIVersion, "profiles", api.ProjectDefaultName).Project(project.Name).String()
+	for _, entry := range usedBy {
+		// Ignore the default profile.
+		if entry == defaultProfile {
+			continue
 		}
 
 		return false, nil
 	}
 
-	volumes, err := tx.GetStorageVolumeURIs(ctx, project.Name)
-	if err != nil {
-		return false, err
-	}
-
-	if len(volumes) > 0 {
-		return false, nil
-	}
-
-	networks, err := tx.GetNetworkURIs(ctx, project.ID, project.Name)
-	if err != nil {
-		return false, err
-	}
-
-	if len(networks) > 0 {
-		return false, nil
-	}
-
-	acls, err := tx.GetNetworkACLURIs(ctx, project.ID, project.Name)
-	if err != nil {
-		return false, err
-	}
-
-	if len(acls) > 0 {
-		return false, nil
-	}
-
 	return true, nil
 }