Polishing for kibana merge(elastic#73)

x-pack/plugins/cloud_security_posture/common/constants.ts

@@ -6,8 +6,8 @@
  */
 export const CSP_KUBEBEAT_INDEX_NAME = 'logs-k8s_cis*';
 export const CSP_FINDINGS_INDEX_NAME = 'findings';
-export const STATS_ROUTH_PATH = '/api/csp/stats';
-export const FINDINGS_ROUTH_PATH = '/api/csp/finding';
+export const STATS_ROUTE_PATH = '/api/csp/stats';
+export const FINDINGS_ROUTE_PATH = '/api/csp/finding';
 export const AGENT_LOGS_INDEX = 'logs-k8s_cis*';
 export const RULE_PASSED = `passed`;
 export const RULE_FAILED = `failed`;

x-pack/plugins/cloud_security_posture/server/constants.ts

@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const RULE_PASSED = `passed`;
+export const RULE_FAILED = `failed`;

x-pack/plugins/cloud_security_posture/server/index_template/create_index_template.test.ts

@@ -8,13 +8,17 @@
 import { elasticsearchClientMock } from 'src/core/server/elasticsearch/client/mocks';
 import { createFindingsIndexTemplate } from './create_index_template';
 const mockEsClient = elasticsearchClientMock.createClusterClient().asScoped().asInternalUser;
-
+afterEach(() => {
+  mockEsClient.indices.putIndexTemplate.mockClear();
+  mockEsClient.indices.existsIndexTemplate.mockClear();
+});
 describe('create index template for findings', () => {
   it('expect to find existing template', async () => {
     mockEsClient.indices.existsIndexTemplate.mockResolvedValueOnce(
       elasticsearchClientMock.createSuccessTransportRequestPromise(true)
     );
     const response = await createFindingsIndexTemplate(mockEsClient);
+    expect(mockEsClient.indices.putIndexTemplate.mock.calls.length).toEqual(0);
     expect(response).toEqual(true);
   });
 

x-pack/plugins/cloud_security_posture/server/index_template/create_index_template.ts

@@ -4,27 +4,27 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { MappingProperty } from '@elastic/elasticsearch/lib/api/types';
+import type { MappingTypeMapping } from '@elastic/elasticsearch/lib/api/types';
 import type { ElasticsearchClient } from 'src/core/server';
-import { CSP_KUBEBEAT_INDEX_NAME, CSP_FINDINGS_INDEX_NAME } from '../..//common/constants';
-import findingsIndexMapping from './findings_mapping.json';
+import { CSP_KUBEBEAT_INDEX_NAME, CSP_FINDINGS_INDEX_NAME } from '../../common/constants';
+import { mapping as findingsIndexMapping } from './findings_mapping';
 
 export type Status = boolean;
 
 const doesIndexTemplateExist = async (esClient: ElasticsearchClient, templateName: string) => {
   try {
-    const isExisting = await esClient.indices.existsIndexTemplate({ name: templateName });
-    return isExisting.body;
+    const response = await esClient.indices.existsIndexTemplate({ name: templateName });
+    return response.body;
   } catch (err) {
     return false;
   }
 };
 
-export const createIndexTemplate = async (
+const createIndexTemplate = async (
   esClient: ElasticsearchClient,
   indexName: string,
   indexPattern: string,
-  properties: Record<string, MappingProperty>
+  properties: MappingTypeMapping
 ): Promise<Status> => {
   try {
     const response = await esClient.indices.putIndexTemplate({
@@ -51,14 +51,14 @@ export const createFindingsIndexTemplate = async (
   esClient: ElasticsearchClient
 ): Promise<Status> => {
   try {
-    const isExisting = await doesIndexTemplateExist(esClient, CSP_FINDINGS_INDEX_NAME);
-    if (isExisting) return true;
+    const indexTemplateExists = await doesIndexTemplateExist(esClient, CSP_FINDINGS_INDEX_NAME);
+    if (indexTemplateExists) return true;
     return await createIndexTemplate(
       esClient,
       CSP_FINDINGS_INDEX_NAME,
       CSP_KUBEBEAT_INDEX_NAME,
       // TODO: check why this cast is required
-      findingsIndexMapping as Record<string, MappingProperty>
+      findingsIndexMapping
     );
   } catch (err) {
     // TODO: add logger