From 07a00506e56a38d4aababbef31db16d8df813278 Mon Sep 17 00:00:00 2001
From: Carlos Crespo <carloshenrique.leonelcrespo@elastic.co>
Date: Thu, 24 Oct 2024 12:52:11 +0200
Subject: [PATCH] Add tests

---
 .../es/utils/esql_result_to_plain_objects.ts  | 12 +++++--
 .../inventory/common/entities.ts              | 32 +------------------
 .../entities/get_identify_fields.test.ts      |  2 +-
 3 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/x-pack/packages/observability/observability_utils/es/utils/esql_result_to_plain_objects.ts b/x-pack/packages/observability/observability_utils/es/utils/esql_result_to_plain_objects.ts
index 693efee838c9..96049f75ef15 100644
--- a/x-pack/packages/observability/observability_utils/es/utils/esql_result_to_plain_objects.ts
+++ b/x-pack/packages/observability/observability_utils/es/utils/esql_result_to_plain_objects.ts
@@ -13,9 +13,17 @@ export function esqlResultToPlainObjects<T extends Record<string, any>>(
   return result.values.map((row) => {
     return row.reduce<Record<string, unknown>>((acc, value, index) => {
       const column = result.columns[index];
-      if (!/(text$|keyword$)/.test(column.name)) {
-        acc[column.name] = value;
+
+      if (!column) {
+        return acc;
+      }
+
+      // Removes the type suffix from the column name
+      const name = column.name.replace(/\.(text|keyword)$/, '');
+      if (!acc[name]) {
+        acc[name] = value;
       }
+
       return acc;
     }, {});
   }) as T[];
diff --git a/x-pack/plugins/observability_solution/inventory/common/entities.ts b/x-pack/plugins/observability_solution/inventory/common/entities.ts
index d2eacf24b6ca..8bccea222200 100644
--- a/x-pack/plugins/observability_solution/inventory/common/entities.ts
+++ b/x-pack/plugins/observability_solution/inventory/common/entities.ts
@@ -7,18 +7,12 @@
 import { z } from '@kbn/zod';
 import { ENTITY_LATEST, entitiesAliasPattern, entityLatestSchema } from '@kbn/entities-schema';
 import {
-  AGENT_NAME,
-  CLOUD_PROVIDER,
-  CONTAINER_ID,
   ENTITY_DEFINITION_ID,
   ENTITY_DISPLAY_NAME,
   ENTITY_ID,
   ENTITY_IDENTITY_FIELDS,
   ENTITY_LAST_SEEN,
   ENTITY_TYPE,
-  HOST_NAME,
-  SERVICE_ENVIRONMENT,
-  SERVICE_NAME,
 } from '@kbn/observability-shared-plugin/common';
 import { isRight } from 'fp-ts/lib/Either';
 import * as t from 'io-ts';
@@ -64,7 +58,7 @@ export const entityTypesRt = new t.Type<string[], string, unknown>(
   (arr) => arr.join()
 );
 
-export interface BaseEntity {
+export interface Entity {
   [ENTITY_LAST_SEEN]: string;
   [ENTITY_ID]: string;
   [ENTITY_TYPE]: string;
@@ -75,30 +69,6 @@ export interface BaseEntity {
   [key: string]: any;
 }
 
-/**
- * These types are based on service, host and container from the built in definition.
- */
-export interface ServiceEntity extends BaseEntity {
-  [ENTITY_TYPE]: 'service';
-  [SERVICE_NAME]: string;
-  [SERVICE_ENVIRONMENT]?: string | string[] | null;
-  [AGENT_NAME]: string | string[] | null;
-}
-
-export interface HostEntity extends BaseEntity {
-  [ENTITY_TYPE]: 'host';
-  [HOST_NAME]: string;
-  [CLOUD_PROVIDER]: string | string[] | null;
-}
-
-export interface ContainerEntity extends BaseEntity {
-  [ENTITY_TYPE]: 'container';
-  [CONTAINER_ID]: string;
-  [CLOUD_PROVIDER]: string | string[] | null;
-}
-
-export type Entity = ServiceEntity | HostEntity | ContainerEntity;
-
 export type InventoryEntityLatest = z.infer<typeof entityLatestSchema> & {
   alertsCount?: number;
 };
diff --git a/x-pack/plugins/observability_solution/inventory/server/routes/entities/get_identify_fields.test.ts b/x-pack/plugins/observability_solution/inventory/server/routes/entities/get_identify_fields.test.ts
index ffd5ba9c6f85..62d77c08fd27 100644
--- a/x-pack/plugins/observability_solution/inventory/server/routes/entities/get_identify_fields.test.ts
+++ b/x-pack/plugins/observability_solution/inventory/server/routes/entities/get_identify_fields.test.ts
@@ -30,7 +30,7 @@ describe('getIdentityFields', () => {
   it('should return a Map with unique entity types and their respective identity fields', () => {
     const serviceEntity: Entity = {
       'agent.name': 'node',
-      'entity.identity_fields': ['service.name', 'service.environment'],
+      [ENTITY_IDENTITY_FIELDS]: ['service.name', 'service.environment'],
       'service.name': 'my-service',
       'entity.type': 'service',
       ...commonEntityFields,