From e66c9cb9820e89d174f7467acac3224bd2321f54 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Thu, 26 Sep 2024 11:51:35 -0400
Subject: [PATCH] Rework user file/object store for changes to client fetch
 arch.

---
 client/src/api/configTemplates.ts             |   1 -
 client/src/api/objectStores.ts                |   4 +-
 client/src/api/schema/schema.ts               |  28 +--
 .../useConfigurationTesting.ts                | 182 ++++++++++++------
 .../FileSources/Instances/CreateForm.vue      |   7 +-
 .../FileSources/Instances/CreateInstance.vue  |  26 ++-
 .../FileSources/Instances/EditInstance.vue    |  14 +-
 .../FileSources/Instances/EditSecrets.vue     |   4 +-
 .../FileSources/Instances/ManageIndex.vue     |  11 +-
 .../FileSources/Instances/UpgradeForm.vue     |   9 +-
 .../FileSources/Instances/services.ts         |  23 +--
 .../ObjectStore/Instances/CreateForm.test.ts  |   2 +-
 .../ObjectStore/Instances/CreateForm.vue      |   7 +-
 .../ObjectStore/Instances/EditInstance.vue    |  14 +-
 .../ObjectStore/Instances/EditSecrets.vue     |   4 +-
 .../ObjectStore/Instances/ManageIndex.vue     |  12 +-
 .../ObjectStore/Instances/UpgradeForm.test.ts |   8 +-
 .../ObjectStore/Instances/UpgradeForm.vue     |   9 +-
 .../ObjectStore/Instances/services.ts         |  22 +--
 lib/galaxy/webapps/galaxy/api/file_sources.py |  30 +--
 lib/galaxy/webapps/galaxy/api/object_store.py |  26 +--
 21 files changed, 248 insertions(+), 195 deletions(-)

diff --git a/client/src/api/configTemplates.ts b/client/src/api/configTemplates.ts
index 09b6348739e9..ec987c7eb3a7 100644
--- a/client/src/api/configTemplates.ts
+++ b/client/src/api/configTemplates.ts
@@ -19,7 +19,6 @@ export type SecretData = CreateInstancePayload["secrets"];
 export type PluginAspectStatus = components["schemas"]["PluginAspectStatus"];
 export type PluginStatus = components["schemas"]["PluginStatus"];
 
-export type CreateInstancePayload = components["schemas"]["CreateInstancePayload"];
 export type UpgradeInstancePayload = components["schemas"]["UpgradeInstancePayload"];
 export type TestUpgradeInstancePayload = components["schemas"]["TestUpgradeInstancePayload"];
 export type UpdateInstancePayload = components["schemas"]["UpdateInstancePayload"];
diff --git a/client/src/api/objectStores.ts b/client/src/api/objectStores.ts
index 55b9a30d39a2..376d75d8e54a 100644
--- a/client/src/api/objectStores.ts
+++ b/client/src/api/objectStores.ts
@@ -23,8 +23,8 @@ export async function getObjectStoreDetails(id: string) {
     if (id.startsWith("user_objects://")) {
         const userObjectStoreId = id.substring("user_objects://".length);
 
-        const { data, error } = await GalaxyApi().GET("/api/object_store_instances/{user_object_store_id}", {
-            params: { path: { user_object_store_id: userObjectStoreId } },
+        const { data, error } = await GalaxyApi().GET("/api/object_store_instances/{uuid}", {
+            params: { path: { uuid: userObjectStoreId } },
         });
 
         if (error) {
diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts
index b1c70fab2d91..7c9c44a6958b 100644
--- a/client/src/api/schema/schema.ts
+++ b/client/src/api/schema/schema.ts
@@ -906,7 +906,7 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
-    "/api/file_source_instances/{user_file_source_id}": {
+    "/api/file_source_instances/{uuid}": {
         parameters: {
             query?: never;
             header?: never;
@@ -925,7 +925,7 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
-    "/api/file_source_instances/{user_file_source_id}/test": {
+    "/api/file_source_instances/{uuid}/test": {
         parameters: {
             query?: never;
             header?: never;
@@ -3322,7 +3322,7 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
-    "/api/object_store_instances/{user_object_store_id}": {
+    "/api/object_store_instances/{uuid}": {
         parameters: {
             query?: never;
             header?: never;
@@ -3341,7 +3341,7 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
-    "/api/object_store_instances/{user_object_store_id}/test": {
+    "/api/object_store_instances/{uuid}/test": {
         parameters: {
             query?: never;
             header?: never;
@@ -20070,7 +20070,7 @@ export interface operations {
             };
             path: {
                 /** @description The UUID index for a persisted UserFileSourceStore object. */
-                user_file_source_id: string;
+                uuid: string;
             };
             cookie?: never;
         };
@@ -20114,7 +20114,7 @@ export interface operations {
             };
             path: {
                 /** @description The UUID index for a persisted UserFileSourceStore object. */
-                user_file_source_id: string;
+                uuid: string;
             };
             cookie?: never;
         };
@@ -20165,7 +20165,7 @@ export interface operations {
             };
             path: {
                 /** @description The UUID index for a persisted UserFileSourceStore object. */
-                user_file_source_id: string;
+                uuid: string;
             };
             cookie?: never;
         };
@@ -20207,7 +20207,7 @@ export interface operations {
             };
             path: {
                 /** @description The UUID index for a persisted UserFileSourceStore object. */
-                user_file_source_id: string;
+                uuid: string;
             };
             cookie?: never;
         };
@@ -20251,7 +20251,7 @@ export interface operations {
             };
             path: {
                 /** @description The UUID index for a persisted UserFileSourceStore object. */
-                user_file_source_id: string;
+                uuid: string;
             };
             cookie?: never;
         };
@@ -28541,7 +28541,7 @@ export interface operations {
             };
             path: {
                 /** @description The UUID used to identify a persisted UserObjectStore object. */
-                user_object_store_id: string;
+                uuid: string;
             };
             cookie?: never;
         };
@@ -28585,7 +28585,7 @@ export interface operations {
             };
             path: {
                 /** @description The UUID used to identify a persisted UserObjectStore object. */
-                user_object_store_id: string;
+                uuid: string;
             };
             cookie?: never;
         };
@@ -28636,7 +28636,7 @@ export interface operations {
             };
             path: {
                 /** @description The UUID used to identify a persisted UserObjectStore object. */
-                user_object_store_id: string;
+                uuid: string;
             };
             cookie?: never;
         };
@@ -28678,7 +28678,7 @@ export interface operations {
             };
             path: {
                 /** @description The UUID used to identify a persisted UserObjectStore object. */
-                user_object_store_id: string;
+                uuid: string;
             };
             cookie?: never;
         };
@@ -28722,7 +28722,7 @@ export interface operations {
             };
             path: {
                 /** @description The UUID used to identify a persisted UserObjectStore object. */
-                user_object_store_id: string;
+                uuid: string;
             };
             cookie?: never;
         };
diff --git a/client/src/components/ConfigTemplates/useConfigurationTesting.ts b/client/src/components/ConfigTemplates/useConfigurationTesting.ts
index b32876668db4..26ec1389cf8e 100644
--- a/client/src/components/ConfigTemplates/useConfigurationTesting.ts
+++ b/client/src/components/ConfigTemplates/useConfigurationTesting.ts
@@ -1,15 +1,7 @@
 import { computed, type Ref, ref } from "vue";
 
-import type {
-    CreateInstancePayload,
-    Instance,
-    PluginStatus,
-    TemplateSummary,
-    TestUpdateInstancePayload,
-    TestUpgradeInstancePayload,
-    UpdateInstancePayload,
-    UpgradeInstancePayload,
-} from "@/api/configTemplates";
+import { GalaxyApi } from "@/api";
+import { type Instance, type PluginStatus, type TemplateSummary } from "@/api/configTemplates";
 import { type buildInstanceRoutingComposable } from "@/components/ConfigTemplates/routing";
 import { errorMessageAsString } from "@/utils/simple-error";
 
@@ -40,12 +32,15 @@ export function useConfigurationTesting() {
     };
 }
 
+type CreateTestUrl = "/api/object_store_instances/test" | "/api/file_source_instances/test";
+type CreateUrl = "/api/object_store_instances" | "/api/file_source_instances";
+
 export function useConfigurationTemplateCreation<T extends TemplateSummary, R>(
     what: string,
     template: Ref<T>,
     uuid: Ref<string | undefined>,
-    test: (payload: CreateInstancePayload) => Promise<{ data: PluginStatus }>,
-    create: (payload: CreateInstancePayload) => Promise<{ data: R }>,
+    testUrl: CreateTestUrl,
+    createUrl: CreateUrl,
     onCreate: (result: R) => unknown
 ) {
     const error = ref<string | null>(null);
@@ -56,26 +51,41 @@ export function useConfigurationTemplateCreation<T extends TemplateSummary, R>(
         if (uuid.value) {
             payload.uuid = uuid.value;
         }
-        let pluginStatus;
+        let pluginStatus: PluginStatus;
         try {
             testRunning.value = true;
-            const response = await test(payload);
-            pluginStatus = response["data"];
-            testResults.value = pluginStatus;
+            const { data, error: testRequestError } = await GalaxyApi().POST(testUrl, {
+                body: payload,
+            });
+            if (testRequestError) {
+                error.value = "Failed to verify configuration: " + errorMessageAsString(testRequestError);
+                return;
+            } else {
+                pluginStatus = data;
+                testResults.value = pluginStatus;
+            }
         } catch (e) {
             error.value = "Failed to verify configuration: " + errorMessageAsString(e);
             return;
         } finally {
             testRunning.value = false;
         }
-        const testError = pluginStatusToErrorMessage(pluginStatus);
-        if (testError) {
-            error.value = testError;
-            return;
+        if (pluginStatus) {
+            const testError = pluginStatusToErrorMessage(pluginStatus);
+            if (testError) {
+                error.value = testError;
+                return;
+            }
         }
         try {
-            const { data: userObject } = await create(payload);
-            onCreate(userObject);
+            const { data: userObject, error: createRequestError } = await GalaxyApi().POST(createUrl, {
+                body: payload,
+            });
+            if (createRequestError) {
+                error.value = errorMessageAsString(createRequestError);
+            } else {
+                onCreate(userObject as R);
+            }
         } catch (e) {
             error.value = errorMessageAsString(e);
             return;
@@ -102,7 +112,9 @@ export function useConfigurationTemplateCreation<T extends TemplateSummary, R>(
     };
 }
 
-export function useInstanceTesting<R extends Instance>(testInstance: (id: string) => Promise<{ data: PluginStatus }>) {
+type TestInstanceUrl = "/api/file_source_instances/{uuid}/test" | "/api/object_store_instances/{uuid}/test";
+
+export function useInstanceTesting<R extends Instance>(testUrl: TestInstanceUrl) {
     const showTestResults = ref(false);
     const testResults = ref<PluginStatus | undefined>(undefined);
     const testingError = ref<string | undefined>(undefined);
@@ -112,8 +124,16 @@ export function useInstanceTesting<R extends Instance>(testInstance: (id: string
         testingError.value = undefined;
         showTestResults.value = true;
         try {
-            const { data } = await testInstance(instance.uuid);
-            testResults.value = data;
+            const { data, error } = await GalaxyApi().GET(testUrl, {
+                params: { path: { uuid: instance.uuid } },
+            });
+            const pluginStatus = data;
+            const testRequestError = error;
+            if (testRequestError) {
+                testingError.value = errorMessageAsString(testRequestError);
+            } else {
+                testResults.value = pluginStatus;
+            }
         } catch (e) {
             testingError.value = errorMessageAsString(e);
         }
@@ -128,12 +148,15 @@ export function useInstanceTesting<R extends Instance>(testInstance: (id: string
     };
 }
 
+type TestUpdateUrl = "/api/object_store_instances/{uuid}/test" | "/api/file_source_instances/{uuid}/test";
+type UpdateUrl = "/api/object_store_instances/{uuid}" | "/api/file_source_instances/{uuid}";
+
 export function useConfigurationTemplateEdit<T extends TemplateSummary, R extends Instance>(
     what: string,
     instance: Ref<R | null>,
     template: Ref<T | null>,
-    testUpdate: (payload: TestUpdateInstancePayload) => Promise<{ data: PluginStatus }>,
-    update: (payload: UpdateInstancePayload) => Promise<{ data: R }>,
+    testUpdateUrl: TestUpdateUrl,
+    updateUrl: UpdateUrl,
     useRouting: InstanceRoutingComposableType
 ) {
     const { testRunning, testResults } = useConfigurationTesting();
@@ -161,15 +184,21 @@ export function useConfigurationTemplateEdit<T extends TemplateSummary, R extend
     const loadingMessage = `Loading ${what} template and instance information`;
 
     async function onSubmit(formData: any) {
-        if (template.value) {
+        if (template.value && instance.value) {
             const payload = editFormDataToPayload(template.value, formData);
 
             let pluginStatus;
             try {
                 testRunning.value = true;
                 showForceActionButton.value = false;
-                const response = await testUpdate(payload);
-                pluginStatus = response["data"];
+                const { data: pluginStatus, error: testRequestError } = await GalaxyApi().POST(testUpdateUrl, {
+                    params: { path: { uuid: instance.value.uuid } },
+                    body: payload,
+                });
+                if (testRequestError) {
+                    error.value = errorMessageAsString(testRequestError);
+                    showForceActionButton.value = true;
+                }
                 testResults.value = pluginStatus;
             } catch (e) {
                 error.value = errorMessageAsString(e);
@@ -178,16 +207,25 @@ export function useConfigurationTemplateEdit<T extends TemplateSummary, R extend
             } finally {
                 testRunning.value = false;
             }
-            const testError = pluginStatusToErrorMessage(pluginStatus);
-            if (testError) {
-                error.value = testError;
-                showForceActionButton.value = true;
-                return;
+            if (pluginStatus) {
+                const testError = pluginStatusToErrorMessage(pluginStatus);
+                if (testError) {
+                    error.value = testError;
+                    showForceActionButton.value = true;
+                    return;
+                }
             }
 
             try {
-                const response = await update(payload);
-                await onUpdate(response["data"]);
+                const { data, error: updateRequestError } = await GalaxyApi().PUT(updateUrl, {
+                    params: { path: { uuid: instance.value.uuid } },
+                    body: payload,
+                });
+                if (updateRequestError) {
+                    error.value = errorMessageAsString(updateRequestError);
+                } else {
+                    await onUpdate(data as R);
+                }
             } catch (e) {
                 error.value = errorMessageAsString(e);
                 return;
@@ -196,11 +234,18 @@ export function useConfigurationTemplateEdit<T extends TemplateSummary, R extend
     }
 
     async function onForceSubmit(formData: any) {
-        if (template.value) {
+        if (template.value && instance.value) {
             const payload = editFormDataToPayload(template.value, formData);
             try {
-                const response = await update(payload);
-                await onUpdate(response["data"]);
+                const { data, error: updateRequestError } = await GalaxyApi().PUT(updateUrl, {
+                    params: { path: { uuid: instance.value.uuid } },
+                    body: payload,
+                });
+                if (updateRequestError) {
+                    error.value = errorMessageAsString(updateRequestError);
+                } else {
+                    await onUpdate(data as R);
+                }
             } catch (e) {
                 error.value = errorMessageAsString(e);
                 return;
@@ -228,8 +273,8 @@ export function useConfigurationTemplateUpgrade<T extends TemplateSummary, R ext
     what: string,
     instance: Ref<R>,
     template: Ref<T>,
-    testUpdate: (payload: TestUpgradeInstancePayload) => Promise<{ data: PluginStatus }>,
-    update: (payload: UpgradeInstancePayload) => Promise<{ data: R }>,
+    testUpdateUrl: TestUpdateUrl,
+    updateUrl: UpdateUrl,
     useRouting: InstanceRoutingComposableType
 ) {
     const { goToIndex } = useRouting();
@@ -257,14 +302,26 @@ export function useConfigurationTemplateUpgrade<T extends TemplateSummary, R ext
     });
 
     async function onSubmit(formData: any) {
+        if (!instance.value || !template.value) {
+            return;
+        }
+
         const payload = upgradeFormDataToPayload(template.value, formData);
         let pluginStatus;
         try {
             testRunning.value = true;
             showForceActionButton.value = false;
-            const response = await testUpdate(payload);
-            pluginStatus = response["data"];
-            testResults.value = pluginStatus;
+            const { data: pluginStatus, error: testRequestError } = await GalaxyApi().POST(testUpdateUrl, {
+                params: { path: { uuid: instance.value.uuid } },
+                body: payload,
+            });
+            if (testRequestError) {
+                error.value = errorMessageAsString(testRequestError);
+                showForceActionButton.value = true;
+                return;
+            } else {
+                testResults.value = pluginStatus;
+            }
         } catch (e) {
             showForceActionButton.value = true;
             error.value = errorMessageAsString(e);
@@ -272,16 +329,24 @@ export function useConfigurationTemplateUpgrade<T extends TemplateSummary, R ext
         } finally {
             testRunning.value = false;
         }
-        const testError = pluginStatusToErrorMessage(pluginStatus);
-        if (testError) {
-            error.value = testError;
-            showForceActionButton.value = true;
-            return;
+        if (pluginStatus) {
+            const testError = pluginStatusToErrorMessage(pluginStatus);
+            if (testError) {
+                error.value = testError;
+                showForceActionButton.value = true;
+                return;
+            }
         }
-
         try {
-            const response = await update(payload);
-            await onUpgrade(response["data"]);
+            const { data, error: updateRequestError } = await GalaxyApi().PUT(updateUrl, {
+                params: { path: { uuid: instance.value.uuid } },
+                body: payload,
+            });
+            if (updateRequestError) {
+                error.value = errorMessageAsString(updateRequestError);
+            } else {
+                await onUpgrade(data as R);
+            }
         } catch (e) {
             error.value = errorMessageAsString(e);
             return;
@@ -291,8 +356,15 @@ export function useConfigurationTemplateUpgrade<T extends TemplateSummary, R ext
     async function onForceSubmit(formData: any) {
         const payload = upgradeFormDataToPayload(template.value, formData);
         try {
-            const response = await update(payload);
-            await onUpgrade(response["data"]);
+            const { data, error: updateRequestError } = await GalaxyApi().PUT(updateUrl, {
+                params: { path: { uuid: instance.value.uuid } },
+                body: payload,
+            });
+            if (updateRequestError) {
+                error.value = errorMessageAsString(updateRequestError);
+            } else {
+                await onUpgrade(data as R);
+            }
         } catch (e) {
             error.value = errorMessageAsString(e);
             return;
diff --git a/client/src/components/FileSources/Instances/CreateForm.vue b/client/src/components/FileSources/Instances/CreateForm.vue
index eb11814864e0..76c9916bf7bd 100644
--- a/client/src/components/FileSources/Instances/CreateForm.vue
+++ b/client/src/components/FileSources/Instances/CreateForm.vue
@@ -4,7 +4,8 @@ import { toRef } from "vue";
 import type { FileSourceTemplateSummary, UserFileSourceModel } from "@/api/fileSources";
 import { useConfigurationTemplateCreation } from "@/components/ConfigTemplates/useConfigurationTesting";
 
-import { create, test } from "./services";
+const createUrl = "/api/file_source_instances";
+const createTestUrl = "/api/file_source_instances/test";
 
 interface CreateFormProps {
     template: FileSourceTemplateSummary;
@@ -22,8 +23,8 @@ const { ActionSummary, error, inputs, InstanceForm, onSubmit, submitTitle, loadi
         "file source",
         toRef(props, "template"),
         toRef(props, "uuid"),
-        test,
-        create,
+        createTestUrl,
+        createUrl,
         (fileSource: UserFileSourceModel) => emit("created", fileSource)
     );
 </script>
diff --git a/client/src/components/FileSources/Instances/CreateInstance.vue b/client/src/components/FileSources/Instances/CreateInstance.vue
index cee1849cc30a..4daae81903ed 100644
--- a/client/src/components/FileSources/Instances/CreateInstance.vue
+++ b/client/src/components/FileSources/Instances/CreateInstance.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import { computed, watch } from "vue";
 
+import { GalaxyApi } from "@/api";
 import type { UserFileSourceModel } from "@/api/fileSources";
 import { useFileSourceTemplatesStore } from "@/stores/fileSourceTemplatesStore";
 
 import { useInstanceRouting } from "./routing";
-import { getOAuth2Info } from "./services";
 
 import CreateForm from "@/components/FileSources/Instances/CreateForm.vue";
 import LoadingSpan from "@/components/LoadingSpan.vue";
@@ -39,13 +39,23 @@ watch(
     async (requiresAuth) => {
         const templateValue = template.value;
         if (templateValue && requiresAuth) {
-            const { data } = await getOAuth2Info({
-                template_id: templateValue.id,
-                template_version: templateValue.version || 0,
-            });
-            window.location.href = data.authorize_url;
-        } else {
-            console.log("skipping this...");
+            const { data, error: testRequestError } = await GalaxyApi().GET(
+                "/api/file_source_templates/{template_id}/{template_version}/oauth2",
+                {
+                    params: {
+                        path: {
+                            template_id: templateValue.id,
+                            template_version: templateValue.version || 0,
+                        },
+                    },
+                }
+            );
+            if (testRequestError) {
+                console.log("Error getting OAuth2 URL");
+                console.log(testRequestError);
+            } else {
+                window.location.href = data.authorize_url;
+            }
         }
     },
     { immediate: true }
diff --git a/client/src/components/FileSources/Instances/EditInstance.vue b/client/src/components/FileSources/Instances/EditInstance.vue
index d5acdfd689d0..c90b9ce41aff 100644
--- a/client/src/components/FileSources/Instances/EditInstance.vue
+++ b/client/src/components/FileSources/Instances/EditInstance.vue
@@ -2,15 +2,16 @@
 import { BTab, BTabs } from "bootstrap-vue";
 import { computed, ref } from "vue";
 
-import { type TestUpdateInstancePayload, type UpdateInstancePayload } from "@/api/configTemplates";
 import { useConfigurationTemplateEdit } from "@/components/ConfigTemplates/useConfigurationTesting";
 
 import { useInstanceAndTemplate } from "./instance";
 import { useInstanceRouting } from "./routing";
-import { testUpdate, update } from "./services";
 
 import EditSecrets from "./EditSecrets.vue";
 
+const editTestUrl = "/api/file_source_instances/{uuid}/test";
+const editUrl = "/api/file_source_instances/{uuid}";
+
 interface Props {
     instanceId: string;
 }
@@ -34,14 +35,7 @@ const {
     testResults,
     submitTitle,
     showForceActionButton,
-} = useConfigurationTemplateEdit(
-    "file source",
-    instance,
-    template,
-    (payload: TestUpdateInstancePayload) => testUpdate({ user_file_source_id: props.instanceId, ...payload }),
-    (payload: UpdateInstancePayload) => update({ user_file_source_id: props.instanceId, ...payload }),
-    useInstanceRouting
-);
+} = useConfigurationTemplateEdit("file source", instance, template, editTestUrl, editUrl, useInstanceRouting);
 </script>
 <template>
     <div>
diff --git a/client/src/components/FileSources/Instances/EditSecrets.vue b/client/src/components/FileSources/Instances/EditSecrets.vue
index 6ae4b88b3240..1a3346f401ac 100644
--- a/client/src/components/FileSources/Instances/EditSecrets.vue
+++ b/client/src/components/FileSources/Instances/EditSecrets.vue
@@ -15,8 +15,8 @@ const props = defineProps<Props>();
 const title = computed(() => `Update File Source ${props.fileSource?.name} Secrets`);
 
 async function onUpdate(secretName: string, secretValue: string) {
-    const { error } = await GalaxyApi().PUT("/api/file_source_instances/{user_file_source_id}", {
-        params: { path: { user_file_source_id: props.fileSource.uuid } },
+    const { error } = await GalaxyApi().PUT("/api/file_source_instances/{uuid}", {
+        params: { path: { uuid: props.fileSource.uuid } },
         body: {
             secret_name: secretName,
             secret_value: secretValue,
diff --git a/client/src/components/FileSources/Instances/ManageIndex.vue b/client/src/components/FileSources/Instances/ManageIndex.vue
index 597c4f1929f6..3977ffb614bd 100644
--- a/client/src/components/FileSources/Instances/ManageIndex.vue
+++ b/client/src/components/FileSources/Instances/ManageIndex.vue
@@ -7,8 +7,6 @@ import { useInstanceTesting } from "@/components/ConfigTemplates/useConfiguratio
 import { useFiltering } from "@/components/ConfigTemplates/useInstanceFiltering";
 import { useFileSourceInstancesStore } from "@/stores/fileSourceInstancesStore";
 
-import { testInstance } from "./services";
-
 import InstanceDropdown from "./InstanceDropdown.vue";
 import ManageIndexHeader from "@/components/ConfigTemplates/ManageIndexHeader.vue";
 import FileSourceTypeSpan from "@/components/FileSources/FileSourceTypeSpan.vue";
@@ -34,11 +32,10 @@ function reload() {
     fileSourceInstancesStore.fetchInstances();
 }
 
-const { ConfigurationTestSummaryModal, showTestResults, testResults, test, testingError } = useInstanceTesting(
-    (id: string) => {
-        return testInstance({ user_file_source_id: id });
-    }
-);
+const testInstanceUrl = "/api/file_source_instances/{user_file_source_id}/test";
+
+const { ConfigurationTestSummaryModal, showTestResults, testResults, test, testingError } =
+    useInstanceTesting(testInstanceUrl);
 </script>
 
 <template>
diff --git a/client/src/components/FileSources/Instances/UpgradeForm.vue b/client/src/components/FileSources/Instances/UpgradeForm.vue
index cf0e3b0e796a..a33205c13f69 100644
--- a/client/src/components/FileSources/Instances/UpgradeForm.vue
+++ b/client/src/components/FileSources/Instances/UpgradeForm.vue
@@ -1,12 +1,13 @@
 <script setup lang="ts">
 import { computed, toRef } from "vue";
 
-import { type TestUpgradeInstancePayload, type UpgradeInstancePayload } from "@/api/configTemplates";
 import { type FileSourceTemplateSummary, type UserFileSourceModel } from "@/api/fileSources";
 import { useConfigurationTemplateUpgrade } from "@/components/ConfigTemplates/useConfigurationTesting";
 
 import { useInstanceRouting } from "./routing";
-import { testUpdate, update } from "./services";
+
+const editTestUrl = "/api/file_source_instances/{uuid}/test";
+const editUrl = "/api/file_source_instances/{uuid}";
 
 interface Props {
     instance: UserFileSourceModel;
@@ -33,8 +34,8 @@ const {
     "file source",
     toRef(props, "instance"),
     toRef(props, "latestTemplate"),
-    (payload: TestUpgradeInstancePayload) => testUpdate({ user_file_source_id: props.instance.uuid, ...payload }),
-    (payload: UpgradeInstancePayload) => update({ user_file_source_id: props.instance.uuid, ...payload }),
+    editTestUrl,
+    editUrl,
     useInstanceRouting
 );
 </script>
diff --git a/client/src/components/FileSources/Instances/services.ts b/client/src/components/FileSources/Instances/services.ts
index 04a24a12a4f3..01ab0d744154 100644
--- a/client/src/components/FileSources/Instances/services.ts
+++ b/client/src/components/FileSources/Instances/services.ts
@@ -1,22 +1,15 @@
+import { GalaxyApi } from "@/api";
 import type { UserFileSourceModel } from "@/api/fileSources";
-import { fetcher } from "@/api/schema/fetcher";
 
-export const create = fetcher.path("/api/file_source_instances").method("post").create();
-export const test = fetcher.path("/api/file_source_instances/test").method("post").create();
-export const testInstance = fetcher
-    .path("/api/file_source_instances/{user_file_source_id}/test")
-    .method("get")
-    .create();
-export const update = fetcher.path("/api/file_source_instances/{user_file_source_id}").method("put").create();
-export const testUpdate = fetcher.path("/api/file_source_instances/{user_file_source_id}/test").method("post").create();
-export const getOAuth2Info = fetcher
-    .path("/api/file_source_templates/{template_id}/{template_version}/oauth2")
-    .method("get")
-    .create();
+const updateUrl = "/api/file_source_instances/{uuid}";
 
 export async function hide(instance: UserFileSourceModel) {
     const payload = { hidden: true };
-    const args = { user_file_source_id: String(instance?.uuid) };
-    const { data: fileSource } = await update({ ...args, ...payload });
+    const { data: fileSource } = await GalaxyApi().PUT(updateUrl, {
+        params: {
+            path: { uuid: String(instance?.uuid) },
+        },
+        body: payload,
+    });
     return fileSource;
 }
diff --git a/client/src/components/ObjectStore/Instances/CreateForm.test.ts b/client/src/components/ObjectStore/Instances/CreateForm.test.ts
index cbd2ccd153ea..1012bb09858c 100644
--- a/client/src/components/ObjectStore/Instances/CreateForm.test.ts
+++ b/client/src/components/ObjectStore/Instances/CreateForm.test.ts
@@ -111,7 +111,7 @@ describe("CreateForm", () => {
 
         server.use(
             http.post("/api/object_store_instances", ({ response }) => {
-                return response(200).json(OK_PLUGIN_STATUS);
+                return response(200).json(FAKE_OBJECT_STORE);
             }),
             http.post("/api/object_store_instances/test", ({ response }) => {
                 return response(200).json(OK_PLUGIN_STATUS);
diff --git a/client/src/components/ObjectStore/Instances/CreateForm.vue b/client/src/components/ObjectStore/Instances/CreateForm.vue
index 85d4d62f51d3..1c6b3cb5ad06 100644
--- a/client/src/components/ObjectStore/Instances/CreateForm.vue
+++ b/client/src/components/ObjectStore/Instances/CreateForm.vue
@@ -5,7 +5,8 @@ import { useConfigurationTemplateCreation } from "@/components/ConfigTemplates/u
 import type { UserConcreteObjectStore } from "@/components/ObjectStore/Instances/types";
 import type { ObjectStoreTemplateSummary } from "@/components/ObjectStore/Templates/types";
 
-import { create, test } from "./services";
+const createUrl = "/api/object_store_instances";
+const createTestUrl = "/api/object_store_instances/test";
 
 interface CreateFormProps {
     template: ObjectStoreTemplateSummary;
@@ -23,8 +24,8 @@ const { ActionSummary, error, inputs, InstanceForm, onSubmit, submitTitle, loadi
         "storage location",
         toRef(props, "template"),
         toRef(props, "uuid"),
-        test,
-        create,
+        createTestUrl,
+        createUrl,
         (instance: UserConcreteObjectStore) => emit("created", instance)
     );
 </script>
diff --git a/client/src/components/ObjectStore/Instances/EditInstance.vue b/client/src/components/ObjectStore/Instances/EditInstance.vue
index 18e884a9e794..57c4a211bf8c 100644
--- a/client/src/components/ObjectStore/Instances/EditInstance.vue
+++ b/client/src/components/ObjectStore/Instances/EditInstance.vue
@@ -2,15 +2,16 @@
 import { BTab, BTabs } from "bootstrap-vue";
 import { computed, ref } from "vue";
 
-import { type TestUpdateInstancePayload, type UpdateInstancePayload } from "@/api/configTemplates";
 import { useConfigurationTemplateEdit } from "@/components/ConfigTemplates/useConfigurationTesting";
 
 import { useInstanceAndTemplate } from "./instance";
 import { useInstanceRouting } from "./routing";
-import { testUpdate, update } from "./services";
 
 import EditSecrets from "./EditSecrets.vue";
 
+const editTestUrl = "/api/object_store_instances/{uuid}/test";
+const editUrl = "/api/object_store_instances/{uuid}";
+
 interface Props {
     instanceId: string;
 }
@@ -34,14 +35,7 @@ const {
     testResults,
     showForceActionButton,
     submitTitle,
-} = useConfigurationTemplateEdit(
-    "storage location",
-    instance,
-    template,
-    (payload: TestUpdateInstancePayload) => testUpdate({ user_object_store_id: props.instanceId, ...payload }),
-    (payload: UpdateInstancePayload) => update({ user_object_store_id: props.instanceId, ...payload }),
-    useInstanceRouting
-);
+} = useConfigurationTemplateEdit("storage location", instance, template, editTestUrl, editUrl, useInstanceRouting);
 </script>
 <template>
     <div>
diff --git a/client/src/components/ObjectStore/Instances/EditSecrets.vue b/client/src/components/ObjectStore/Instances/EditSecrets.vue
index e9cabecda81e..ab1644c62647 100644
--- a/client/src/components/ObjectStore/Instances/EditSecrets.vue
+++ b/client/src/components/ObjectStore/Instances/EditSecrets.vue
@@ -17,8 +17,8 @@ const props = defineProps<Props>();
 const title = computed(() => `Update Storage Location ${props.objectStore?.name} Secrets`);
 
 async function onUpdate(secretName: string, secretValue: string) {
-    const { error } = await GalaxyApi().PUT("/api/object_store_instances/{user_object_store_id}", {
-        params: { path: { user_object_store_id: props.objectStore.uuid } },
+    const { error } = await GalaxyApi().PUT("/api/object_store_instances/{uuid}", {
+        params: { path: { uuid: props.objectStore.uuid } },
         body: {
             secret_name: secretName,
             secret_value: secretValue,
diff --git a/client/src/components/ObjectStore/Instances/ManageIndex.vue b/client/src/components/ObjectStore/Instances/ManageIndex.vue
index 57dde337353c..f15293792c86 100644
--- a/client/src/components/ObjectStore/Instances/ManageIndex.vue
+++ b/client/src/components/ObjectStore/Instances/ManageIndex.vue
@@ -9,9 +9,6 @@ import { useFiltering } from "@/components/ConfigTemplates/useInstanceFiltering"
 import { useObjectStoreInstancesStore } from "@/stores/objectStoreInstancesStore";
 import _l from "@/utils/localization";
 
-import { testInstance } from "./services";
-
-import InstanceDropdown from "./InstanceDropdown.vue";
 import ManageIndexHeader from "@/components/ConfigTemplates/ManageIndexHeader.vue";
 import LoadingSpan from "@/components/LoadingSpan.vue";
 import ObjectStoreBadges from "@/components/ObjectStore/ObjectStoreBadges.vue";
@@ -43,11 +40,10 @@ function reload() {
     objectStoreInstancesStore.fetchInstances();
 }
 
-const { ConfigurationTestSummaryModal, showTestResults, testResults, test, testingError } = useInstanceTesting(
-    (id: string) => {
-        return testInstance({ user_object_store_id: id });
-    }
-);
+const testInstanceUrl = "/api/object_store_instances/{user_object_store_id}/test";
+
+const { ConfigurationTestSummaryModal, showTestResults, testResults, test, testingError } =
+    useInstanceTesting(testInstanceUrl);
 </script>
 
 <template>
diff --git a/client/src/components/ObjectStore/Instances/UpgradeForm.test.ts b/client/src/components/ObjectStore/Instances/UpgradeForm.test.ts
index ae5d960ff0c0..eed6cf3bdf06 100644
--- a/client/src/components/ObjectStore/Instances/UpgradeForm.test.ts
+++ b/client/src/components/ObjectStore/Instances/UpgradeForm.test.ts
@@ -114,10 +114,10 @@ describe("UpgradeForm", () => {
             router,
         });
         server.use(
-            http.post("/api/object_store_instances/{user_object_store_id}/test", ({ response }) => {
+            http.post("/api/object_store_instances/{uuid}/test", ({ response }) => {
                 return response(200).json(OK_PLUGIN_STATUS);
             }),
-            http.put("/api/object_store_instances/{user_object_store_id}", ({ response }) => {
+            http.put("/api/object_store_instances/{uuid}", ({ response }) => {
                 return response(200).json(INSTANCE);
             })
         );
@@ -141,10 +141,10 @@ describe("UpgradeForm", () => {
             router,
         });
         server.use(
-            http.post("/api/object_store_instances/{user_object_store_id}/test", ({ response }) => {
+            http.post("/api/object_store_instances/{uuid}/test", ({ response }) => {
                 return response(200).json(OK_PLUGIN_STATUS);
             }),
-            http.put("/api/object_store_instances/{user_object_store_id}", ({ response }) => {
+            http.put("/api/object_store_instances/{uuid}", ({ response }) => {
                 return response("4XX").json({ err_msg: "problem upgrading", err_code: 400 }, { status: 400 });
             })
         );
diff --git a/client/src/components/ObjectStore/Instances/UpgradeForm.vue b/client/src/components/ObjectStore/Instances/UpgradeForm.vue
index 98d9fc19158a..fd71339a6cdc 100644
--- a/client/src/components/ObjectStore/Instances/UpgradeForm.vue
+++ b/client/src/components/ObjectStore/Instances/UpgradeForm.vue
@@ -1,14 +1,15 @@
 <script setup lang="ts">
 import { computed, toRef } from "vue";
 
-import { type TestUpgradeInstancePayload, type UpgradeInstancePayload } from "@/api/configTemplates";
 import { useConfigurationTemplateUpgrade } from "@/components/ConfigTemplates/useConfigurationTesting";
 
 import type { ObjectStoreTemplateSummary } from "../Templates/types";
 import { useInstanceRouting } from "./routing";
-import { testUpdate, update } from "./services";
 import { type UserConcreteObjectStore } from "./types";
 
+const editTestUrl = "/api/object_store_instances/{uuid}/test";
+const editUrl = "/api/object_store_instances/{uuid}";
+
 interface Props {
     instance: UserConcreteObjectStore;
     latestTemplate: ObjectStoreTemplateSummary;
@@ -34,8 +35,8 @@ const {
     "storage location",
     toRef(props, "instance"),
     toRef(props, "latestTemplate"),
-    (payload: TestUpgradeInstancePayload) => testUpdate({ user_object_store_id: props.instance.uuid, ...payload }),
-    (payload: UpgradeInstancePayload) => update({ user_object_store_id: props.instance.uuid, ...payload }),
+    editTestUrl,
+    editUrl,
     useInstanceRouting
 );
 </script>
diff --git a/client/src/components/ObjectStore/Instances/services.ts b/client/src/components/ObjectStore/Instances/services.ts
index c762414f0c9d..fc82ca77f03d 100644
--- a/client/src/components/ObjectStore/Instances/services.ts
+++ b/client/src/components/ObjectStore/Instances/services.ts
@@ -1,22 +1,16 @@
-import { fetcher } from "@/api/schema/fetcher";
+import { GalaxyApi } from "@/api";
 
 import type { UserConcreteObjectStore } from "./types";
 
-export const create = fetcher.path("/api/object_store_instances").method("post").create();
-export const test = fetcher.path("/api/object_store_instances/test").method("post").create();
-export const testInstance = fetcher
-    .path("/api/object_store_instances/{user_object_store_id}/test")
-    .method("get")
-    .create();
-export const update = fetcher.path("/api/object_store_instances/{user_object_store_id}").method("put").create();
-export const testUpdate = fetcher
-    .path("/api/object_store_instances/{user_object_store_id}/test")
-    .method("post")
-    .create();
+const updateUrl = "/api/object_store_instances/{uuid}";
 
 export async function hide(instance: UserConcreteObjectStore) {
     const payload = { hidden: true };
-    const args = { user_object_store_id: String(instance?.uuid) };
-    const { data: objectStore } = await update({ ...args, ...payload });
+    const { data: objectStore } = await GalaxyApi().PUT(updateUrl, {
+        params: {
+            path: { uuid: String(instance?.uuid) },
+        },
+        body: payload,
+    });
     return objectStore;
 }
diff --git a/lib/galaxy/webapps/galaxy/api/file_sources.py b/lib/galaxy/webapps/galaxy/api/file_sources.py
index 235afee0e728..4546e7b88ebc 100644
--- a/lib/galaxy/webapps/galaxy/api/file_sources.py
+++ b/lib/galaxy/webapps/galaxy/api/file_sources.py
@@ -115,57 +115,57 @@ def instance_index(
         return self.file_source_instances_manager.index(trans)
 
     @router.get(
-        "/api/file_source_instances/{user_file_source_id}",
+        "/api/file_source_instances/{uuid}",
         summary="Get a persisted user file source instance.",
         operation_id="file_sources__instances_get",
     )
     def instances_show(
         self,
         trans: ProvidesUserContext = DependsOnTrans,
-        user_file_source_id: UUID4 = UserFileSourceIdPathParam,
+        uuid: UUID4 = UserFileSourceIdPathParam,
     ) -> UserFileSourceModel:
-        return self.file_source_instances_manager.show(trans, user_file_source_id)
+        return self.file_source_instances_manager.show(trans, uuid)
 
     @router.get(
-        "/api/file_source_instances/{user_file_source_id}/test",
+        "/api/file_source_instances/{uuid}/test",
         summary="Test a file source instance and return status.",
         operation_id="file_sources__instances_test_instance",
     )
     def instance_test(
         self,
         trans: ProvidesUserContext = DependsOnTrans,
-        user_file_source_id: UUID4 = UserFileSourceIdPathParam,
+        uuid: UUID4 = UserFileSourceIdPathParam,
     ) -> PluginStatus:
-        return self.file_source_instances_manager.plugin_status_for_instance(trans, user_file_source_id)
+        return self.file_source_instances_manager.plugin_status_for_instance(trans, uuid)
 
     @router.put(
-        "/api/file_source_instances/{user_file_source_id}",
+        "/api/file_source_instances/{uuid}",
         summary="Update or upgrade user file source instance.",
         operation_id="file_sources__instances_update",
     )
     def update_instance(
         self,
         trans: ProvidesUserContext = DependsOnTrans,
-        user_file_source_id: UUID4 = UserFileSourceIdPathParam,
+        uuid: UUID4 = UserFileSourceIdPathParam,
         payload: ModifyInstancePayload = Body(...),
     ) -> UserFileSourceModel:
-        return self.file_source_instances_manager.modify_instance(trans, user_file_source_id, payload)
+        return self.file_source_instances_manager.modify_instance(trans, uuid, payload)
 
     @router.post(
-        "/api/file_source_instances/{user_file_source_id}/test",
+        "/api/file_source_instances/{uuid}/test",
         summary="Test updating or upgrading user file source instance.",
         operation_id="file_sources__test_instances_update",
     )
     def test_update_instance(
         self,
         trans: ProvidesUserContext = DependsOnTrans,
-        user_file_source_id: UUID4 = UserFileSourceIdPathParam,
+        uuid: UUID4 = UserFileSourceIdPathParam,
         payload: TestModifyInstancePayload = Body(...),
     ) -> PluginStatus:
-        return self.file_source_instances_manager.test_modify_instance(trans, user_file_source_id, payload)
+        return self.file_source_instances_manager.test_modify_instance(trans, uuid, payload)
 
     @router.delete(
-        "/api/file_source_instances/{user_file_source_id}",
+        "/api/file_source_instances/{uuid}",
         summary="Purge user file source instance.",
         operation_id="file_sources__instances_purge",
         status_code=status.HTTP_204_NO_CONTENT,
@@ -173,7 +173,7 @@ def test_update_instance(
     def purge_instance(
         self,
         trans: ProvidesUserContext = DependsOnTrans,
-        user_file_source_id: UUID4 = UserFileSourceIdPathParam,
+        uuid: UUID4 = UserFileSourceIdPathParam,
     ):
-        self.file_source_instances_manager.purge_instance(trans, user_file_source_id)
+        self.file_source_instances_manager.purge_instance(trans, uuid)
         return Response(status_code=status.HTTP_204_NO_CONTENT)
diff --git a/lib/galaxy/webapps/galaxy/api/object_store.py b/lib/galaxy/webapps/galaxy/api/object_store.py
index 288350e2bb4c..0963530e5818 100644
--- a/lib/galaxy/webapps/galaxy/api/object_store.py
+++ b/lib/galaxy/webapps/galaxy/api/object_store.py
@@ -130,7 +130,7 @@ def instance_index(
         return self.object_store_instance_manager.index(trans)
 
     @router.get(
-        "/api/object_store_instances/{user_object_store_id}",
+        "/api/object_store_instances/{uuid}",
         summary="Get a persisted user object store instance.",
         operation_id="object_stores__instances_get",
     )
@@ -138,21 +138,21 @@ def instances_show(
         self,
         trans: ProvidesUserContext = DependsOnTrans,
         user: User = DependsOnUser,
-        user_object_store_id: UUID4 = UserObjectStoreIdPathParam,
+        uuid: UUID4 = UserObjectStoreIdPathParam,
     ) -> UserConcreteObjectStoreModel:
-        return self.object_store_instance_manager.show(trans, user_object_store_id)
+        return self.object_store_instance_manager.show(trans, uuid)
 
     @router.get(
-        "/api/object_store_instances/{user_object_store_id}/test",
+        "/api/object_store_instances/{uuid}/test",
         summary="Get a persisted user object store instance.",
         operation_id="object_stores__instances_test_instance",
     )
     def instance_test(
         self,
         trans: ProvidesUserContext = DependsOnTrans,
-        user_object_store_id: UUID4 = UserObjectStoreIdPathParam,
+        uuid: UUID4 = UserObjectStoreIdPathParam,
     ) -> PluginStatus:
-        return self.object_store_instance_manager.plugin_status_for_instance(trans, user_object_store_id)
+        return self.object_store_instance_manager.plugin_status_for_instance(trans, uuid)
 
     @router.get(
         "/api/object_stores/{object_store_id}",
@@ -166,7 +166,7 @@ def show_info(
         return self._model_for(object_store_id)
 
     @router.put(
-        "/api/object_store_instances/{user_object_store_id}",
+        "/api/object_store_instances/{uuid}",
         summary="Update or upgrade user object store instance.",
         operation_id="object_stores__instances_update",
     )
@@ -174,13 +174,13 @@ def update_instance(
         self,
         trans: ProvidesUserContext = DependsOnTrans,
         user: User = DependsOnUser,
-        user_object_store_id: UUID4 = UserObjectStoreIdPathParam,
+        uuid: UUID4 = UserObjectStoreIdPathParam,
         payload: ModifyInstancePayload = Body(...),
     ) -> UserConcreteObjectStoreModel:
-        return self.object_store_instance_manager.modify_instance(trans, user_object_store_id, payload)
+        return self.object_store_instance_manager.modify_instance(trans, uuid, payload)
 
     @router.post(
-        "/api/object_store_instances/{user_object_store_id}/test",
+        "/api/object_store_instances/{uuid}/test",
         summary="Test updating or upgrading user object source instance.",
         operation_id="object_stores__test_instances_update",
     )
@@ -193,7 +193,7 @@ def test_update_instance(
         return self.object_store_instance_manager.test_modify_instance(trans, user_file_source_id, payload)
 
     @router.delete(
-        "/api/object_store_instances/{user_object_store_id}",
+        "/api/object_store_instances/{uuid}",
         summary="Purge user object store instance.",
         operation_id="object_stores__instances_purge",
         status_code=status.HTTP_204_NO_CONTENT,
@@ -202,9 +202,9 @@ def purge_instance(
         self,
         trans: ProvidesUserContext = DependsOnTrans,
         user: User = DependsOnUser,
-        user_object_store_id: UUID4 = UserObjectStoreIdPathParam,
+        uuid: UUID4 = UserObjectStoreIdPathParam,
     ):
-        self.object_store_instance_manager.purge_instance(trans, user_object_store_id)
+        self.object_store_instance_manager.purge_instance(trans, uuid)
         return Response(status_code=status.HTTP_204_NO_CONTENT)
 
     @router.get(