Fix integration tests for find-monitored-entity

- Use findMonitoredEntitiesByName (the old findMonitoredEntityByName no longer exists)
- Result is no longer a string, but a DqlExecutionResult
- Fix when no entities provided (throw exception)
- Removed test for empty string (instead have test for empty list of entities)

Author: aledsage

integration-tests/find-monitored-entity-by-name.integration.test.ts

@@ -7,8 +7,9 @@
 
 import { config } from 'dotenv';
 import { createDtHttpClient } from '../src/authentication/dynatrace-clients';
-import { findMonitoredEntityByName } from '../src/capabilities/find-monitored-entity-by-name';
+import { findMonitoredEntitiesByName } from '../src/capabilities/find-monitored-entity-by-name';
 import { getDynatraceEnv, DynatraceEnv } from '../src/getDynatraceEnv';
+import { getEntityTypeFromId } from '../src/utils/dynatrace-entity-types';
 
 // Load environment variables
 config();
@@ -60,27 +61,25 @@ describe('Find Monitored Entity by Name Integration Tests', () => {
 
     // Search for an entity name that is very unlikely to exist
     const searchTerm = 'this-entity-definitely-does-not-exist-12345';
+    const extendedSearch = false;
 
-    const response = await findMonitoredEntityByName(dtClient, searchTerm);
+    const response = await findMonitoredEntitiesByName(dtClient, [searchTerm], extendedSearch);
 
     expect(response).toBeDefined();
-    expect(typeof response).toBe('string');
-    expect(response).toBe('No monitored entity found with the specified name.');
+    expect(response?.records).toBeDefined();
+    expect(response?.records?.length).toEqual(0);
   }, 30_000); // Increased timeout for API calls
 
-  test('should handle search with empty string', async () => {
+  test('should handle search with empty list', async () => {
     const dtClient = await createHttpClient();
 
     // Test with empty string
-    const searchTerm = '';
+    const searchTerms = [] as string[];
+    const extendedSearch = false;
 
-    const response = await findMonitoredEntityByName(dtClient, searchTerm);
-
-    expect(response).toBeDefined();
-    expect(typeof response).toBe('string');
-
-    // Should handle gracefully - likely will return many results or handle empty search
-    expect(response).toContain('You need to provide an entity name to search for');
+    await expect(findMonitoredEntitiesByName(dtClient, searchTerms, extendedSearch)).rejects.toThrow(
+      /No entity names supplied to search for/,
+    );
   });
 
   test('should return properly formatted response when entities are found', async () => {
@@ -89,20 +88,19 @@ describe('Find Monitored Entity by Name Integration Tests', () => {
     // Search for a pattern that is likely to find at least one entity
     // "host" is common in most Dynatrace environments
     const searchTerm = 'host';
+    const extendedSearch = false;
 
-    const response = await findMonitoredEntityByName(dtClient, searchTerm);
+    const response = await findMonitoredEntitiesByName(dtClient, [searchTerm], extendedSearch);
 
+    // Assert, based on the DqlExecutionResult
     expect(response).toBeDefined();
-    expect(typeof response).toBe('string');
-
-    // If entities are found, check the format
-    if (response.includes('The following monitored entities were found:')) {
-      // Each line should follow the expected format
-      const lines = response.split('\n').filter((line) => line.startsWith('- Entity'));
-
-      lines.forEach((line) => {
-        expect(line).toMatch(/^- Entity '.*' of type '.* has entity id '.*'$/);
+    if (response?.records && response.records.length > 0) {
+      response.records.forEach((entity) => {
+        expect(entity?.id).toBeDefined();
+        expect(getEntityTypeFromId(String(entity?.id))).toBeDefined();
       });
+    } else {
+      // Nothing to assert; environment for testing has no entities found.
     }
   });
 });

src/capabilities/find-monitored-entity-by-name.ts

@@ -13,6 +13,10 @@ import {
  * @returns DQL Statement for searching all entity types
  */
 export const generateDqlSearchEntityCommand = (entityNames: string[], extendedSearch: boolean): string => {
+  if (entityNames == undefined || entityNames.length == 0) {
+    throw new Error(`No entity names supplied to search for`);
+  }
+
   // If extendedSearch is true, use all entity types, otherwise use only basic ones
   const fetchDqlCommands = (extendedSearch ? DYNATRACE_ENTITY_TYPES_ALL : DYNATRACE_ENTITY_TYPES_BASICS).map(
     (entityType, index) => {