fix(iso) limit iso storage volumes per project -- they are not access…

…ible accross projects
canonical · Aug 30, 2023 · da698ae · da698ae
1 parent c83ff9e
commit da698ae
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/src/api/storage-pools.tsx b/src/api/storage-pools.tsx
@@ -88,10 +88,11 @@ export const deleteStoragePool = (pool: string, project: string) => {
 };
 
 export const fetchStorageVolumes = (
-  pool: string
+  pool: string,
+  project: string
 ): Promise<LxdStorageVolume[]> => {
   return new Promise((resolve, reject) => {
-    fetch(`/1.0/storage-pools/${pool}/volumes?all-projects=true&recursion=1`)
+    fetch(`/1.0/storage-pools/${pool}/volumes?project=${project}&recursion=1`)
       .then(handleResponse)
       .then((data: LxdApiResponse<LxdStorageVolume[]>) =>
         resolve(data.metadata)

diff --git a/src/context/loadIsoImages.tsx b/src/context/loadIsoImages.tsx
@@ -8,7 +8,7 @@ export const loadIsoImages = async (
   const result: RemoteImage[] = [];
   const pools = await fetchStoragePools(project);
   for (const pool of pools) {
-    const volumes = await fetchStorageVolumes(pool.name);
+    const volumes = await fetchStorageVolumes(pool.name, project);
 
     volumes.forEach((volume) => {
       if (volume.content_type === "iso") {

diff --git a/src/pages/storage/StorageUsedBy.tsx b/src/pages/storage/StorageUsedBy.tsx
@@ -101,7 +101,10 @@ const StorageUsedBy: FC<Props> = ({ storage, project }) => {
           <td>
             <ExpandableList
               items={data[CUSTOM].map((item) => (
-                <div key={item.name}>{item.name}</div>
+                <div key={item.name}>
+                  {item.name}
+                  {item.project !== project && ` (project ${item.project})`}
+                </div>
               ))}
             />
           </td>

diff --git a/src/pages/storage/StorageVolumes.tsx b/src/pages/storage/StorageVolumes.tsx
@@ -29,8 +29,8 @@ const StorageVolumes: FC = () => {
     error,
     isLoading,
   } = useQuery({
-    queryKey: [queryKeys.storage, pool, queryKeys.volumes],
-    queryFn: () => fetchStorageVolumes(pool),
+    queryKey: [queryKeys.storage, pool, queryKeys.volumes, project],
+    queryFn: () => fetchStorageVolumes(pool, project),
   });
 
   if (error) {

diff --git a/src/pages/storage/UploadCustomImage.tsx b/src/pages/storage/UploadCustomImage.tsx
@@ -32,13 +32,15 @@ const UploadCustomImage: FC<Props> = ({ onCancel, onFinish }) => {
     notify.clear();
   }, []);
 
+  const projectName = project?.name ?? "";
+
   const {
     data: pools = [],
     isLoading: arePoolsLoading,
     error: poolError,
   } = useQuery({
     queryKey: [queryKeys.storage],
-    queryFn: () => fetchStoragePools(project?.name ?? ""),
+    queryFn: () => fetchStoragePools(projectName),
   });
 
   if (poolError) {
@@ -71,7 +73,7 @@ const UploadCustomImage: FC<Props> = ({ onCancel, onFinish }) => {
       pool,
       file,
       name,
-      project?.name ?? "",
+      projectName,
       setUploadState,
       uploadController
     )
@@ -88,6 +90,7 @@ const UploadCustomImage: FC<Props> = ({ onCancel, onFinish }) => {
           queryKeys.storage,
           pool,
           queryKeys.volumes,
+          projectName,
         ]);
       });
   };

diff --git a/src/pages/storage/actions/DeleteStorageVolumeBtn.tsx b/src/pages/storage/actions/DeleteStorageVolumeBtn.tsx
@@ -45,6 +45,7 @@ const DeleteStorageVolumeBtn: FC<Props> = ({ pool, project, volume }) => {
           queryKeys.storage,
           pool,
           queryKeys.volumes,
+          project,
         ]);
       });
   };