added changes for de registering plugins not in Neo and changed other…

… apis to 400 Signed-off-by: sumukhswamy <[email protected]>
opensearch-project · Oct 21, 2024 · 72e4161 · 72e4161
1 parent 6edd8ef
commit 72e4161
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/server/routes/index.ts b/server/routes/index.ts
@@ -35,12 +35,9 @@ export function setupRoutes({
   client: ILegacyClusterClient;
   dataSourceEnabled: boolean;
 }) {
-  PanelsRouter(router);
   VisualizationsRouter(router);
   registerPplRoute({ router, facet: new PPLFacet(client) });
   registerDslRoute({ router, facet: new DSLFacet(client) }, dataSourceEnabled);
-  registerEventAnalyticsRouter({ router, savedObjectFacet: new SavedObjectFacet(client) });
-  registerAppAnalyticsRouter(router);
 
   // TODO remove trace analytics route when DSL route for autocomplete is added
   registerTraceAnalyticsDslRouter(router, dataSourceEnabled);
@@ -60,6 +57,9 @@ export function setupRoutes({
   // query assist is part of log explorer, which will be disabled if datasource is enabled
   if (!dataSourceEnabled) {
     registerQueryAssistRoutes(router);
+    PanelsRouter(router);
+    registerEventAnalyticsRouter({ router, savedObjectFacet: new SavedObjectFacet(client) });
+    registerAppAnalyticsRouter(router);
   }
 
   registerGettingStartedRoutes(router);

diff --git a/server/routes/metrics/metrics_rounter.ts b/server/routes/metrics/metrics_rounter.ts
@@ -99,7 +99,7 @@ export function registerMetricsRoute(router: IRouter, dataSourceEnabled: boolean
       } catch (error) {
         if (error.statusCode !== 404) console.error(error);
         return response.custom({
-          statusCode: error.statusCode || 500,
+          statusCode: error.statusCode || 400,
           body: error.message,
         });
       }

diff --git a/server/routes/ppl.ts b/server/routes/ppl.ts
@@ -33,7 +33,7 @@ export function registerPplRoute({ router, facet }: { router: IRouter; facet: PP
         return res.ok(result);
       }
       return res.custom({
-        statusCode: queryRes.data.statusCode || queryRes.data.status || 500,
+        statusCode: queryRes.data.statusCode || queryRes.data.status || 400,
         body: queryRes.data.body || queryRes.data.message || '',
       });
     }

diff --git a/server/routes/trace_analytics_dsl_router.ts b/server/routes/trace_analytics_dsl_router.ts
@@ -51,7 +51,7 @@ export function registerTraceAnalyticsDslRouter(router: IRouter, dataSourceEnabl
       } catch (error) {
         console.error(error);
         return response.custom({
-          statusCode: error.statusCode || 500,
+          statusCode: error.statusCode || 400,
           body: error.message,
         });
       }
@@ -90,7 +90,7 @@ export function registerTraceAnalyticsDslRouter(router: IRouter, dataSourceEnabl
       } catch (error) {
         console.error(error);
         return response.custom({
-          statusCode: error.statusCode || 500,
+          statusCode: error.statusCode || 400,
           body: error.message,
         });
       }