From 622360e97b35e7123064a917e1d4acd708898432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= <freben@gmail.com>
Date: Wed, 28 Aug 2024 16:45:54 +0200
Subject: [PATCH] adjust the discovery config again
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Fredrik Adelöw <freben@gmail.com>
---
 .changeset/mighty-cheetahs-call.md    |  5 +++
 packages/backend-defaults/config.d.ts | 44 +++++++++++++--------------
 2 files changed, 27 insertions(+), 22 deletions(-)
 create mode 100644 .changeset/mighty-cheetahs-call.md

diff --git a/.changeset/mighty-cheetahs-call.md b/.changeset/mighty-cheetahs-call.md
new file mode 100644
index 0000000000..f5d17d8b20
--- /dev/null
+++ b/.changeset/mighty-cheetahs-call.md
@@ -0,0 +1,5 @@
+---
+'@backstage/backend-defaults': patch
+---
+
+Move down the discovery config to be in the root
diff --git a/packages/backend-defaults/config.d.ts b/packages/backend-defaults/config.d.ts
index 5f068735ce..a8c6e1c290 100644
--- a/packages/backend-defaults/config.d.ts
+++ b/packages/backend-defaults/config.d.ts
@@ -374,28 +374,6 @@ export interface Config {
       >;
     };
 
-    /**
-     * Options used by the default discovery service.
-     */
-    discovery?: {
-      /**
-       * A list of target baseUrls and the associated plugins.
-       */
-      endpoints: Array<{
-        /**
-         * The target base URL to use for the plugin.
-         *
-         * Can be either a string or an object with internal and external keys.
-         * Targets with `{{pluginId}}` or `{{ pluginId }} in the URL will be replaced with the plugin ID.
-         */
-        target: string | { internal: string; external: string };
-        /**
-         * Array of plugins which use the target base URL.
-         */
-        plugins: string[];
-      }>;
-    };
-
     /** Database connection configuration, select base database type using the `client` field */
     database: {
       /** Default database client to use */
@@ -574,4 +552,26 @@ export interface Config {
       }>;
     };
   };
+
+  /**
+   * Options used by the default discovery service.
+   */
+  discovery?: {
+    /**
+     * A list of target baseUrls and the associated plugins.
+     */
+    endpoints: Array<{
+      /**
+       * The target base URL to use for the plugin.
+       *
+       * Can be either a string or an object with internal and external keys.
+       * Targets with `{{pluginId}}` or `{{ pluginId }} in the URL will be replaced with the plugin ID.
+       */
+      target: string | { internal: string; external: string };
+      /**
+       * Array of plugins which use the target base URL.
+       */
+      plugins: string[];
+    }>;
+  };
 }