diff --git a/client/src/api/configTemplates.ts b/client/src/api/configTemplates.ts
index 51b21382c505..187c3a5931a9 100644
--- a/client/src/api/configTemplates.ts
+++ b/client/src/api/configTemplates.ts
@@ -17,6 +17,12 @@ export type SecretData = { [key: string]: string };
 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"];
+export type TestUpdateInstancePayload = components["schemas"]["TestUpdateInstancePayload"];
+
 export interface TemplateSummary {
     description: string | null;
     hidden?: boolean;
diff --git a/client/src/api/schema/schema.ts b/client/src/api/schema/schema.ts
index 2db6faeb1963..389a25f52387 100644
--- a/client/src/api/schema/schema.ts
+++ b/client/src/api/schema/schema.ts
@@ -322,6 +322,12 @@ export interface paths {
         /** Purge user file source instance. */
         delete: operations["file_sources__instances_purge"];
     };
+    "/api/file_source_instances/{user_file_source_id}/test": {
+        /** Test a file source instance and return status. */
+        get: operations["file_sources__instances_test_instance"];
+        /** Test updating or upgrading user file source instance. */
+        post: operations["file_sources__test_instances_update"];
+    };
     "/api/file_source_templates": {
         /** Get a list of file source templates available to build user defined file sources from */
         get: operations["file_sources__templates_index"];
@@ -1273,6 +1279,12 @@ export interface paths {
         /** Purge user object store instance. */
         delete: operations["object_stores__instances_purge"];
     };
+    "/api/object_store_instances/{user_object_store_id}/test": {
+        /** Get a persisted user object store instance. */
+        get: operations["object_stores__instances_test_instance"];
+        /** Test updating or upgrading user object source instance. */
+        post: operations["object_stores__test_instances_update"];
+    };
     "/api/object_store_templates": {
         /** Get a list of object store templates available to build user defined object stores from */
         get: operations["object_stores__templates_index"];
@@ -11996,6 +12008,26 @@ export interface components {
              */
             type: "string";
         };
+        /** TestUpdateInstancePayload */
+        TestUpdateInstancePayload: {
+            /** Variables */
+            variables?: {
+                [key: string]: (string | boolean | number) | undefined;
+            } | null;
+        };
+        /** TestUpgradeInstancePayload */
+        TestUpgradeInstancePayload: {
+            /** Secrets */
+            secrets: {
+                [key: string]: string | undefined;
+            };
+            /** Template Version */
+            template_version: number;
+            /** Variables */
+            variables: {
+                [key: string]: (string | boolean | number) | undefined;
+            };
+        };
         /** ToolDataDetails */
         ToolDataDetails: {
             /**
@@ -15062,6 +15094,67 @@ export interface operations {
             };
         };
     };
+    file_sources__instances_test_instance: {
+        /** Test a file source instance and return status. */
+        parameters: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string | null;
+            };
+            /** @description The UUID index for a persisted UserFileSourceStore object. */
+            path: {
+                user_file_source_id: string;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": components["schemas"]["PluginStatus"];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
+    file_sources__test_instances_update: {
+        /** Test updating or upgrading user file source instance. */
+        parameters: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string | null;
+            };
+            /** @description The UUID index for a persisted UserFileSourceStore object. */
+            path: {
+                user_file_source_id: string;
+            };
+        };
+        requestBody: {
+            content: {
+                "application/json":
+                    | components["schemas"]["TestUpgradeInstancePayload"]
+                    | components["schemas"]["TestUpdateInstancePayload"];
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": components["schemas"]["PluginStatus"];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
     file_sources__templates_index: {
         /** Get a list of file source templates available to build user defined file sources from */
         parameters?: {
@@ -20986,6 +21079,67 @@ export interface operations {
             };
         };
     };
+    object_stores__instances_test_instance: {
+        /** Get a persisted user object store instance. */
+        parameters: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string | null;
+            };
+            /** @description The UUID used to identify a persisted UserObjectStore object. */
+            path: {
+                user_object_store_id: string;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": components["schemas"]["PluginStatus"];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
+    object_stores__test_instances_update: {
+        /** Test updating or upgrading user object source instance. */
+        parameters: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string | null;
+            };
+            /** @description The UUID used to identify a persisted UserObjectStore object. */
+            path: {
+                user_object_store_id: string;
+            };
+        };
+        requestBody: {
+            content: {
+                "application/json":
+                    | components["schemas"]["TestUpgradeInstancePayload"]
+                    | components["schemas"]["TestUpdateInstancePayload"];
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": components["schemas"]["PluginStatus"];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
     object_stores__templates_index: {
         /** Get a list of object store templates available to build user defined object stores from */
         parameters?: {
diff --git a/client/src/components/ConfigTemplates/ActionSummary.vue b/client/src/components/ConfigTemplates/ActionSummary.vue
new file mode 100644
index 000000000000..6e4652a584fe
--- /dev/null
+++ b/client/src/components/ConfigTemplates/ActionSummary.vue
@@ -0,0 +1,29 @@
+<script lang="ts" setup>
+import { BAlert, BButton } from "bootstrap-vue";
+import { ref } from "vue";
+
+import type { PluginStatus } from "@/api/configTemplates";
+
+import ConfigurationTestSummaryModal from "@/components/ConfigTemplates/ConfigurationTestSummaryModal.vue";
+
+interface Props {
+    error: String | null;
+    testResults?: PluginStatus;
+    errorDataDescription: string;
+}
+
+const showTestResults = ref(false);
+defineProps<Props>();
+</script>
+
+<template>
+    <div>
+        <ConfigurationTestSummaryModal v-model="showTestResults" :test-results="testResults" />
+        <BAlert v-if="error" variant="danger" class="configuration-instance-error" show>
+            <span :data-description="errorDataDescription">
+                {{ error }}
+            </span>
+            <BButton variant="link" @click="showTestResults = true">View configuration test status.</BButton>
+        </BAlert>
+    </div>
+</template>
diff --git a/client/src/components/ConfigTemplates/ConfigurationTestItem.vue b/client/src/components/ConfigTemplates/ConfigurationTestItem.vue
new file mode 100644
index 000000000000..3d360b35b708
--- /dev/null
+++ b/client/src/components/ConfigTemplates/ConfigurationTestItem.vue
@@ -0,0 +1,32 @@
+<script lang="ts" setup>
+import { library } from "@fortawesome/fontawesome-svg-core";
+import { faCheckSquare, faSquare, faTimes } from "@fortawesome/free-solid-svg-icons";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import { BListGroupItem, BSpinner } from "bootstrap-vue";
+
+import type { PluginAspectStatus } from "@/api/configTemplates";
+
+library.add(faCheckSquare, faTimes, faSquare);
+
+interface Props {
+    status?: PluginAspectStatus;
+}
+
+defineProps<Props>();
+</script>
+
+<template>
+    <BListGroupItem href="#" class="d-flex align-items-center">
+        <BSpinner v-if="status == undefined" class="mr-3" label="Testing...."></BSpinner>
+        <FontAwesomeIcon
+            v-else-if="status.state == 'ok'"
+            class="mr-3 text-success"
+            icon="fas fa-check-square"
+            size="lg" />
+        <FontAwesomeIcon v-else-if="status.state == 'not_ok'" class="mr-3 text-warning" icon="fas fa-times" size="lg" />
+        <FontAwesomeIcon v-else-if="status.state == 'unknown'" class="mr-3 text-info" icon="fas fa-square" size="lg" />
+        <span v-if="status && status.message" class="mr-auto">
+            {{ status.message }}
+        </span>
+    </BListGroupItem>
+</template>
diff --git a/client/src/components/ConfigTemplates/ConfigurationTestSummary.vue b/client/src/components/ConfigTemplates/ConfigurationTestSummary.vue
new file mode 100644
index 000000000000..be17f1593821
--- /dev/null
+++ b/client/src/components/ConfigTemplates/ConfigurationTestSummary.vue
@@ -0,0 +1,21 @@
+<script lang="ts" setup>
+import { BListGroup } from "bootstrap-vue";
+
+import type { PluginStatus } from "@/api/configTemplates";
+
+import ConfigurationTestItem from "./ConfigurationTestItem.vue";
+
+interface Props {
+    testResults?: PluginStatus;
+}
+
+defineProps<Props>();
+</script>
+
+<template>
+    <BListGroup v-if="testResults">
+        <ConfigurationTestItem :status="testResults?.template_definition" />
+        <ConfigurationTestItem :status="testResults?.template_settings" />
+        <ConfigurationTestItem :status="testResults?.connection" />
+    </BListGroup>
+</template>
diff --git a/client/src/components/ConfigTemplates/ConfigurationTestSummaryModal.vue b/client/src/components/ConfigTemplates/ConfigurationTestSummaryModal.vue
new file mode 100644
index 000000000000..22fa8a8b4736
--- /dev/null
+++ b/client/src/components/ConfigTemplates/ConfigurationTestSummaryModal.vue
@@ -0,0 +1,39 @@
+<script lang="ts" setup>
+import { BAlert, BModal } from "bootstrap-vue";
+import { ref, watch } from "vue";
+
+import type { PluginStatus } from "@/api/configTemplates";
+
+import ConfigurationTestSummary from "./ConfigurationTestSummary.vue";
+
+interface Props {
+    value: boolean;
+    testResults?: PluginStatus;
+    error?: string;
+}
+
+const props = defineProps<Props>();
+
+const show = ref(props.value);
+
+watch(props, () => {
+    show.value = props.value;
+});
+
+const emit = defineEmits<{
+    (e: "input", value: boolean): void;
+}>();
+
+watch(show, () => {
+    emit("input", show.value);
+});
+</script>
+
+<template>
+    <BModal v-model="show" title="Configuration Test Summary" hide-footer>
+        <BAlert v-if="error" variant="danger" show dismissible>
+            {{ error || "" }}
+        </BAlert>
+        <ConfigurationTestSummary :test-results="testResults" />
+    </BModal>
+</template>
diff --git a/client/src/components/ConfigTemplates/ForceActionButton.vue b/client/src/components/ConfigTemplates/ForceActionButton.vue
new file mode 100644
index 000000000000..55d42274f388
--- /dev/null
+++ b/client/src/components/ConfigTemplates/ForceActionButton.vue
@@ -0,0 +1,17 @@
+<script setup lang="ts">
+import { BButton } from "bootstrap-vue";
+
+interface Props {
+    action: string;
+}
+
+defineProps<Props>();
+
+const emit = defineEmits<{
+    (e: "click"): void;
+}>();
+</script>
+
+<template>
+    <BButton variant="link" @click="emit('click')">I know what I am doing, force {{ action.toLowerCase() }}.</BButton>
+</template>
diff --git a/client/src/components/ConfigTemplates/InstanceDropdown.test.ts b/client/src/components/ConfigTemplates/InstanceDropdown.test.ts
index e29d8d883113..abfca1e3070a 100644
--- a/client/src/components/ConfigTemplates/InstanceDropdown.test.ts
+++ b/client/src/components/ConfigTemplates/InstanceDropdown.test.ts
@@ -19,7 +19,7 @@ describe("InstanceDropdown", () => {
         });
         const menu = wrapper.find(".dropdown-menu");
         const links = menu.findAll("button.dropdown-item");
-        expect(links.length).toBe(2);
+        expect(links.length).toBe(3);
     });
 
     it("should render a drop down with upgrade if upgrade available as an option", async () => {
@@ -35,6 +35,6 @@ describe("InstanceDropdown", () => {
         });
         const menu = wrapper.find(".dropdown-menu");
         const links = menu.findAll("button.dropdown-item");
-        expect(links.length).toBe(3);
+        expect(links.length).toBe(4);
     });
 });
diff --git a/client/src/components/ConfigTemplates/InstanceDropdown.vue b/client/src/components/ConfigTemplates/InstanceDropdown.vue
index 95bbbf863cb8..f3fc2cebddd0 100644
--- a/client/src/components/ConfigTemplates/InstanceDropdown.vue
+++ b/client/src/components/ConfigTemplates/InstanceDropdown.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { library } from "@fortawesome/fontawesome-svg-core";
-import { faArrowUp, faCaretDown, faEdit, faTrash } from "@fortawesome/free-solid-svg-icons";
+import { faArrowUp, faCaretDown, faEdit, faStethoscope, faTrash } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { useRouter } from "vue-router/composables";
 
@@ -12,7 +12,7 @@ interface Props {
     isUpgradable: boolean;
 }
 
-library.add(faArrowUp, faCaretDown, faEdit, faTrash);
+library.add(faArrowUp, faCaretDown, faEdit, faStethoscope, faTrash);
 
 const router = useRouter();
 
@@ -20,6 +20,7 @@ defineProps<Props>();
 
 const emit = defineEmits<{
     (e: "remove"): void;
+    (e: "test"): void;
 }>();
 </script>
 
@@ -53,6 +54,10 @@ const emit = defineEmits<{
                 <FontAwesomeIcon icon="edit" />
                 <span v-localize>Edit configuration</span>
             </button>
+            <button class="dropdown-item" @keypress="emit('test')" @click.prevent="emit('test')">
+                <FontAwesomeIcon icon="stethoscope" />
+                <span v-localize>Test instance</span>
+            </button>
             <button class="dropdown-item" @keypress="emit('remove')" @click.prevent="emit('remove')">
                 <FontAwesomeIcon icon="trash" />
                 <span v-localize>Remove instance</span>
diff --git a/client/src/components/ConfigTemplates/InstanceForm.vue b/client/src/components/ConfigTemplates/InstanceForm.vue
index 129870128228..530cb0b95f75 100644
--- a/client/src/components/ConfigTemplates/InstanceForm.vue
+++ b/client/src/components/ConfigTemplates/InstanceForm.vue
@@ -3,6 +3,7 @@ import { BButton } from "bootstrap-vue";
 
 import { type FormEntry } from "./formUtil";
 
+import ForceActionButton from "./ForceActionButton.vue";
 import FormCard from "@/components/Form/FormCard.vue";
 import FormDisplay from "@/components/Form/FormDisplay.vue";
 import LoadingSpan from "@/components/LoadingSpan.vue";
@@ -12,14 +13,18 @@ interface Props {
     inputs?: Array<FormEntry>; // not fully reactive so make sure to not mutate this array
     submitTitle: string;
     loadingMessage: string;
+    busy: boolean;
+    showForceActionButton?: boolean;
 }
 
 withDefaults(defineProps<Props>(), {
     inputs: undefined,
+    showForceActionButton: false,
 });
 
 const emit = defineEmits<{
     (e: "onSubmit", formData: any): void;
+    (e: "onForceSubmit", formData: any): void;
 }>();
 
 let formData: any;
@@ -31,6 +36,10 @@ function onChange(incoming: any) {
 async function handleSubmit() {
     emit("onSubmit", formData);
 }
+
+async function handleForceSubmit() {
+    emit("onForceSubmit", formData);
+}
 </script>
 <template>
     <div>
@@ -42,9 +51,11 @@ async function handleSubmit() {
                 </template>
             </FormCard>
             <div class="mt-3">
-                <BButton id="submit" variant="primary" class="mr-1" @click="handleSubmit">
+                <BButton id="submit" variant="primary" class="mr-1" :disabled="busy" @click="handleSubmit">
                     {{ submitTitle }}
                 </BButton>
+                <ForceActionButton v-show="showForceActionButton" :action="submitTitle" @click="handleForceSubmit">
+                </ForceActionButton>
             </div>
         </div>
     </div>
diff --git a/client/src/components/ConfigTemplates/formUtil.ts b/client/src/components/ConfigTemplates/formUtil.ts
index e211cb301729..fec6b6400467 100644
--- a/client/src/components/ConfigTemplates/formUtil.ts
+++ b/client/src/components/ConfigTemplates/formUtil.ts
@@ -1,4 +1,5 @@
 import type {
+    CreateInstancePayload,
     Instance,
     PluginStatus,
     SecretData,
@@ -139,7 +140,7 @@ export function createTemplateForm(template: TemplateSummary, what: string): For
     return form;
 }
 
-export function createFormDataToPayload(template: TemplateSummary, formData: any) {
+export function createFormDataToPayload(template: TemplateSummary, formData: any): CreateInstancePayload {
     const variables = template.variables ?? [];
     const secrets = template.secrets ?? [];
     const variableData: VariableData = {};
diff --git a/client/src/components/ConfigTemplates/routing.ts b/client/src/components/ConfigTemplates/routing.ts
new file mode 100644
index 000000000000..d8b63d60ca8d
--- /dev/null
+++ b/client/src/components/ConfigTemplates/routing.ts
@@ -0,0 +1,18 @@
+import { useRouter } from "vue-router/composables";
+
+export function buildInstanceRoutingComposable(index: string) {
+    return () => {
+        const router = useRouter();
+
+        async function goToIndex(query: Record<"message", string>) {
+            router.push({
+                path: index,
+                query: query,
+            });
+        }
+
+        return {
+            goToIndex,
+        };
+    };
+}
diff --git a/client/src/components/ConfigTemplates/test_fixtures.ts b/client/src/components/ConfigTemplates/test_fixtures.ts
index f29e8d5bd598..93feec2a79b6 100644
--- a/client/src/components/ConfigTemplates/test_fixtures.ts
+++ b/client/src/components/ConfigTemplates/test_fixtures.ts
@@ -1,3 +1,4 @@
+import type { PluginStatus } from "@/api/configTemplates";
 import type { FileSourceTemplateSummary } from "@/api/fileSources";
 import type { UserConcreteObjectStore } from "@/components/ObjectStore/Instances/types";
 import type { ObjectStoreTemplateSummary } from "@/components/ObjectStore/Templates/types";
@@ -119,3 +120,18 @@ export const OBJECT_STORE_INSTANCE: UserConcreteObjectStore = {
     hidden: false,
     purged: false,
 };
+
+export const OK_PLUGIN_STATUS: PluginStatus = {
+    template_definition: {
+        state: "ok",
+        message: "ok",
+    },
+    template_settings: {
+        state: "ok",
+        message: "ok",
+    },
+    connection: {
+        state: "ok",
+        message: "ok",
+    },
+};
diff --git a/client/src/components/ConfigTemplates/useConfigurationTesting.ts b/client/src/components/ConfigTemplates/useConfigurationTesting.ts
new file mode 100644
index 000000000000..9c2de8a60c7f
--- /dev/null
+++ b/client/src/components/ConfigTemplates/useConfigurationTesting.ts
@@ -0,0 +1,311 @@
+import { computed, type Ref, ref } from "vue";
+
+import type {
+    CreateInstancePayload,
+    Instance,
+    PluginStatus,
+    TemplateSummary,
+    TestUpdateInstancePayload,
+    TestUpgradeInstancePayload,
+    UpdateInstancePayload,
+    UpgradeInstancePayload,
+} from "@/api/configTemplates";
+import { buildInstanceRoutingComposable } from "@/components/ConfigTemplates/routing";
+import { errorMessageAsString } from "@/utils/simple-error";
+
+import {
+    createFormDataToPayload,
+    createTemplateForm,
+    editFormDataToPayload,
+    editTemplateForm,
+    type FormEntry,
+    pluginStatusToErrorMessage,
+    upgradeForm,
+    upgradeFormDataToPayload,
+} from "./formUtil";
+
+import ActionSummary from "./ActionSummary.vue";
+import ConfigurationTestSummaryModal from "@/components/ConfigTemplates/ConfigurationTestSummaryModal.vue";
+import InstanceForm from "@/components/ConfigTemplates/InstanceForm.vue";
+
+type InstanceRoutingComposableType = ReturnType<typeof buildInstanceRoutingComposable>;
+
+export function useConfigurationTesting() {
+    const testRunning = ref<boolean>(false);
+    const testResults = ref<PluginStatus | undefined>(undefined);
+
+    return {
+        testRunning,
+        testResults,
+    };
+}
+
+export function useConfigurationTemplateCreation<T extends TemplateSummary, R>(
+    what: string,
+    template: Ref<T>,
+    test: (payload: CreateInstancePayload) => Promise<{ data: PluginStatus }>,
+    create: (payload: CreateInstancePayload) => Promise<{ data: R }>,
+    onCreate: (result: R) => unknown
+) {
+    const error = ref<string | null>(null);
+    const { testRunning, testResults } = useConfigurationTesting();
+
+    async function onSubmit(formData: any) {
+        const payload = createFormDataToPayload(template.value, formData);
+        let pluginStatus;
+        try {
+            testRunning.value = true;
+            const response = await test(payload);
+            pluginStatus = response["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;
+        }
+        try {
+            const { data: userObject } = await create(payload);
+            onCreate(userObject);
+        } catch (e) {
+            error.value = errorMessageAsString(e);
+            return;
+        }
+    }
+
+    const inputs = computed<FormEntry[]>(() => {
+        return createTemplateForm(template.value, what);
+    });
+
+    const submitTitle = "Create";
+    const loadingMessage = `Loading ${what} template and instance information`;
+
+    return {
+        ActionSummary,
+        error,
+        inputs,
+        InstanceForm,
+        onSubmit,
+        submitTitle,
+        loadingMessage,
+        testRunning,
+        testResults,
+    };
+}
+
+export function useInstanceTesting<R extends Instance>(testInstance: (id: string) => Promise<{ data: PluginStatus }>) {
+    const showTestResults = ref(false);
+    const testResults = ref<PluginStatus | undefined>(undefined);
+    const testingError = ref<string | undefined>(undefined);
+
+    async function test(instance: R) {
+        testResults.value = undefined;
+        testingError.value = undefined;
+        showTestResults.value = true;
+        try {
+            const { data } = await testInstance(instance.uuid);
+            testResults.value = data;
+        } catch (e) {
+            testingError.value = errorMessageAsString(e);
+        }
+    }
+
+    return {
+        ConfigurationTestSummaryModal,
+        showTestResults,
+        testResults,
+        testingError,
+        test,
+    };
+}
+
+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 }>,
+    useRouting: InstanceRoutingComposableType
+) {
+    const { testRunning, testResults } = useConfigurationTesting();
+    const showForceActionButton = ref<boolean>(false);
+
+    const { goToIndex } = useRouting();
+
+    async function onUpdate(objectStore: R) {
+        const message = `Updated ${what} ${objectStore.name}`;
+        goToIndex({ message });
+    }
+
+    const inputs = computed<Array<FormEntry> | undefined>(() => {
+        const realizedInstance = instance.value;
+        const realizedTemplate = template.value;
+        if (!realizedInstance || !realizedTemplate) {
+            return undefined;
+        }
+        return editTemplateForm(realizedTemplate, what, realizedInstance);
+    });
+
+    const error = ref<string | null>(null);
+    const hasSecrets = computed(() => instance.value?.secrets && instance.value?.secrets.length > 0);
+    const submitTitle = "Update Settings";
+    const loadingMessage = `Loading ${what} template and instance information`;
+
+    async function onSubmit(formData: any) {
+        if (template.value) {
+            const payload = editFormDataToPayload(template.value, formData);
+
+            let pluginStatus;
+            try {
+                testRunning.value = true;
+                showForceActionButton.value = false;
+                const response = await testUpdate(payload);
+                pluginStatus = response["data"];
+                testResults.value = pluginStatus;
+            } catch (e) {
+                error.value = errorMessageAsString(e);
+                showForceActionButton.value = true;
+                return;
+            } finally {
+                testRunning.value = false;
+            }
+            const testError = pluginStatusToErrorMessage(pluginStatus);
+            if (testError) {
+                error.value = testError;
+                showForceActionButton.value = true;
+                return;
+            }
+
+            try {
+                const response = await update(payload);
+                await onUpdate(response["data"]);
+            } catch (e) {
+                error.value = errorMessageAsString(e);
+                return;
+            }
+        }
+    }
+
+    async function onForceSubmit(formData: any) {
+        if (template.value) {
+            const payload = editFormDataToPayload(template.value, formData);
+            try {
+                const response = await update(payload);
+                await onUpdate(response["data"]);
+            } catch (e) {
+                error.value = errorMessageAsString(e);
+                return;
+            }
+        }
+    }
+
+    return {
+        error,
+        ActionSummary,
+        inputs,
+        InstanceForm,
+        hasSecrets,
+        loadingMessage,
+        onForceSubmit,
+        onSubmit,
+        showForceActionButton,
+        submitTitle,
+        testResults,
+        testRunning,
+    };
+}
+
+export function useConfigurationTemplateUpgrade<T extends TemplateSummary, R extends Instance>(
+    what: string,
+    instance: Ref<R>,
+    template: Ref<T>,
+    testUpdate: (payload: TestUpgradeInstancePayload) => Promise<{ data: PluginStatus }>,
+    update: (payload: UpgradeInstancePayload) => Promise<{ data: R }>,
+    useRouting: InstanceRoutingComposableType
+) {
+    const { goToIndex } = useRouting();
+
+    async function onUpgrade(objectStore: R) {
+        const message = `Upgraded ${what} ${objectStore.name}`;
+        goToIndex({ message });
+    }
+
+    const error = ref<string | null>(null);
+    const { testRunning, testResults } = useConfigurationTesting();
+    const showForceActionButton = ref<boolean>(false);
+
+    const submitTitle = "Upgrade Configuration";
+    const loadingMessage = `Loading latest ${what} template and instance information`;
+
+    const inputs = computed<Array<FormEntry> | undefined>(() => {
+        const realizedInstance = instance.value;
+        const realizedLatestTemplate = template.value;
+        if (!realizedInstance || !realizedLatestTemplate) {
+            return undefined;
+        }
+        const form = upgradeForm(realizedLatestTemplate, realizedInstance);
+        return form;
+    });
+
+    async function onSubmit(formData: any) {
+        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;
+        } catch (e) {
+            showForceActionButton.value = true;
+            error.value = errorMessageAsString(e);
+            return;
+        } finally {
+            testRunning.value = false;
+        }
+        const testError = pluginStatusToErrorMessage(pluginStatus);
+        if (testError) {
+            error.value = testError;
+            showForceActionButton.value = true;
+            return;
+        }
+
+        try {
+            const response = await update(payload);
+            await onUpgrade(response["data"]);
+        } catch (e) {
+            error.value = errorMessageAsString(e);
+            return;
+        }
+    }
+
+    async function onForceSubmit(formData: any) {
+        const payload = upgradeFormDataToPayload(template.value, formData);
+        try {
+            const response = await update(payload);
+            await onUpgrade(response["data"]);
+        } catch (e) {
+            error.value = errorMessageAsString(e);
+            return;
+        }
+    }
+
+    return {
+        error,
+        ActionSummary,
+        inputs,
+        InstanceForm,
+        loadingMessage,
+        onForceSubmit,
+        onSubmit,
+        submitTitle,
+        showForceActionButton,
+        testResults,
+        testRunning,
+    };
+}
diff --git a/client/src/components/FileSources/Instances/CreateForm.vue b/client/src/components/FileSources/Instances/CreateForm.vue
index cb791c4ec475..dc92fe118bd9 100644
--- a/client/src/components/FileSources/Instances/CreateForm.vue
+++ b/client/src/components/FileSources/Instances/CreateForm.vue
@@ -1,63 +1,39 @@
 <script lang="ts" setup>
-import { BAlert } from "bootstrap-vue";
-import { computed, ref } from "vue";
+import { toRef } from "vue";
 
 import type { FileSourceTemplateSummary, UserFileSourceModel } from "@/api/fileSources";
-import {
-    createFormDataToPayload,
-    createTemplateForm,
-    pluginStatusToErrorMessage,
-} from "@/components/ConfigTemplates/formUtil";
-import { errorMessageAsString } from "@/utils/simple-error";
+import { useConfigurationTemplateCreation } from "@/components/ConfigTemplates/useConfigurationTesting";
 
 import { create, test } from "./services";
 
-import InstanceForm from "@/components/ConfigTemplates/InstanceForm.vue";
-
 interface CreateFormProps {
     template: FileSourceTemplateSummary;
 }
-const error = ref<string | null>(null);
 const props = defineProps<CreateFormProps>();
 const title = "Create a new file source for your data";
-const submitTitle = "Submit";
-const loadingMessage = "Loading file source template and instance information";
-
-const inputs = computed(() => {
-    return createTemplateForm(props.template, "file source");
-});
-
-async function onSubmit(formData: any) {
-    const payload = createFormDataToPayload(props.template, formData);
-    const { data: pluginStatus } = await test(payload);
-    const testError = pluginStatusToErrorMessage(pluginStatus);
-    if (testError) {
-        error.value = testError;
-        return;
-    }
-    try {
-        const { data: fileSource } = await create(payload);
-        emit("created", fileSource);
-    } catch (e) {
-        error.value = errorMessageAsString(e);
-        return;
-    }
-}
 
 const emit = defineEmits<{
     (e: "created", fileSource: UserFileSourceModel): void;
 }>();
+
+const { ActionSummary, error, inputs, InstanceForm, onSubmit, submitTitle, loadingMessage, testRunning, testResults } =
+    useConfigurationTemplateCreation(
+        "file source",
+        toRef(props, "template"),
+        test,
+        create,
+        (fileSource: UserFileSourceModel) => emit("created", fileSource)
+    );
 </script>
 <template>
     <div id="create-file-source-landing">
-        <BAlert v-if="error" variant="danger" class="file-source-instance-creation-error" show>
-            {{ error }}
-        </BAlert>
+        <ActionSummary error-data-description="file-source-creation-error" :test-results="testResults" :error="error" />
         <InstanceForm
             :inputs="inputs"
             :title="title"
             :submit-title="submitTitle"
             :loading-message="loadingMessage"
+            :busy="testRunning"
             @onSubmit="onSubmit" />
     </div>
 </template>
diff --git a/client/src/components/FileSources/Instances/EditInstance.vue b/client/src/components/FileSources/Instances/EditInstance.vue
index 40e62a309da1..fb7e6ae2e0c0 100644
--- a/client/src/components/FileSources/Instances/EditInstance.vue
+++ b/client/src/components/FileSources/Instances/EditInstance.vue
@@ -2,15 +2,14 @@
 import { BTab, BTabs } from "bootstrap-vue";
 import { computed, ref } from "vue";
 
-import type { UserFileSourceModel } from "@/api/fileSources";
-import { editFormDataToPayload, editTemplateForm, type FormEntry } from "@/components/ConfigTemplates/formUtil";
+import type { TestUpdateInstancePayload, UpdateInstancePayload } from "@/api/configTemplates";
+import { useConfigurationTemplateEdit } from "@/components/ConfigTemplates/useConfigurationTesting";
 
 import { useInstanceAndTemplate } from "./instance";
 import { useInstanceRouting } from "./routing";
-import { update } from "./services";
+import { testUpdate, update } from "./services";
 
 import EditSecrets from "./EditSecrets.vue";
-import InstanceForm from "@/components/ConfigTemplates/InstanceForm.vue";
 
 interface Props {
     instanceId: string;
@@ -19,45 +18,47 @@ interface Props {
 const props = defineProps<Props>();
 const { instance, template } = useInstanceAndTemplate(ref(props.instanceId));
 
-const inputs = computed<Array<FormEntry> | undefined>(() => {
-    template.value;
-    instance.value;
-    if (template.value && instance.value) {
-        return editTemplateForm(template.value, "storage location", instance.value);
-    }
-    return undefined;
-});
-
 const title = computed(() => `Edit File Source ${instance.value?.name} Settings`);
-const hasSecrets = computed(() => instance.value?.secrets && instance.value?.secrets.length > 0);
-const submitTitle = "Update Settings";
-const loadingMessage = "Loading file source template and instance information";
-
-async function onSubmit(formData: any) {
-    if (template.value) {
-        const payload = editFormDataToPayload(template.value, formData);
-        const args = { user_file_source_id: String(instance?.value?.uuid) };
-        const { data: fileSource } = await update({ ...args, ...payload });
-        await onUpdate(fileSource);
-    }
-}
+const errorDataDescription = "file-source-update-error";
 
-const { goToIndex } = useInstanceRouting();
-
-async function onUpdate(instance: UserFileSourceModel) {
-    const message = `Updated file source ${instance.name}`;
-    goToIndex({ message });
-}
+const {
+    error,
+    hasSecrets,
+    ActionSummary,
+    inputs,
+    InstanceForm,
+    loadingMessage,
+    onForceSubmit,
+    onSubmit,
+    testRunning,
+    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
+);
 </script>
 <template>
     <div>
         <BTabs v-if="hasSecrets">
             <BTab title="Settings" active>
+                <ActionSummary
+                    :error-data-description="errorDataDescription"
+                    :test-results="testResults"
+                    :error="error" />
                 <InstanceForm
                     :inputs="inputs"
                     :title="title"
                     :submit-title="submitTitle"
                     :loading-message="loadingMessage"
+                    :busy="testRunning"
+                    :show-force-action-button="showForceActionButton"
+                    @onForceSubmit="onForceSubmit"
                     @onSubmit="onSubmit" />
             </BTab>
             <BTab title="Secrets">
@@ -66,12 +67,17 @@ async function onUpdate(instance: UserFileSourceModel) {
                 </div>
             </BTab>
         </BTabs>
-        <InstanceForm
-            v-else
-            :inputs="inputs"
-            :title="title"
-            :submit-title="submitTitle"
-            :loading-message="loadingMessage"
-            @onSubmit="onSubmit" />
+        <div v-else>
+            <ActionSummary :error-data-description="errorDataDescription" :test-results="testResults" :error="error" />
+            <InstanceForm
+                :inputs="inputs"
+                :title="title"
+                :submit-title="submitTitle"
+                :loading-message="loadingMessage"
+                :busy="testRunning"
+                :show-force-action-button="showForceActionButton"
+                @onForceSubmit="onForceSubmit"
+                @onSubmit="onSubmit" />
+        </div>
     </div>
 </template>
diff --git a/client/src/components/FileSources/Instances/InstanceDropdown.vue b/client/src/components/FileSources/Instances/InstanceDropdown.vue
index 9762fdc21dcc..e9ab02c36308 100644
--- a/client/src/components/FileSources/Instances/InstanceDropdown.vue
+++ b/client/src/components/FileSources/Instances/InstanceDropdown.vue
@@ -28,6 +28,7 @@ async function onRemove() {
 
 const emit = defineEmits<{
     (e: "entryRemoved"): void;
+    (e: "test"): void;
 }>();
 </script>
 
@@ -38,5 +39,6 @@ const emit = defineEmits<{
         :is-upgradable="isUpgradable"
         :route-upgrade="routeUpgrade"
         :route-edit="routeEdit"
+        @test="emit('test')"
         @remove="onRemove" />
 </template>
diff --git a/client/src/components/FileSources/Instances/ManageIndex.vue b/client/src/components/FileSources/Instances/ManageIndex.vue
index 784e0b84a685..597c4f1929f6 100644
--- a/client/src/components/FileSources/Instances/ManageIndex.vue
+++ b/client/src/components/FileSources/Instances/ManageIndex.vue
@@ -3,9 +3,12 @@ import { BTable } from "bootstrap-vue";
 import { computed } from "vue";
 
 import { DESCRIPTION_FIELD, NAME_FIELD, TEMPLATE_FIELD, TYPE_FIELD } from "@/components/ConfigTemplates/fields";
+import { useInstanceTesting } from "@/components/ConfigTemplates/useConfigurationTesting";
 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";
@@ -30,10 +33,17 @@ fileSourceInstancesStore.fetchInstances();
 function reload() {
     fileSourceInstancesStore.fetchInstances();
 }
+
+const { ConfigurationTestSummaryModal, showTestResults, testResults, test, testingError } = useInstanceTesting(
+    (id: string) => {
+        return testInstance({ user_file_source_id: id });
+    }
+);
 </script>
 
 <template>
     <div>
+        <ConfigurationTestSummaryModal v-model="showTestResults" :error="testingError" :test-results="testResults" />
         <ManageIndexHeader
             :message="message"
             create-button-id="file-source-create"
@@ -58,7 +68,7 @@ function reload() {
                 </b-alert>
             </template>
             <template v-slot:cell(name)="row">
-                <InstanceDropdown :file-source="row.item" @entryRemoved="reload" />
+                <InstanceDropdown :file-source="row.item" @entryRemoved="reload" @test="test(row.item)" />
             </template>
             <template v-slot:cell(type)="row">
                 <FileSourceTypeSpan :type="row.item.type" />
diff --git a/client/src/components/FileSources/Instances/UpgradeForm.vue b/client/src/components/FileSources/Instances/UpgradeForm.vue
index 9f0efa9a9a28..9aee61c019d6 100644
--- a/client/src/components/FileSources/Instances/UpgradeForm.vue
+++ b/client/src/components/FileSources/Instances/UpgradeForm.vue
@@ -1,63 +1,54 @@
 <script setup lang="ts">
-import { BAlert } from "bootstrap-vue";
-import { computed, ref } from "vue";
+import { computed, toRef } from "vue";
 
+import type { TestUpgradeInstancePayload, UpgradeInstancePayload } from "@/api/configTemplates";
 import type { FileSourceTemplateSummary, UserFileSourceModel } from "@/api/fileSources";
-import { type FormEntry, upgradeForm, upgradeFormDataToPayload } from "@/components/ConfigTemplates/formUtil";
-import { errorMessageAsString } from "@/utils/simple-error";
+import { useConfigurationTemplateUpgrade } from "@/components/ConfigTemplates/useConfigurationTesting";
 
 import { useInstanceRouting } from "./routing";
-import { update } from "./services";
-
-import InstanceForm from "@/components/ConfigTemplates/InstanceForm.vue";
+import { testUpdate, update } from "./services";
 
 interface Props {
     instance: UserFileSourceModel;
     latestTemplate: FileSourceTemplateSummary;
 }
 
-const error = ref<string | null>(null);
 const props = defineProps<Props>();
 
-const inputs = computed<Array<FormEntry> | undefined>(() => {
-    const realizedInstance: UserFileSourceModel = props.instance;
-    const realizedLatestTemplate = props.latestTemplate;
-    const form = upgradeForm(realizedLatestTemplate, realizedInstance);
-    return form;
-});
 const title = computed(() => `Upgrade File Source ${props.instance.name}`);
-const submitTitle = "Update Settings";
-const loadingMessage = "Loading file source template and instance information";
-
-async function onSubmit(formData: any) {
-    const payload = upgradeFormDataToPayload(props.latestTemplate, formData);
-    const args = { user_file_source_id: String(props.instance.uuid) };
-    try {
-        const { data: fileSource } = await update({ ...args, ...payload });
-        await onUpgrade(fileSource);
-    } catch (e) {
-        error.value = errorMessageAsString(e);
-        return;
-    }
-}
 
-const { goToIndex } = useInstanceRouting();
-
-async function onUpgrade(fileSource: UserFileSourceModel) {
-    const message = `Upgraded file source ${fileSource.name}`;
-    goToIndex({ message });
-}
+const {
+    error,
+    ActionSummary,
+    inputs,
+    InstanceForm,
+    loadingMessage,
+    onForceSubmit,
+    onSubmit,
+    testRunning,
+    testResults,
+    showForceActionButton,
+    submitTitle,
+} = useConfigurationTemplateUpgrade(
+    "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 }),
+    useInstanceRouting
+);
 </script>
 <template>
     <div>
-        <BAlert v-if="error" variant="danger" class="file-source-instance-upgrade-error" show>
-            {{ error }}
-        </BAlert>
+        <ActionSummary error-data-description="file-source-upgrade-error" :test-results="testResults" :error="error" />
         <InstanceForm
             :inputs="inputs"
             :title="title"
             :submit-title="submitTitle"
             :loading-message="loadingMessage"
+            :busy="testRunning"
+            :show-force-action-button="showForceActionButton"
+            @onForceSubmit="onForceSubmit"
             @onSubmit="onSubmit" />
     </div>
 </template>
diff --git a/client/src/components/FileSources/Instances/routing.ts b/client/src/components/FileSources/Instances/routing.ts
index 6d2ed12bae6e..d2053263a750 100644
--- a/client/src/components/FileSources/Instances/routing.ts
+++ b/client/src/components/FileSources/Instances/routing.ts
@@ -1,16 +1,3 @@
-import { useRouter } from "vue-router/composables";
+import { buildInstanceRoutingComposable } from "@/components/ConfigTemplates/routing";
 
-export function useInstanceRouting() {
-    const router = useRouter();
-
-    async function goToIndex(query: Record<"message", string>) {
-        router.push({
-            path: "/file_source_instances/index",
-            query: query,
-        });
-    }
-
-    return {
-        goToIndex,
-    };
-}
+export const useInstanceRouting = buildInstanceRoutingComposable("/file_source_instances/index");
diff --git a/client/src/components/FileSources/Instances/services.ts b/client/src/components/FileSources/Instances/services.ts
index 357e792f9f22..7e9ff219d708 100644
--- a/client/src/components/FileSources/Instances/services.ts
+++ b/client/src/components/FileSources/Instances/services.ts
@@ -3,7 +3,12 @@ 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 async function hide(instance: UserFileSourceModel) {
     const payload = { hidden: true };
diff --git a/client/src/components/ObjectStore/Instances/CreateForm.test.ts b/client/src/components/ObjectStore/Instances/CreateForm.test.ts
index 120fcde06969..33f6dacf11e7 100644
--- a/client/src/components/ObjectStore/Instances/CreateForm.test.ts
+++ b/client/src/components/ObjectStore/Instances/CreateForm.test.ts
@@ -2,8 +2,8 @@ import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
 import { getLocalVue } from "tests/jest/helpers";
 
-import { PluginStatus } from "@/api/configTemplates";
 import { mockFetcher } from "@/api/schema/__mocks__";
+import { OK_PLUGIN_STATUS } from "@/components/ConfigTemplates/test_fixtures";
 import type { ObjectStoreTemplateSummary } from "@/components/ObjectStore/Templates/types";
 
 import CreateForm from "./CreateForm.vue";
@@ -58,21 +58,6 @@ const SIMPLE_TEMPLATE: ObjectStoreTemplateSummary = {
     badges: [],
 };
 
-const FAKE_PLUGIN_STATUS: PluginStatus = {
-    template_definition: {
-        state: "ok",
-        message: "ok",
-    },
-    template_settings: {
-        state: "ok",
-        message: "ok",
-    },
-    connection: {
-        state: "ok",
-        message: "ok",
-    },
-};
-
 describe("CreateForm", () => {
     it("should render a form with admin markdown converted to HTML in help", async () => {
         const wrapper = mount(CreateForm, {
@@ -99,7 +84,7 @@ describe("CreateForm", () => {
             },
             localVue,
         });
-        mockFetcher.path("/api/object_store_instances/test").method("post").mock({ data: FAKE_PLUGIN_STATUS });
+        mockFetcher.path("/api/object_store_instances/test").method("post").mock({ data: OK_PLUGIN_STATUS });
         mockFetcher.path("/api/object_store_instances").method("post").mock({ data: FAKE_OBJECT_STORE });
         await flushPromises();
         const nameForElement = wrapper.find("#form-element-_meta_name");
@@ -119,7 +104,7 @@ describe("CreateForm", () => {
             },
             localVue,
         });
-        mockFetcher.path("/api/object_store_instances/test").method("post").mock({ data: FAKE_PLUGIN_STATUS });
+        mockFetcher.path("/api/object_store_instances/test").method("post").mock({ data: OK_PLUGIN_STATUS });
         mockFetcher
             .path("/api/object_store_instances")
             .method("post")
@@ -130,12 +115,13 @@ describe("CreateForm", () => {
         const nameForElement = wrapper.find("#form-element-_meta_name");
         nameForElement.find("input").setValue("My New Name");
         const submitElement = wrapper.find("#submit");
-        expect(wrapper.find(".object-store-instance-creation-error").exists()).toBe(false);
+        expect(wrapper.find("[data-description='object-store-creation-error']").exists()).toBe(false);
         submitElement.trigger("click");
         await flushPromises();
         const emitted = wrapper.emitted("created") || [];
         expect(emitted).toHaveLength(0);
-        const errorEl = wrapper.find(".object-store-instance-creation-error");
+        const errorEl = wrapper.find("[data-description='object-store-creation-error']");
+        console.log(wrapper.html());
         expect(errorEl.exists()).toBe(true);
         expect(errorEl.html()).toContain("Error creating this");
     });
diff --git a/client/src/components/ObjectStore/Instances/CreateForm.vue b/client/src/components/ObjectStore/Instances/CreateForm.vue
index 6da11a92e3d9..3eff5eedf286 100644
--- a/client/src/components/ObjectStore/Instances/CreateForm.vue
+++ b/client/src/components/ObjectStore/Instances/CreateForm.vue
@@ -1,65 +1,43 @@
 <script lang="ts" setup>
-import { BAlert } from "bootstrap-vue";
-import { computed, ref } from "vue";
+import { toRef } from "vue";
 
-import {
-    createFormDataToPayload,
-    createTemplateForm,
-    type FormEntry,
-    pluginStatusToErrorMessage,
-} from "@/components/ConfigTemplates/formUtil";
+import { useConfigurationTemplateCreation } from "@/components/ConfigTemplates/useConfigurationTesting";
 import type { UserConcreteObjectStore } from "@/components/ObjectStore/Instances/types";
 import type { ObjectStoreTemplateSummary } from "@/components/ObjectStore/Templates/types";
-import { errorMessageAsString } from "@/utils/simple-error";
 
 import { create, test } from "./services";
 
-import InstanceForm from "@/components/ConfigTemplates/InstanceForm.vue";
-
 interface CreateFormProps {
     template: ObjectStoreTemplateSummary;
 }
-const error = ref<string | null>(null);
 const props = defineProps<CreateFormProps>();
 const title = "Create a new storage location for your data";
-const submitTitle = "Submit";
-const loadingMessage = "Loading storage location template and instance information";
-
-const inputs = computed<Array<FormEntry>>(() => {
-    return createTemplateForm(props.template, "storage location");
-});
-
-async function onSubmit(formData: any) {
-    const payload = createFormDataToPayload(props.template, formData);
-    const { data: pluginStatus } = await test(payload);
-    const testError = pluginStatusToErrorMessage(pluginStatus);
-    if (testError) {
-        error.value = testError;
-        return;
-    }
-    try {
-        const { data: objectStore } = await create(payload);
-        emit("created", objectStore);
-    } catch (e) {
-        error.value = errorMessageAsString(e);
-        return;
-    }
-}
 
 const emit = defineEmits<{
     (e: "created", objectStore: UserConcreteObjectStore): void;
 }>();
+
+const { ActionSummary, error, inputs, InstanceForm, onSubmit, submitTitle, loadingMessage, testRunning, testResults } =
+    useConfigurationTemplateCreation(
+        "storage location",
+        toRef(props, "template"),
+        test,
+        create,
+        (instance: UserConcreteObjectStore) => emit("created", instance)
+    );
 </script>
 <template>
     <div id="create-object-store-landing">
-        <BAlert v-if="error" variant="danger" class="object-store-instance-creation-error" show>
-            {{ error }}
-        </BAlert>
+        <ActionSummary
+            error-data-description="object-store-creation-error"
+            :test-results="testResults"
+            :error="error" />
         <InstanceForm
             :inputs="inputs"
             :title="title"
             :submit-title="submitTitle"
             :loading-message="loadingMessage"
+            :busy="testRunning"
             @onSubmit="onSubmit" />
     </div>
 </template>
diff --git a/client/src/components/ObjectStore/Instances/EditInstance.vue b/client/src/components/ObjectStore/Instances/EditInstance.vue
index 0c6ea67cf4a6..9fbf77542078 100644
--- a/client/src/components/ObjectStore/Instances/EditInstance.vue
+++ b/client/src/components/ObjectStore/Instances/EditInstance.vue
@@ -2,15 +2,14 @@
 import { BTab, BTabs } from "bootstrap-vue";
 import { computed, ref } from "vue";
 
-import { editFormDataToPayload, editTemplateForm, type FormEntry } from "@/components/ConfigTemplates/formUtil";
+import type { TestUpdateInstancePayload, UpdateInstancePayload } from "@/api/configTemplates";
+import { useConfigurationTemplateEdit } from "@/components/ConfigTemplates/useConfigurationTesting";
 
 import { useInstanceAndTemplate } from "./instance";
 import { useInstanceRouting } from "./routing";
-import { update } from "./services";
-import type { UserConcreteObjectStore } from "./types";
+import { testUpdate, update } from "./services";
 
 import EditSecrets from "./EditSecrets.vue";
-import InstanceForm from "@/components/ConfigTemplates/InstanceForm.vue";
 
 interface Props {
     instanceId: string;
@@ -19,45 +18,47 @@ interface Props {
 const props = defineProps<Props>();
 const { instance, template } = useInstanceAndTemplate(ref(props.instanceId));
 
-const inputs = computed<Array<FormEntry> | undefined>(() => {
-    template.value;
-    instance.value;
-    if (template.value && instance.value) {
-        return editTemplateForm(template.value, "storage location", instance.value);
-    }
-    return undefined;
-});
-
 const title = computed(() => `Edit Storage Location ${instance.value?.name} Settings`);
-const hasSecrets = computed(() => instance.value?.secrets && instance.value?.secrets.length > 0);
-const submitTitle = "Update Settings";
-const loadingMessage = "Loading storage location template and instance information";
-
-async function onSubmit(formData: any) {
-    if (template.value) {
-        const payload = editFormDataToPayload(template.value, formData);
-        const args = { user_object_store_id: String(instance?.value?.uuid) };
-        const { data: objectStore } = await update({ ...args, ...payload });
-        await onUpdate(objectStore);
-    }
-}
+const errorDataDescription = "object-store-update-error";
 
-const { goToIndex } = useInstanceRouting();
-
-async function onUpdate(objectStore: UserConcreteObjectStore) {
-    const message = `Updated storage location ${objectStore.name}`;
-    goToIndex({ message });
-}
+const {
+    error,
+    hasSecrets,
+    ActionSummary,
+    inputs,
+    InstanceForm,
+    loadingMessage,
+    onForceSubmit,
+    onSubmit,
+    testRunning,
+    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
+);
 </script>
 <template>
     <div>
         <BTabs v-if="hasSecrets">
             <BTab title="Settings" active>
+                <ActionSummary
+                    :error-data-description="errorDataDescription"
+                    :test-results="testResults"
+                    :error="error" />
                 <InstanceForm
                     :inputs="inputs"
                     :title="title"
                     :submit-title="submitTitle"
                     :loading-message="loadingMessage"
+                    :busy="testRunning"
+                    :show-force-action-button="showForceActionButton"
+                    @onForceSubmit="onForceSubmit"
                     @onSubmit="onSubmit" />
             </BTab>
             <BTab title="Secrets">
@@ -66,12 +67,17 @@ async function onUpdate(objectStore: UserConcreteObjectStore) {
                 </div>
             </BTab>
         </BTabs>
-        <InstanceForm
-            v-else
-            :inputs="inputs"
-            :title="title"
-            :submit-title="submitTitle"
-            :loading-message="loadingMessage"
-            @onSubmit="onSubmit" />
+        <div v-else>
+            <ActionSummary :error-data-description="errorDataDescription" :test-results="testResults" :error="error" />
+            <InstanceForm
+                :inputs="inputs"
+                :title="title"
+                :submit-title="submitTitle"
+                :loading-message="loadingMessage"
+                :busy="testRunning"
+                :show-force-action-button="showForceActionButton"
+                @onForceSubmit="onForceSubmit"
+                @onSubmit="onSubmit" />
+        </div>
     </div>
 </template>
diff --git a/client/src/components/ObjectStore/Instances/InstanceDropdown.vue b/client/src/components/ObjectStore/Instances/InstanceDropdown.vue
index f00bde90b603..9f0c7300e1f9 100644
--- a/client/src/components/ObjectStore/Instances/InstanceDropdown.vue
+++ b/client/src/components/ObjectStore/Instances/InstanceDropdown.vue
@@ -28,6 +28,7 @@ async function onRemove() {
 
 const emit = defineEmits<{
     (e: "entryRemoved"): void;
+    (e: "test"): void;
 }>();
 </script>
 
@@ -38,5 +39,6 @@ const emit = defineEmits<{
         :is-upgradable="isUpgradable"
         :route-upgrade="routeUpgrade"
         :route-edit="routeEdit"
+        @test="emit('test')"
         @remove="onRemove" />
 </template>
diff --git a/client/src/components/ObjectStore/Instances/ManageIndex.vue b/client/src/components/ObjectStore/Instances/ManageIndex.vue
index 7f45d1907211..2a46e90653f2 100644
--- a/client/src/components/ObjectStore/Instances/ManageIndex.vue
+++ b/client/src/components/ObjectStore/Instances/ManageIndex.vue
@@ -4,10 +4,13 @@ import { computed } from "vue";
 
 import type { UserConcreteObjectStore } from "@/api/objectStores";
 import { DESCRIPTION_FIELD, NAME_FIELD, TEMPLATE_FIELD, TYPE_FIELD } from "@/components/ConfigTemplates/fields";
+import { useInstanceTesting } from "@/components/ConfigTemplates/useConfigurationTesting";
 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";
@@ -39,6 +42,12 @@ objectStoreInstancesStore.fetchInstances();
 function reload() {
     objectStoreInstancesStore.fetchInstances();
 }
+
+const { ConfigurationTestSummaryModal, showTestResults, testResults, test, testingError } = useInstanceTesting(
+    (id: string) => {
+        return testInstance({ user_object_store_id: id });
+    }
+);
 </script>
 
 <template>
@@ -48,6 +57,7 @@ function reload() {
             create-button-id="object-store-create"
             create-route="/object_store_instances/create">
         </ManageIndexHeader>
+        <ConfigurationTestSummaryModal v-model="showTestResults" :error="testingError" :test-results="testResults" />
         <BTable
             id="user-object-stores-index"
             no-sort-reset
@@ -68,7 +78,7 @@ function reload() {
                 <ObjectStoreBadges size="1x" :badges="row.item.badges" />
             </template>
             <template v-slot:cell(name)="row">
-                <InstanceDropdown :object-store="row.item" @entryRemoved="reload" />
+                <InstanceDropdown :object-store="row.item" @entryRemoved="reload" @test="test(row.item)" />
             </template>
             <template v-slot:cell(type)="row">
                 <ObjectStoreTypeSpan :type="row.item.type" />
diff --git a/client/src/components/ObjectStore/Instances/UpgradeForm.test.ts b/client/src/components/ObjectStore/Instances/UpgradeForm.test.ts
index 78a6588b118d..e2b97077ebf2 100644
--- a/client/src/components/ObjectStore/Instances/UpgradeForm.test.ts
+++ b/client/src/components/ObjectStore/Instances/UpgradeForm.test.ts
@@ -3,6 +3,7 @@ import flushPromises from "flush-promises";
 import { getLocalVue, injectTestRouter } from "tests/jest/helpers";
 
 import { mockFetcher } from "@/api/schema/__mocks__";
+import { OK_PLUGIN_STATUS } from "@/components/ConfigTemplates/test_fixtures";
 import type { ObjectStoreTemplateSummary } from "@/components/ObjectStore/Templates/types";
 
 import type { UserConcreteObjectStore } from "./types";
@@ -109,6 +110,10 @@ describe("UpgradeForm", () => {
             localVue,
             router,
         });
+        mockFetcher
+            .path("/api/object_store_instances/{user_object_store_id}/test")
+            .method("post")
+            .mock({ data: OK_PLUGIN_STATUS });
         mockFetcher.path("/api/object_store_instances/{user_object_store_id}").method("put").mock({ data: INSTANCE });
         await flushPromises();
         const submitElement = wrapper.find("#submit");
@@ -128,6 +133,10 @@ describe("UpgradeForm", () => {
             localVue,
             router,
         });
+        mockFetcher
+            .path("/api/object_store_instances/{user_object_store_id}/test")
+            .method("post")
+            .mock({ data: OK_PLUGIN_STATUS });
         mockFetcher
             .path("/api/object_store_instances/{user_object_store_id}")
             .method("put")
@@ -136,12 +145,12 @@ describe("UpgradeForm", () => {
             });
         await flushPromises();
         const submitElement = wrapper.find("#submit");
-        expect(wrapper.find(".object-store-instance-upgrade-error").exists()).toBe(false);
+        expect(wrapper.find("[data-description='object-store-upgrade-error']").exists()).toBe(false);
         submitElement.trigger("click");
         await flushPromises();
         const emitted = wrapper.emitted("created") || [];
         expect(emitted).toHaveLength(0);
-        const errorEl = wrapper.find(".object-store-instance-upgrade-error");
+        const errorEl = wrapper.find("[data-description='object-store-upgrade-error']");
         expect(errorEl.exists()).toBe(true);
         expect(errorEl.html()).toContain("problem upgrading");
     });
diff --git a/client/src/components/ObjectStore/Instances/UpgradeForm.vue b/client/src/components/ObjectStore/Instances/UpgradeForm.vue
index 28aa658f3106..13c70daf8b47 100644
--- a/client/src/components/ObjectStore/Instances/UpgradeForm.vue
+++ b/client/src/components/ObjectStore/Instances/UpgradeForm.vue
@@ -1,64 +1,55 @@
 <script setup lang="ts">
-import { BAlert } from "bootstrap-vue";
-import { computed, ref } from "vue";
+import { computed, toRef } from "vue";
 
-import { type FormEntry, upgradeForm, upgradeFormDataToPayload } from "@/components/ConfigTemplates/formUtil";
-import { errorMessageAsString } from "@/utils/simple-error";
+import type { TestUpgradeInstancePayload, UpgradeInstancePayload } from "@/api/configTemplates";
+import { useConfigurationTemplateUpgrade } from "@/components/ConfigTemplates/useConfigurationTesting";
 
 import type { ObjectStoreTemplateSummary } from "../Templates/types";
 import { useInstanceRouting } from "./routing";
-import { update } from "./services";
+import { testUpdate, update } from "./services";
 import type { UserConcreteObjectStore } from "./types";
 
-import InstanceForm from "@/components/ConfigTemplates/InstanceForm.vue";
-
 interface Props {
     instance: UserConcreteObjectStore;
     latestTemplate: ObjectStoreTemplateSummary;
 }
 
-const error = ref<string | null>(null);
 const props = defineProps<Props>();
 
-const inputs = computed<Array<FormEntry> | undefined>(() => {
-    const realizedInstance: UserConcreteObjectStore = props.instance;
-    const realizedLatestTemplate = props.latestTemplate;
-    const form = upgradeForm(realizedLatestTemplate, realizedInstance);
-    return form;
-});
 const title = computed(() => `Upgrade Object Store ${props.instance.name}`);
-const submitTitle = "Update Settings";
-const loadingMessage = "Loading storage location template and instance information";
-
-async function onSubmit(formData: any) {
-    const payload = upgradeFormDataToPayload(props.latestTemplate, formData);
-    const args = { user_object_store_id: String(props.instance.uuid) };
-    try {
-        const { data: objectStore } = await update({ ...args, ...payload });
-        await onUpgrade(objectStore);
-    } catch (e) {
-        error.value = errorMessageAsString(e);
-        return;
-    }
-}
 
-const { goToIndex } = useInstanceRouting();
-
-async function onUpgrade(objectStore: UserConcreteObjectStore) {
-    const message = `Upgraded storage location ${objectStore.name}`;
-    goToIndex({ message });
-}
+const {
+    error,
+    ActionSummary,
+    inputs,
+    InstanceForm,
+    loadingMessage,
+    showForceActionButton,
+    onForceSubmit,
+    onSubmit,
+    testRunning,
+    testResults,
+    submitTitle,
+} = useConfigurationTemplateUpgrade(
+    "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 }),
+    useInstanceRouting
+);
 </script>
 <template>
     <div>
-        <BAlert v-if="error" variant="danger" class="object-store-instance-upgrade-error" show>
-            {{ error }}
-        </BAlert>
+        <ActionSummary error-data-description="object-store-upgrade-error" :test-results="testResults" :error="error" />
         <InstanceForm
             :inputs="inputs"
             :title="title"
             :submit-title="submitTitle"
             :loading-message="loadingMessage"
+            :busy="testRunning"
+            :show-force-action-button="showForceActionButton"
+            @onForceSubmit="onForceSubmit"
             @onSubmit="onSubmit" />
     </div>
 </template>
diff --git a/client/src/components/ObjectStore/Instances/routing.ts b/client/src/components/ObjectStore/Instances/routing.ts
index 44aca677a052..207491483423 100644
--- a/client/src/components/ObjectStore/Instances/routing.ts
+++ b/client/src/components/ObjectStore/Instances/routing.ts
@@ -1,16 +1,3 @@
-import { useRouter } from "vue-router/composables";
+import { buildInstanceRoutingComposable } from "@/components/ConfigTemplates/routing";
 
-export function useInstanceRouting() {
-    const router = useRouter();
-
-    async function goToIndex(query: Record<"message", string>) {
-        router.push({
-            path: "/object_store_instances/index",
-            query: query,
-        });
-    }
-
-    return {
-        goToIndex,
-    };
-}
+export const useInstanceRouting = buildInstanceRoutingComposable("/object_store_instances/index");
diff --git a/client/src/components/ObjectStore/Instances/services.ts b/client/src/components/ObjectStore/Instances/services.ts
index abb7bb6781c7..c762414f0c9d 100644
--- a/client/src/components/ObjectStore/Instances/services.ts
+++ b/client/src/components/ObjectStore/Instances/services.ts
@@ -4,7 +4,15 @@ 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();
 
 export async function hide(instance: UserConcreteObjectStore) {
     const payload = { hidden: true };
diff --git a/lib/galaxy/managers/_config_templates.py b/lib/galaxy/managers/_config_templates.py
index 2b0583a4c887..303ef4d1a015 100644
--- a/lib/galaxy/managers/_config_templates.py
+++ b/lib/galaxy/managers/_config_templates.py
@@ -1,6 +1,7 @@
 import logging
 import os
 from typing import (
+    Any,
     cast,
     Dict,
     List,
@@ -10,6 +11,7 @@
 )
 
 from pydantic import BaseModel
+from typing_extensions import TypedDict
 
 from galaxy.exceptions import (
     ObjectNotFound,
@@ -39,6 +41,7 @@
     TemplateEnvironmentEntry,
     TemplateEnvironmentSecret,
     TemplateEnvironmentVariable,
+    TemplateReference,
     TemplateVariableValueType,
     validate_no_extra_variables_defined,
     validate_specified_datatypes_variables,
@@ -78,7 +81,37 @@ class UpgradeInstancePayload(BaseModel):
     secrets: SuppliedSecrets
 
 
+class TestUpdateInstancePayload(BaseModel):
+    variables: Optional[SuppliedVariables] = None
+
+
+class TestUpgradeInstancePayload(BaseModel):
+    template_version: int
+    variables: SuppliedVariables
+    secrets: SuppliedSecrets
+
+
+class UpgradeTestTarget:
+    instance: HasConfigTemplate
+    payload: TestUpgradeInstancePayload
+
+    def __init__(self, instance: HasConfigTemplate, payload: TestUpgradeInstancePayload):
+        self.instance = instance
+        self.payload = payload
+
+
+class UpdateTestTarget:
+    instance: HasConfigTemplate
+    payload: TestUpdateInstancePayload
+
+    def __init__(self, instance: HasConfigTemplate, payload: TestUpdateInstancePayload):
+        self.instance = instance
+        self.payload = payload
+
+
 ModifyInstancePayload = Union[UpdateInstanceSecretPayload, UpgradeInstancePayload, UpdateInstancePayload]
+TestModifyInstancePayload = Union[TestUpgradeInstancePayload, TestUpdateInstancePayload]
+CanTestPluginStatus = Union[HasConfigTemplate, CreateInstancePayload, UpgradeTestTarget, UpdateTestTarget]
 
 
 def recover_secrets(
@@ -100,6 +133,69 @@ def recover_secrets(
     return secrets
 
 
+class TemplateParameters(TypedDict):
+    secrets: SuppliedSecrets
+    variables: SuppliedVariables
+    environment: EnvironmentDict
+    user_details: Dict[str, Any]
+
+
+def prepare_template_parameters_for_testing(
+    trans: ProvidesUserContext,
+    template: Template,
+    target: CanTestPluginStatus,
+    vault: Vault,
+    app_config: UsesTemplatesAppConfig,
+) -> TemplateParameters:
+    secrets = _secrets_for_plugin_status_test(target, vault, app_config)
+    variables = _variables_for_plugin_status_test(target)
+    environment = prepare_environment_from_root(template.environment, vault, app_config)
+    user_details = trans.user.config_template_details()
+    return TemplateParameters(
+        {"secrets": secrets, "variables": variables, "environment": environment, "user_details": user_details}
+    )
+
+
+def _variables_for_plugin_status_test(target: CanTestPluginStatus) -> SuppliedVariables:
+    if isinstance(target, CreateInstancePayload):
+        return target.variables
+    elif isinstance(target, UpgradeTestTarget) or isinstance(target, UpdateTestTarget):
+        if target.instance.template_variables:
+            variables = target.instance.template_variables.copy()
+        else:
+            variables = {}
+        new_variables = target.payload.variables or {}
+        for new_variable in new_variables:
+            variables[new_variable] = new_variables[new_variable]
+        return new_variables
+    else:
+        return target.template_variables or {}
+
+
+def _secrets_for_plugin_status_test(
+    target: CanTestPluginStatus, vault: Vault, app_config: UsesTemplatesAppConfig
+) -> SecretsDict:
+    if isinstance(target, CreateInstancePayload):
+        return target.secrets
+    elif isinstance(target, UpgradeTestTarget):
+        secrets = recover_secrets(target.instance, vault, app_config)
+        new_secrets = target.payload.secrets or {}
+        for new_secret in new_secrets:
+            secrets[new_secret] = new_secrets[new_secret]
+        return secrets
+    elif isinstance(target, UpdateTestTarget):
+        secrets = recover_secrets(target.instance, vault, app_config)
+        return secrets
+    else:
+        secrets = recover_secrets(target, vault, app_config)
+        return secrets
+
+
+def to_template_reference(persisted_instance: HasConfigTemplate) -> TemplateReference:
+    # for mypy convert Mapped[X] -> X
+    return cast(TemplateReference, persisted_instance)
+
+
 def prepare_environment(
     configuration_template: HasConfigEnvironment, vault: Vault, app_config: UsesTemplatesAppConfig
 ) -> EnvironmentDict:
@@ -108,7 +204,7 @@ def prepare_environment(
 
 def prepare_environment_from_root(
     root: Optional[List[TemplateEnvironmentEntry]], vault: Vault, app_config: UsesTemplatesAppConfig
-):
+) -> EnvironmentDict:
     environment: EnvironmentDict = {}
     for environment_entry in root or []:
         e_type = environment_entry.type
diff --git a/lib/galaxy/managers/file_source_instances.py b/lib/galaxy/managers/file_source_instances.py
index 9b70926c8a42..80908ca8728c 100644
--- a/lib/galaxy/managers/file_source_instances.py
+++ b/lib/galaxy/managers/file_source_instances.py
@@ -8,6 +8,7 @@
     Optional,
     Set,
     Tuple,
+    Union,
 )
 from uuid import uuid4
 
@@ -58,27 +59,35 @@
     PluginStatus,
     settings_exception_to_status,
     status_template_definition,
+    TemplateReference,
     TemplateVariableValueType,
     validate_no_extra_secrets_defined,
     validate_no_extra_variables_defined,
 )
 from galaxy.util.plugin_config import plugin_source_from_dict
 from ._config_templates import (
+    CanTestPluginStatus,
     CreateInstancePayload,
     ModifyInstancePayload,
     prepare_environment,
-    prepare_environment_from_root,
+    prepare_template_parameters_for_testing,
     purge_template_instance,
     recover_secrets,
     save_template_instance,
     sort_templates,
+    TestModifyInstancePayload,
+    TestUpdateInstancePayload,
+    TestUpgradeInstancePayload,
+    to_template_reference,
     update_instance_secret,
     update_template_instance,
     updated_template_variables,
     UpdateInstancePayload,
     UpdateInstanceSecretPayload,
+    UpdateTestTarget,
     upgrade_secrets,
     UpgradeInstancePayload,
+    UpgradeTestTarget,
 )
 
 log = logging.getLogger(__name__)
@@ -165,9 +174,7 @@ def _upgrade_instance(
         self, trans: ProvidesUserContext, id: str, payload: UpgradeInstancePayload
     ) -> UserFileSourceModel:
         persisted_file_source = self._get(trans, id)
-        template = self._get_template(persisted_file_source, payload.template_version)
-        validate_no_extra_variables_defined(payload.variables, template)
-        validate_no_extra_secrets_defined(payload.secrets, template)
+        template = self._get_and_validate_target_upgrade_template(persisted_file_source, payload)
         persisted_file_source.template_version = template.version
         persisted_file_source.template_definition = template.model_dump()
         actual_variables = updated_template_variables(
@@ -180,6 +187,14 @@ def _upgrade_instance(
         self._save(persisted_file_source)
         return self._to_model(trans, persisted_file_source)
 
+    def _get_and_validate_target_upgrade_template(
+        self, persisted_file_source: UserFileSource, payload: Union[UpgradeInstancePayload, TestUpgradeInstancePayload]
+    ) -> FileSourceTemplate:
+        template = self._get_template(persisted_file_source, payload.template_version)
+        validate_no_extra_variables_defined(payload.variables, template)
+        validate_no_extra_secrets_defined(payload.secrets, template)
+        return template
+
     def _update_instance(
         self, trans: ProvidesUserContext, id: str, payload: UpdateInstancePayload
     ) -> UserFileSourceModel:
@@ -229,8 +244,46 @@ def create_instance(self, trans: ProvidesUserContext, payload: CreateInstancePay
         self._save(persisted_file_source)
         return self._to_model(trans, persisted_file_source)
 
+    def test_modify_instance(
+        self, trans: ProvidesUserContext, id: str, payload: TestModifyInstancePayload
+    ) -> PluginStatus:
+        persisted_file_source = self._get(trans, id)
+        if isinstance(payload, TestUpgradeInstancePayload):
+            return self._plugin_status_for_upgrade(trans, payload, persisted_file_source)
+        else:
+            assert isinstance(payload, TestUpdateInstancePayload)
+            return self._plugin_status_for_update(trans, payload, persisted_file_source)
+
+    def _plugin_status_for_update(
+        self, trans: ProvidesUserContext, payload: TestUpdateInstancePayload, persisted_file_source: UserFileSource
+    ) -> PluginStatus:
+        template = self._get_template(persisted_file_source)
+        target = UpdateTestTarget(persisted_file_source, payload)
+        return self._plugin_status_for_template(trans, target, template)
+
+    def _plugin_status_for_upgrade(
+        self, trans: ProvidesUserContext, payload: TestUpgradeInstancePayload, persisted_file_source: UserFileSource
+    ) -> PluginStatus:
+        template = self._get_and_validate_target_upgrade_template(persisted_file_source, payload)
+        target = UpgradeTestTarget(persisted_file_source, payload)
+        return self._plugin_status_for_template(trans, target, template)
+
+    def plugin_status_for_instance(self, trans: ProvidesUserContext, id: str):
+        persisted_file_source = self._get(trans, id)
+        return self._plugin_status(trans, persisted_file_source, to_template_reference(persisted_file_source))
+
     def plugin_status(self, trans: ProvidesUserContext, payload: CreateInstancePayload) -> PluginStatus:
-        template = self._catalog.find_template(payload)
+        return self._plugin_status(trans, payload, payload)
+
+    def _plugin_status(
+        self, trans: ProvidesUserContext, payload: CanTestPluginStatus, template_reference: TemplateReference
+    ):
+        template = self._catalog.find_template(template_reference)
+        return self._plugin_status_for_template(trans, payload, template)
+
+    def _plugin_status_for_template(
+        self, trans: ProvidesUserContext, payload: CanTestPluginStatus, template: FileSourceTemplate
+    ):
         template_definition_status = status_template_definition(template)
         status_kwds = {"template_definition": template_definition_status}
         if template_definition_status.is_not_ok:
@@ -254,38 +307,36 @@ def plugin_status(self, trans: ProvidesUserContext, payload: CreateInstancePaylo
     def _template_settings_status(
         self,
         trans: ProvidesUserContext,
-        payload: CreateInstancePayload,
+        payload: CanTestPluginStatus,
         template: FileSourceTemplate,
     ) -> Tuple[Optional[FileSourceConfiguration], PluginAspectStatus]:
-        secrets = payload.secrets
-        variables = payload.variables
-        environment = prepare_environment_from_root(template.environment, self._app_vault, self._app_config)
-        user_details = trans.user.config_template_details()
-
+        template_parameters = prepare_template_parameters_for_testing(
+            trans, template, payload, self._app_vault, self._app_config
+        )
         configuration = None
         exception = None
         try:
-            configuration = template_to_configuration(
-                template,
-                variables=variables,
-                secrets=secrets,
-                user_details=user_details,
-                environment=environment,
-            )
+            configuration = template_to_configuration(template, **template_parameters)
         except Exception as e:
             exception = e
         return configuration, settings_exception_to_status(exception)
 
     def _connection_status(
-        self, trans: ProvidesUserContext, payload: CreateInstancePayload, configuration: FileSourceConfiguration
+        self, trans: ProvidesUserContext, payload: CanTestPluginStatus, configuration: FileSourceConfiguration
     ) -> Tuple[Optional[BaseFilesSource], PluginAspectStatus]:
         file_source = None
         exception = None
+        if isinstance(payload, (UpgradeTestTarget, UpdateTestTarget)):
+            label = payload.instance.name
+            doc = payload.instance.description
+        else:
+            label = payload.name
+            doc = payload.description
         try:
             file_source_properties = configuration_to_file_source_properties(
                 configuration,
-                label=payload.name,
-                doc=payload.description,
+                label=label,
+                doc=doc,
                 id=uuid4().hex,
             )
             file_source = self._resolver._file_source(file_source_properties)
@@ -503,6 +554,9 @@ def configuration_to_file_source_properties(
     "CreateInstancePayload",
     "FileSourceInstancesManager",
     "ModifyInstancePayload",
+    "TestModifyInstancePayload",
+    "TestUpgradeInstancePayload",
+    "TestUpdateInstancePayload",
     "UpdateInstancePayload",
     "UpdateInstanceSecretPayload",
     "UpgradeInstancePayload",
diff --git a/lib/galaxy/managers/object_store_instances.py b/lib/galaxy/managers/object_store_instances.py
index ca1df59912a2..327a4529a213 100644
--- a/lib/galaxy/managers/object_store_instances.py
+++ b/lib/galaxy/managers/object_store_instances.py
@@ -13,6 +13,7 @@
     List,
     Optional,
     Tuple,
+    Union,
 )
 from uuid import uuid4
 
@@ -47,26 +48,34 @@
     PluginStatus,
     settings_exception_to_status,
     status_template_definition,
+    TemplateReference,
     TemplateVariableValueType,
     validate_no_extra_secrets_defined,
     validate_no_extra_variables_defined,
 )
 from ._config_templates import (
+    CanTestPluginStatus,
     CreateInstancePayload,
     ModifyInstancePayload,
     prepare_environment,
-    prepare_environment_from_root,
+    prepare_template_parameters_for_testing,
     purge_template_instance,
     recover_secrets,
     save_template_instance,
     sort_templates,
+    TestModifyInstancePayload,
+    TestUpdateInstancePayload,
+    TestUpgradeInstancePayload,
+    to_template_reference,
     update_instance_secret,
     update_template_instance,
     updated_template_variables,
     UpdateInstancePayload,
     UpdateInstanceSecretPayload,
+    UpdateTestTarget,
     upgrade_secrets,
     UpgradeInstancePayload,
+    UpgradeTestTarget,
 )
 
 log = logging.getLogger(__name__)
@@ -124,11 +133,9 @@ def _upgrade_instance(
         self, trans: ProvidesUserContext, id: str, payload: UpgradeInstancePayload
     ) -> UserConcreteObjectStoreModel:
         persisted_object_store = self._get(trans, id)
-        template = self._get_template(persisted_object_store, payload.template_version)
+        template = self._get_and_validate_target_upgrade_template(persisted_object_store, payload)
         persisted_object_store.template_version = template.version
         persisted_object_store.template_definition = template.model_dump()
-        validate_no_extra_variables_defined(payload.variables, template)
-        validate_no_extra_secrets_defined(payload.secrets, template)
         actual_variables = updated_template_variables(
             payload.variables,
             persisted_object_store,
@@ -139,6 +146,16 @@ def _upgrade_instance(
         self._save(persisted_object_store)
         return self._to_model(trans, persisted_object_store)
 
+    def _get_and_validate_target_upgrade_template(
+        self,
+        persisted_object_store: UserObjectStore,
+        payload: Union[UpgradeInstancePayload, TestUpgradeInstancePayload],
+    ) -> ObjectStoreTemplate:
+        template = self._get_template(persisted_object_store, payload.template_version)
+        validate_no_extra_variables_defined(payload.variables, template)
+        validate_no_extra_secrets_defined(payload.secrets, template)
+        return template
+
     def _update_instance(
         self, trans: ProvidesUserContext, id: str, payload: UpdateInstancePayload
     ) -> UserConcreteObjectStoreModel:
@@ -216,8 +233,46 @@ def _get(self, trans: ProvidesUserContext, id: str) -> UserObjectStore:
             raise ItemOwnershipException()
         return user_object_store
 
+    def test_modify_instance(
+        self, trans: ProvidesUserContext, id: str, payload: TestModifyInstancePayload
+    ) -> PluginStatus:
+        persisted_object_store = self._get(trans, id)
+        if isinstance(payload, TestUpgradeInstancePayload):
+            return self._plugin_status_for_upgrade(trans, payload, persisted_object_store)
+        else:
+            assert isinstance(payload, TestUpdateInstancePayload)
+            return self._plugin_status_for_update(trans, payload, persisted_object_store)
+
+    def _plugin_status_for_update(
+        self, trans: ProvidesUserContext, payload: TestUpdateInstancePayload, persisted_object_store: UserObjectStore
+    ) -> PluginStatus:
+        template = self._get_template(persisted_object_store)
+        target = UpdateTestTarget(persisted_object_store, payload)
+        return self._plugin_status_for_template(trans, target, template)
+
+    def _plugin_status_for_upgrade(
+        self, trans: ProvidesUserContext, payload: TestUpgradeInstancePayload, persisted_object_store: UserObjectStore
+    ) -> PluginStatus:
+        template = self._get_and_validate_target_upgrade_template(persisted_object_store, payload)
+        target = UpgradeTestTarget(persisted_object_store, payload)
+        return self._plugin_status_for_template(trans, target, template)
+
+    def plugin_status_for_instance(self, trans: ProvidesUserContext, id: str):
+        persisted_object_store = self._get(trans, id)
+        return self._plugin_status(trans, persisted_object_store, to_template_reference(persisted_object_store))
+
     def plugin_status(self, trans: ProvidesUserContext, payload: CreateInstancePayload) -> PluginStatus:
-        template = self._catalog.find_template(payload)
+        return self._plugin_status(trans, payload, payload)
+
+    def _plugin_status(
+        self, trans: ProvidesUserContext, payload: CanTestPluginStatus, template_reference: TemplateReference
+    ):
+        template = self._catalog.find_template(template_reference)
+        return self._plugin_status_for_template(trans, payload, template)
+
+    def _plugin_status_for_template(
+        self, trans: ProvidesUserContext, payload: CanTestPluginStatus, template: ObjectStoreTemplate
+    ):
         template_definition_status = status_template_definition(template)
         status_kwds = {"template_definition": template_definition_status}
         if template_definition_status.is_not_ok:
@@ -241,30 +296,23 @@ def plugin_status(self, trans: ProvidesUserContext, payload: CreateInstancePaylo
     def _template_settings_status(
         self,
         trans: ProvidesUserContext,
-        payload: CreateInstancePayload,
+        payload: CanTestPluginStatus,
         template: ObjectStoreTemplate,
     ) -> Tuple[Optional[ObjectStoreConfiguration], PluginAspectStatus]:
-        secrets = payload.secrets
-        variables = payload.variables
-        environment = prepare_environment_from_root(template.environment, self._app_vault, self._app_config)
-        user_details = trans.user.config_template_details()
+        template_parameters = prepare_template_parameters_for_testing(
+            trans, template, payload, self._app_vault, self._app_config
+        )
 
         configuration = None
         exception = None
         try:
-            configuration = template_to_configuration(
-                template,
-                variables=variables,
-                secrets=secrets,
-                user_details=user_details,
-                environment=environment,
-            )
+            configuration = template_to_configuration(template, **template_parameters)
         except Exception as e:
             exception = e
         return configuration, settings_exception_to_status(exception)
 
     def _connection_status(
-        self, trans: ProvidesUserContext, payload: CreateInstancePayload, configuration: ObjectStoreConfiguration
+        self, trans: ProvidesUserContext, payload: CanTestPluginStatus, configuration: ObjectStoreConfiguration
     ) -> Tuple[Optional[BaseObjectStore], PluginAspectStatus]:
         object_store = None
         exception = None
@@ -352,6 +400,9 @@ def resolve_object_store_uri_config(self, uri: str) -> ObjectStoreConfiguration:
 __all__ = (
     "CreateInstancePayload",
     "ModifyInstancePayload",
+    "TestUpgradeInstancePayload",
+    "TestUpdateInstancePayload",
+    "TestModifyInstancePayload",
     "UpdateInstancePayload",
     "UpdateInstanceSecretPayload",
     "UpgradeInstancePayload",
diff --git a/lib/galaxy/webapps/galaxy/api/file_sources.py b/lib/galaxy/webapps/galaxy/api/file_sources.py
index ef777b0e3283..ee7816714822 100644
--- a/lib/galaxy/webapps/galaxy/api/file_sources.py
+++ b/lib/galaxy/webapps/galaxy/api/file_sources.py
@@ -14,6 +14,7 @@
     CreateInstancePayload,
     FileSourceInstancesManager,
     ModifyInstancePayload,
+    TestModifyInstancePayload,
     UserFileSourceModel,
 )
 from galaxy.util.config_templates import PluginStatus
@@ -96,6 +97,18 @@ def instances_show(
     ) -> UserFileSourceModel:
         return self.file_source_instances_manager.show(trans, user_file_source_id)
 
+    @router.get(
+        "/api/file_source_instances/{user_file_source_id}/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: str = UserFileSourceIdPathParam,
+    ) -> PluginStatus:
+        return self.file_source_instances_manager.plugin_status_for_instance(trans, user_file_source_id)
+
     @router.put(
         "/api/file_source_instances/{user_file_source_id}",
         summary="Update or upgrade user file source instance.",
@@ -109,6 +122,19 @@ def update_instance(
     ) -> UserFileSourceModel:
         return self.file_source_instances_manager.modify_instance(trans, user_file_source_id, payload)
 
+    @router.post(
+        "/api/file_source_instances/{user_file_source_id}/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: str = UserFileSourceIdPathParam,
+        payload: TestModifyInstancePayload = Body(...),
+    ) -> PluginStatus:
+        return self.file_source_instances_manager.test_modify_instance(trans, user_file_source_id, payload)
+
     @router.delete(
         "/api/file_source_instances/{user_file_source_id}",
         summary="Purge user file source instance.",
diff --git a/lib/galaxy/webapps/galaxy/api/object_store.py b/lib/galaxy/webapps/galaxy/api/object_store.py
index 886f526420fd..fe2c81b5272e 100644
--- a/lib/galaxy/webapps/galaxy/api/object_store.py
+++ b/lib/galaxy/webapps/galaxy/api/object_store.py
@@ -25,6 +25,7 @@
     CreateInstancePayload,
     ModifyInstancePayload,
     ObjectStoreInstancesManager,
+    TestModifyInstancePayload,
     UserConcreteObjectStoreModel,
 )
 from galaxy.objectstore import (
@@ -134,6 +135,18 @@ def instances_show(
     ) -> UserConcreteObjectStoreModel:
         return self.object_store_instance_manager.show(trans, user_object_store_id)
 
+    @router.get(
+        "/api/object_store_instances/{user_object_store_id}/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: str = UserObjectStoreIdPathParam,
+    ) -> PluginStatus:
+        return self.object_store_instance_manager.plugin_status_for_instance(trans, user_object_store_id)
+
     @router.get(
         "/api/object_stores/{object_store_id}",
         summary="Get information about a concrete object store configured with Galaxy.",
@@ -158,6 +171,19 @@ def update_instance(
     ) -> UserConcreteObjectStoreModel:
         return self.object_store_instance_manager.modify_instance(trans, user_object_store_id, payload)
 
+    @router.post(
+        "/api/object_store_instances/{user_object_store_id}/test",
+        summary="Test updating or upgrading user object source instance.",
+        operation_id="object_stores__test_instances_update",
+    )
+    def test_update_instance(
+        self,
+        trans: ProvidesUserContext = DependsOnTrans,
+        user_file_source_id: str = UserObjectStoreIdPathParam,
+        payload: TestModifyInstancePayload = Body(...),
+    ) -> PluginStatus:
+        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}",
         summary="Purge user object store instance.",
diff --git a/test/integration/objectstore/test_per_user.py b/test/integration/objectstore/test_per_user.py
index a7a5637fc406..2b05f505a616 100644
--- a/test/integration/objectstore/test_per_user.py
+++ b/test/integration/objectstore/test_per_user.py
@@ -103,6 +103,18 @@ def _create_simple_object_store(self) -> str:
         object_store_id = object_store_json["object_store_id"]
         assert object_store_id.startswith("user_objects://")
 
+        response = self.dataset_populator._get(f"object_store_instances/{object_store_json['id']}/test")
+        response.raise_for_status()
+        from galaxy.util.config_templates import PluginStatus
+
+        status = PluginStatus.model_validate(response.json())
+        assert status.connection
+        assert not status.connection.is_not_ok
+        assert status.template_definition
+        assert not status.template_definition.is_not_ok
+        assert status.template_settings
+        assert not status.template_settings.is_not_ok
+
         object_stores = self.dataset_populator.selectable_object_stores()
         after_selectable_object_store_count = len(object_stores)
         assert after_selectable_object_store_count == before_selectable_object_store_count + 1
diff --git a/test/unit/app/managers/test_user_file_sources.py b/test/unit/app/managers/test_user_file_sources.py
index c0362b08bb8c..78a3faef6aaf 100644
--- a/test/unit/app/managers/test_user_file_sources.py
+++ b/test/unit/app/managers/test_user_file_sources.py
@@ -19,6 +19,8 @@
     CreateInstancePayload,
     FileSourceInstancesManager,
     ModifyInstancePayload,
+    TestUpdateInstancePayload,
+    TestUpgradeInstancePayload,
     UpdateInstancePayload,
     UpdateInstanceSecretPayload,
     UpgradeInstancePayload,
@@ -532,6 +534,100 @@ def test_status_invalid_settings_configuration_validation(self, tmp_path):
         assert "Input should be a valid boolean" in status.template_settings.message
         assert status.connection is None
 
+    def test_status_existing_valid(self, tmp_path):
+        self.init_user_in_database()
+        self._init_managers(tmp_path)
+        (tmp_path / self.trans.user.username).mkdir()
+        create_payload = CreateInstancePayload(
+            name=SIMPLE_FILE_SOURCE_NAME,
+            description=SIMPLE_FILE_SOURCE_DESCRIPTION,
+            template_id="home_directory",
+            template_version=0,
+            variables={},
+            secrets={},
+        )
+        user_file_source = self._create_instance(create_payload)
+        status = self.manager.plugin_status_for_instance(self.trans, user_file_source.uuid)
+        assert status.connection
+        assert not status.connection.is_not_ok
+        assert not status.template_definition.is_not_ok
+        assert status.template_settings
+        assert not status.template_settings.is_not_ok
+
+    def test_status_update_valid(self, tmp_path):
+        self._init_managers(tmp_path, config_dict=simple_variable_template(tmp_path))
+        create_payload = CreateInstancePayload(
+            name=SIMPLE_FILE_SOURCE_NAME,
+            description=SIMPLE_FILE_SOURCE_DESCRIPTION,
+            template_id="simple_variable",
+            template_version=0,
+            variables={"var1": "originalvarval"},
+            secrets={},
+        )
+        user_file_source = self._create_instance(create_payload)
+
+        update = TestUpdateInstancePayload(
+            variables={
+                "var1": "newval",
+            }
+        )
+
+        status = self.manager.test_modify_instance(self.trans, user_file_source.uuid, update)
+        assert not status.template_definition.is_not_ok
+        assert status.template_settings
+        assert not status.template_settings.is_not_ok
+        assert status.connection
+        assert status.connection.is_not_ok
+
+    def test_status_upgrade_valid(self, tmp_path):
+        user_file_source = self._init_upgrade_test_case(tmp_path)
+        assert "sec1" in user_file_source.secrets
+        assert "sec2" not in user_file_source.secrets
+        self._assert_secret_is(user_file_source, "sec1", "moocow")
+        self._assert_secret_absent(user_file_source, "foobarxyz")
+        self._assert_secret_absent(user_file_source, "sec2")
+        upgrade_to_1 = TestUpgradeInstancePayload(
+            template_version=1,
+            secrets={
+                "sec1": "moocow",
+                "sec2": "aftersec2",
+            },
+            variables={},
+        )
+        status = self.manager.test_modify_instance(self.trans, user_file_source.uuid, upgrade_to_1)
+        assert not status.template_definition.is_not_ok
+        assert status.template_settings
+        assert not status.template_settings.is_not_ok
+        assert status.connection
+        assert status.connection.is_not_ok
+
+    def test_status_upgrade_invalid(self, tmp_path):
+        user_file_source = self._init_invalid_upgrade_test_case(tmp_path)
+        upgrade_to_1 = TestUpgradeInstancePayload(
+            template_version=1,
+            secrets={},
+            variables={},
+        )
+        status = self.manager.test_modify_instance(self.trans, user_file_source.uuid, upgrade_to_1)
+        assert not status.template_definition.is_not_ok
+        assert status.template_settings
+        assert status.template_settings.is_not_ok
+        assert "Input should be a valid boolean" in status.template_settings.message
+        assert status.connection is None
+
+    def _init_invalid_upgrade_test_case(self, tmp_path) -> UserFileSourceModel:
+        version_0 = home_directory_template(tmp_path)
+        version_0["version"] = 0
+        version_1 = invalid_home_directory_template_type_error(tmp_path)
+        version_1["version"] = 1
+        version_1["id"] = version_0["id"]
+        config_dict = [
+            version_0,
+            version_1,
+        ]
+        self._init_managers(tmp_path, config_dict=config_dict)
+        return self._create_user_file_source()
+
     def _init_upgrade_test_case(self, tmp_path) -> UserFileSourceModel:
         example_yaml_str = UPGRADE_EXAMPLE
         example_yaml_str.replace("/data", str(tmp_path))
diff --git a/test/unit/app/managers/test_user_object_stores.py b/test/unit/app/managers/test_user_object_stores.py
index 96d11ee7ffc4..1ad20cc9af91 100644
--- a/test/unit/app/managers/test_user_object_stores.py
+++ b/test/unit/app/managers/test_user_object_stores.py
@@ -14,6 +14,8 @@
     CreateInstancePayload,
     ModifyInstancePayload,
     ObjectStoreInstancesManager,
+    TestUpdateInstancePayload,
+    TestUpgradeInstancePayload,
     UpdateInstancePayload,
     UpdateInstanceSecretPayload,
     UpgradeInstancePayload,
@@ -146,9 +148,9 @@ def test_simple_update(self, tmp_path):
         assert response.variables
         assert response.variables["var1"] == "newval"
 
-        user_file_source_showed = self.manager.show(self.trans, user_object_store.uuid)
-        assert user_file_source_showed.variables
-        assert user_file_source_showed.variables["var1"] == "newval"
+        user_object_store_showed = self.manager.show(self.trans, user_object_store.uuid)
+        assert user_object_store_showed.variables
+        assert user_object_store_showed.variables["var1"] == "newval"
 
     def test_update_errors_on_extra_variables(self, tmp_path):
         self._init_managers(tmp_path, config_dict=simple_variable_template(tmp_path))
@@ -328,6 +330,25 @@ def test_status_valid(self, tmp_path):
         assert status.template_settings
         assert not status.template_settings.is_not_ok
 
+    def test_status_existing_valid(self, tmp_path):
+        self.init_user_in_database()
+        self._init_managers(tmp_path, simple_vault_template(tmp_path))
+        create_payload = CreateInstancePayload(
+            name=SIMPLE_FILE_SOURCE_NAME,
+            description=SIMPLE_FILE_SOURCE_DESCRIPTION,
+            template_id="simple_vault",
+            template_version=0,
+            variables={},
+            secrets={"sec1": "foosec"},
+        )
+        user_object_store = self._create_instance(create_payload)
+        status = self.manager.plugin_status_for_instance(self.trans, user_object_store.uuid)
+        assert status.connection
+        assert not status.connection.is_not_ok
+        assert not status.template_definition.is_not_ok
+        assert status.template_settings
+        assert not status.template_settings.is_not_ok
+
     def test_status_invalid_settings_undefined_variable(self, tmp_path):
         self.init_user_in_database()
         self._init_managers(tmp_path, config_dict=simple_vault_template_with_undefined_jinja_problem(tmp_path))
@@ -348,6 +369,68 @@ def test_status_invalid_settings_undefined_variable(self, tmp_path):
         )
         assert status.connection is None
 
+    def test_status_update_valid(self, tmp_path):
+        self._init_managers(tmp_path, config_dict=simple_variable_template(tmp_path))
+        create_payload = CreateInstancePayload(
+            name=SIMPLE_FILE_SOURCE_NAME,
+            description=SIMPLE_FILE_SOURCE_DESCRIPTION,
+            template_id="simple_variable",
+            template_version=0,
+            variables={"var1": "originalvarval"},
+            secrets={},
+        )
+        user_object_store = self._create_instance(create_payload)
+
+        update = TestUpdateInstancePayload(
+            variables={
+                "var1": "newval",
+            }
+        )
+        status = self.manager.test_modify_instance(self.trans, user_object_store.uuid, update)
+        assert not status.template_definition.is_not_ok
+        assert status.template_settings
+        assert not status.template_settings.is_not_ok
+        assert status.connection
+        assert not status.connection.is_not_ok
+
+    def test_status_upgrade_valid(self, tmp_path):
+        user_object_store = self._init_upgrade_test_case(tmp_path)
+        assert "sec1" in user_object_store.secrets
+        assert "sec2" not in user_object_store.secrets
+        self._assert_secret_is(user_object_store, "sec1", "moocow")
+        self._assert_secret_absent(user_object_store, "foobarxyz")
+        self._assert_secret_absent(user_object_store, "sec2")
+        upgrade_to_1 = TestUpgradeInstancePayload(
+            template_version=1,
+            secrets={
+                "sec1": "moocow",
+                "sec2": "aftersec2",
+            },
+            variables={},
+        )
+        status = self.manager.test_modify_instance(self.trans, user_object_store.uuid, upgrade_to_1)
+        assert not status.template_definition.is_not_ok
+        assert status.template_settings
+        assert not status.template_settings.is_not_ok
+        assert status.connection
+        assert not status.connection.is_not_ok
+
+    def test_status_upgrade_invalid(self, tmp_path):
+        user_object_store = self._init_invalid_upgrade_test_case(tmp_path)
+        upgrade_to_1 = TestUpgradeInstancePayload(
+            template_version=1,
+            secrets={},
+            variables={},
+        )
+        status = self.manager.test_modify_instance(self.trans, user_object_store.uuid, upgrade_to_1)
+        assert not status.template_definition.is_not_ok
+        assert status.template_settings
+        assert status.template_settings.is_not_ok
+        assert (
+            "Problem with template definition causing invalid settings resolution" in status.template_settings.message
+        )
+        assert status.connection is None
+
     def _init_upgrade_test_case(self, tmp_path) -> UserConcreteObjectStoreModel:
         example_yaml_str = UPGRADE_EXAMPLE
         example_yaml_str.replace("/data", str(tmp_path))
@@ -356,6 +439,28 @@ def _init_upgrade_test_case(self, tmp_path) -> UserConcreteObjectStoreModel:
         user_object_store = self._create_instance(UPGRADE_INITIAL_PAYLOAD)
         return user_object_store
 
+    def _init_invalid_upgrade_test_case(self, tmp_path) -> UserConcreteObjectStoreModel:
+        version_0 = simple_vault_template(tmp_path)
+        version_0["version"] = 0
+        version_1 = simple_vault_template_with_undefined_jinja_problem(tmp_path)
+        version_1["version"] = 1
+        version_1["id"] = version_0["id"]
+        config_dict = [
+            version_0,
+            version_1,
+        ]
+        self._init_managers(tmp_path, config_dict=config_dict)
+        create_payload = CreateInstancePayload(
+            name=SIMPLE_FILE_SOURCE_NAME,
+            description=SIMPLE_FILE_SOURCE_DESCRIPTION,
+            template_id="simple_vault",
+            template_version=0,
+            variables={},
+            secrets={"sec1": "foosec"},
+        )
+        user_object_store = self._create_instance(create_payload)
+        return user_object_store
+
     def _read_secret(self, user_object_store: UserConcreteObjectStoreModel, secret_name: str) -> str:
         user_vault = self.trans.user_vault
         config_secret_key = f"object_store_config/{user_object_store.uuid}/{secret_name}"