Handle Internal Server Error

Signed-off-by: Suchit Sahoo <[email protected]>
opensearch-project · Oct 11, 2024 · d1fceaa · d1fceaa
1 parent 9eae148
commit d1fceaa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/plugins/data/server/dql_telemetry/route.ts b/src/plugins/data/server/dql_telemetry/route.ts
@@ -47,7 +47,6 @@ export function registerDqlTelemetryRoute(
     },
     async (context, request, response) => {
       const [{ savedObjects }] = await getStartServices();
-      const internalRepository = savedObjects.createScopedRepository(request);
 
       const {
         body: { opt_in: optIn },
@@ -56,11 +55,12 @@ export function registerDqlTelemetryRoute(
       const counterName = optIn ? 'optInCount' : 'optOutCount';
 
       try {
+        const internalRepository = savedObjects.createScopedRepository(request);
         await internalRepository.incrementCounter('dql-telemetry', 'dql-telemetry', counterName);
       } catch (error) {
         logger.warn(`Unable to increment counter: ${error}`);
         return response.customError({
-          statusCode: error.status,
+          statusCode: error.status || 403,
           body: {
             message: 'Something went wrong',
             attributes: {

diff --git a/src/plugins/vis_type_vega/server/vega_visualization_client_wrapper.ts b/src/plugins/vis_type_vega/server/vega_visualization_client_wrapper.ts
@@ -28,7 +28,11 @@ export const vegaVisualizationClientWrapper: SavedObjectsClientWrapperFactory =
   ) => {
     const vegaSpec = extractVegaSpecFromAttributes(attributes);
     if (type !== 'visualization' || vegaSpec === undefined || !getDataSourceEnabled().enabled) {
-      return await wrapperOptions.client.create(type, attributes, options);
+      try {
+        return await wrapperOptions.client.create(type, attributes, options);
+      } catch (ex) {
+        throw SavedObjectsErrorHelpers.createUnsupportedTypeError(type);
+      }
     }
     const dataSourceNamesSet = extractDataSourceNamesInVegaSpec(vegaSpec);