PR feedback.

elastic · Jan 5, 2024 · 02bfbe0 · 02bfbe0
1 parent 12aa709
commit 02bfbe0
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 93 deletions.
diff --git a/x-pack/plugins/dataset_quality/server/routes/data_streams/get_data_stream_details/index.ts b/x-pack/plugins/dataset_quality/server/routes/data_streams/get_data_stream_details/index.ts
@@ -23,7 +23,7 @@ export async function getDataStreamDetails(args: {
 
   const indexSettings = await dataStreamService.getDataSteamIndexSettings(esClient, {
     type,
-    dataset: `*${datasetQuery}*`,
+    dataset: `${datasetQuery}`,
   });
 
   const indexesList = Object.values(indexSettings);

diff --git a/x-pack/plugins/dataset_quality/server/routes/data_streams/routes.ts b/x-pack/plugins/dataset_quality/server/routes/data_streams/routes.ts
@@ -7,6 +7,7 @@
 
 import * as t from 'io-ts';
 import { keyBy, merge, values } from 'lodash';
+import Boom from '@hapi/boom';
 import {
   DataStreamDetails,
   DataStreamStat,
@@ -113,7 +114,7 @@ const dataStreamDetailsRoute = createDatasetQualityServerRoute({
     tags: [],
   },
   async handler(resources): Promise<DataStreamDetails> {
-    const { context, params, response } = resources;
+    const { context, params } = resources;
     const { type = DEFAULT_DATASET_TYPE, datasetQuery } = params.query;
     const coreContext = await context.core;
 
@@ -125,9 +126,7 @@ const dataStreamDetailsRoute = createDatasetQualityServerRoute({
     } catch (e) {
       if (e) {
         if (e?.message?.indexOf('index_not_found_exception') > -1) {
-          throw response.notFound({
-            body: { message: `Data stream ${type}-*${datasetQuery}* not found.` },
-          });
+          throw Boom.notFound(`Data stream ${type}-${datasetQuery} not found.`);
         }
       }
 

diff --git a/x-pack/plugins/dataset_quality/server/routes/register_routes.ts b/x-pack/plugins/dataset_quality/server/routes/register_routes.ts
@@ -6,7 +6,6 @@
  */
 import { errors } from '@elastic/elasticsearch';
 import Boom from '@hapi/boom';
-import { isKibanaResponse } from '@kbn/core-http-router-server-internal';
 import { CoreSetup, Logger, RouteRegistrar } from '@kbn/core/server';
 import {
   ServerRouteRepository,
@@ -54,7 +53,6 @@ export function registerRoutes({ repository, core, logger, plugins }: RegisterRo
           const data = (await handler({
             context,
             request,
-            response,
             logger,
             params: decodedParams,
             plugins,
@@ -73,11 +71,8 @@ export function registerRoutes({ repository, core, logger, plugins }: RegisterRo
               body: { message: error.output.payload.message },
             });
           }
-          logger.error(error);
 
-          if (isKibanaResponse(error)) {
-            return error;
-          }
+          logger.error(error);
 
           const opts = {
             statusCode: 500,

diff --git a/x-pack/plugins/dataset_quality/server/routes/types.ts b/x-pack/plugins/dataset_quality/server/routes/types.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { KibanaRequest, KibanaResponseFactory, Logger } from '@kbn/core/server';
+import { KibanaRequest, Logger } from '@kbn/core/server';
 import { DatasetQualityServerRouteRepository } from '.';
 import {
   DatasetQualityPluginSetupDependencies,
@@ -18,7 +18,6 @@ export interface DatasetQualityRouteHandlerResources {
   context: DatasetQualityRequestHandlerContext;
   logger: Logger;
   request: KibanaRequest;
-  response: KibanaResponseFactory;
   plugins: {
     [key in keyof DatasetQualityPluginSetupDependencies]: {
       setup: Required<DatasetQualityPluginSetupDependencies>[key];

diff --git a/x-pack/plugins/dataset_quality/tsconfig.json b/x-pack/plugins/dataset_quality/tsconfig.json
@@ -28,7 +28,6 @@
     "@kbn/es-types",
     "@kbn/deeplinks-observability",
     "@kbn/router-utils",
-    "@kbn/core-http-router-server-internal",
   ],
   "exclude": [
     "target/**/*",

diff --git a/x-pack/test/dataset_quality_api_integration/common/config.ts b/x-pack/test/dataset_quality_api_integration/common/config.ts
@@ -11,7 +11,6 @@ import {
 } from '@kbn/dataset-quality-plugin/server/test_helpers/create_dataset_quality_users/authentication';
 import { createDatasetQualityUsers } from '@kbn/dataset-quality-plugin/server/test_helpers/create_dataset_quality_users';
 import { FtrConfigProviderContext } from '@kbn/test';
-import { Client } from '@elastic/elasticsearch';
 import supertest from 'supertest';
 import { format, UrlObject } from 'url';
 import { createLogger, LogLevel, LogsSynthtraceEsClient } from '@kbn/apm-synthtrace';
@@ -66,7 +65,6 @@ export interface CreateTest {
   services: InheritedServices & {
     datasetQualityFtrConfig: () => DatasetQualityFtrConfig;
     registry: ({ getService }: FtrProviderContext) => ReturnType<typeof RegistryProvider>;
-    es: (context: InheritedFtrProviderContext) => Client;
     logSynthtraceEsClient: (
       context: InheritedFtrProviderContext
     ) => Promise<LogsSynthtraceEsClient>;

diff --git a/x-pack/test/dataset_quality_api_integration/tests/data_streams/data_stream_details.spec.ts b/x-pack/test/dataset_quality_api_integration/tests/data_streams/data_stream_details.spec.ts
@@ -19,6 +19,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
   const start = '2023-12-11T18:00:00.000Z';
   const end = '2023-12-11T18:01:00.000Z';
   const dataStream = 'nginx.access';
+  const namespace = 'default';
 
   async function callApiAs(user: DatasetQualityApiClientKey, datasetQuery: string) {
     return await datasetQualityApiClient[user]({
@@ -44,6 +45,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
                 .message('This is a log message')
                 .timestamp(timestamp)
                 .dataset(dataStream)
+                .namespace(namespace)
                 .defaults({
                   'log.file.path': '/my-service.log',
                 })
@@ -59,20 +61,20 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
       it('returns 404 if matching data stream is not available', async () => {
         const nonExistentDataStream = 'Non-existent';
-        const expectedMessage = `*${nonExistentDataStream}* not found`;
-        expect(
-          (
-            await expectToReject(() => callApiAs('datasetQualityLogsUser', nonExistentDataStream))
-          ).message.indexOf(expectedMessage)
-        ).to.greaterThan(-1);
+        const expectedMessage = `logs-${nonExistentDataStream}-${namespace} not found`;
+        const err = await expectToReject(() =>
+          callApiAs('datasetQualityLogsUser', `${nonExistentDataStream}-${namespace}`)
+        );
+        expect(err.res.status).to.be(404);
+        expect(err.res.body.message.indexOf(expectedMessage)).to.greaterThan(-1);
       });
 
       it('returns data stream details correctly', async () => {
         const dataStreamSettings = await getDataStreamSettingsOfFirstIndex(
           esClient,
-          `logs-*${dataStream}*`
+          `logs-${dataStream}-${namespace}`
         );
-        const resp = await callApiAs('datasetQualityLogsUser', dataStream);
+        const resp = await callApiAs('datasetQualityLogsUser', `${dataStream}-${namespace}`);
         expect(resp.body.createdOn).to.be(Number(dataStreamSettings?.index?.creation_date));
       });
 

diff --git a/x-pack/test/dataset_quality_api_integration/utils/data_stream.ts b/x-pack/test/dataset_quality_api_integration/utils/data_stream.ts
@@ -6,75 +6,6 @@
  */
 
 import { Client } from '@elastic/elasticsearch';
-import { IndicesPutIndexTemplateRequest } from '@elastic/elasticsearch/lib/api/types';
-
-export async function createIndexTemplateAndDataStream(
-  es: Client,
-  name: string,
-  indexTemplateOverrides?: Partial<IndicesPutIndexTemplateRequest>
-) {
-  // A data stream requires an index template before it can be created.
-  await es.indices.putIndexTemplate({
-    name: `${name}_index_template`,
-    index_patterns: [name + '*'],
-    data_stream: {},
-    ...(indexTemplateOverrides ?? {}),
-    template: {
-      mappings: {
-        ...(indexTemplateOverrides?.template?.mappings ?? {}),
-        properties: indexTemplateOverrides?.template?.mappings?.properties ?? {
-          '@timestamp': {
-            type: 'date',
-          },
-          source: {
-            type: 'keyword',
-          },
-          reference: {
-            type: 'keyword',
-          },
-          params: {
-            enabled: false,
-            type: 'object',
-          },
-          host: {
-            properties: {
-              hostname: {
-                type: 'text',
-                fields: {
-                  keyword: {
-                    type: 'keyword',
-                    ignore_above: 256,
-                  },
-                },
-              },
-              id: {
-                type: 'keyword',
-              },
-              name: {
-                type: 'keyword',
-              },
-            },
-          },
-        },
-      },
-    },
-  });
-
-  await es.indices.createDataStream({ name });
-}
-
-async function deleteComposableIndexTemplate(es: Client, name: string) {
-  await es.indices.deleteIndexTemplate({ name });
-}
-
-export async function deleteIndexTemplateAndDataStream(
-  es: Client,
-  name: string,
-  indexTemplateName?: string
-) {
-  await es.indices.deleteDataStream({ name });
-  await deleteComposableIndexTemplate(es, indexTemplateName ?? `${name}_index_template`);
-}
 
 export async function getDataStreamSettingsOfFirstIndex(es: Client, name: string) {
   const matchingIndexesObj = await es.indices.getSettings({ index: name });