Properly pass plugins to routes

elastic · Nov 24, 2024 · c46d94c · c46d94c
1 parent 95440e2
commit c46d94c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/plugin.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/plugin.ts
@@ -111,7 +111,18 @@ export class ObservabilityAIAssistantPlugin
             ];
           }),
       };
-    }) as ObservabilityAIAssistantRouteHandlerResources['plugins'];
+    }) as Pick<
+      ObservabilityAIAssistantRouteHandlerResources['plugins'],
+      keyof ObservabilityAIAssistantPluginStartDependencies
+    >;
+
+    const withCore = {
+      ...routeHandlerPlugins,
+      core: {
+        setup: core,
+        start: () => core.getStartServices().then(([coreStart]) => coreStart),
+      },
+    };
 
     const service = (this.service = new ObservabilityAIAssistantService({
       logger: this.logger.get('service'),
@@ -133,7 +144,7 @@ export class ObservabilityAIAssistantPlugin
       core,
       logger: this.logger,
       dependencies: {
-        plugins: routeHandlerPlugins,
+        plugins: withCore,
         service: this.service,
       },
     });

diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/routes/types.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/routes/types.ts
@@ -49,7 +49,6 @@ export type ObservabilityAIAssistantRequestHandlerContext = Omit<
     savedObjects: {
       client: SavedObjectsClientContract;
     };
-    coreStart: CoreStart;
   }>;
 };
 

diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_app/server/plugin.ts b/x-pack/plugins/observability_solution/observability_ai_assistant_app/server/plugin.ts
@@ -98,7 +98,6 @@ export class ObservabilityAIAssistantAppPlugin
           };
         }),
         core: Promise.resolve({
-          coreStart,
           elasticsearch: {
             client: coreStart.elasticsearch.client.asScoped(request),
           },

diff --git a/...observability_solution/observability_ai_assistant_app/server/rule_connector/index.test.ts b/...observability_solution/observability_ai_assistant_app/server/rule_connector/index.test.ts
@@ -94,12 +94,14 @@ describe('observabilityAIAssistant rule_connector', () => {
             getAdhocInstructions: () => [],
           }),
         },
-        context: {
-          core: Promise.resolve({
-            coreStart: { http: { basePath: { publicBaseUrl: 'http://kibana.com' } } },
-          }),
-        },
+        context: {},
         plugins: {
+          core: {
+            start: () =>
+              Promise.resolve({
+                http: { basePath: { publicBaseUrl: 'http://kibana.com' } },
+              }),
+          },
           actions: {
             start: async () => {
               return {
-Original file line number
+Diff line change
@@ Expand Up @@
         savedObjects: {
           client: SavedObjectsClientContract;
         };
-        coreStart: CoreStart;
       }>;
     };
@@ Expand Down @@