[scout] cross-project-search support

src/platform/packages/private/kbn-mock-idp-utils/src/constants.ts

@@ -35,6 +35,7 @@ export const MOCK_IDP_UIAM_COSMOS_DB_URL =
 
 export const MOCK_IDP_UIAM_ORGANIZATION_ID = 'org1234567890';
 export const MOCK_IDP_UIAM_PROJECT_ID = 'abcdef12345678901234567890123456';
+export const MOCK_IDP_UIAM_PROJECT_ID2 = 'fedcba65432109876543210987654321';
 
 // Sometimes it is useful or required to point local UIAM service clients, or clients operating within the same Docker
 // network (i.e., Elasticsearch), to a different UIAM service URL. For example, http://host.docker.internal:8080 can be

src/platform/packages/private/kbn-mock-idp-utils/src/index.ts

@@ -36,6 +36,7 @@ export {
   MOCK_IDP_UIAM_ORG_ADMIN_API_KEY,
   MOCK_IDP_UIAM_ORGANIZATION_ID,
   MOCK_IDP_UIAM_PROJECT_ID,
+  MOCK_IDP_UIAM_PROJECT_ID2,
 } from './constants';
 
 export {

src/platform/packages/shared/kbn-es/index.ts

@@ -14,6 +14,9 @@ export {
   ELASTIC_SERVERLESS_SUPERUSER,
   ELASTIC_SERVERLESS_SUPERUSER_PASSWORD,
   SERVERLESS_NODES,
+  LINKED_CLUSTER_PORT_OFFSET,
+  getServerlessNodes,
+  getSharedServerlessParams,
   getDockerFileMountPath,
   verifyDockerInstalled,
   maybeCreateDockerNetwork,

src/platform/packages/shared/kbn-es/src/utils/docker.test.ts

@@ -33,6 +33,8 @@ import {
   teardownServerlessClusterSync,
   verifyDockerInstalled,
   getESp12Volume,
+  getServerlessNodes,
+  getSharedServerlessParams,
 } from './docker';
 import { ToolingLog, ToolingLogCollectingWriter } from '@kbn/tooling-log';
 import { CA_CERT_PATH, ES_P12_PATH } from '@kbn/dev-utils';
@@ -136,6 +138,59 @@ const volumeCmdTest = async (volumeCmd: string[]) => {
   expect((await Fsp.stat(serverlessObjectStorePath)).mode & 0o777).toBe(0o777);
 };
 
+describe('getServerlessNodes()', () => {
+  test('should return default node names and ports with no arguments', () => {
+    const nodes = getServerlessNodes();
+    expect(nodes).toHaveLength(3);
+    expect(nodes[0].name).toBe('es01');
+    expect(nodes[1].name).toBe('es02');
+    expect(nodes[2].name).toBe('es03');
+    expect(nodes[0].params).toEqual(expect.arrayContaining(['127.0.0.1:9300:9300']));
+    expect(nodes[1].params).toEqual(expect.arrayContaining(['127.0.0.1:9202:9202']));
+    expect(nodes[2].params).toEqual(expect.arrayContaining(['127.0.0.1:9203:9203']));
+  });
+
+  test('should apply name suffix and port offset for linked cluster', () => {
+    const nodes = getServerlessNodes('-linked', 10);
+    expect(nodes).toHaveLength(3);
+    expect(nodes[0].name).toBe('es01-linked');
+    expect(nodes[1].name).toBe('es02-linked');
+    expect(nodes[2].name).toBe('es03-linked');
+    expect(nodes[0].params).toEqual(expect.arrayContaining(['127.0.0.1:9310:9310']));
+    expect(nodes[1].params).toEqual(expect.arrayContaining(['127.0.0.1:9212:9212']));
+    expect(nodes[1].params).toEqual(expect.arrayContaining(['127.0.0.1:9312:9312']));
+    expect(nodes[2].params).toEqual(expect.arrayContaining(['127.0.0.1:9213:9213']));
+    expect(nodes[2].params).toEqual(expect.arrayContaining(['127.0.0.1:9313:9313']));
+  });
+
+  test('should configure discovery hosts with suffixed names', () => {
+    const nodes = getServerlessNodes('-linked', 10);
+    expect(nodes[0].params).toEqual(
+      expect.arrayContaining([`discovery.seed_hosts=es02-linked,es03-linked`])
+    );
+    expect(nodes[1].params).toEqual(
+      expect.arrayContaining([`discovery.seed_hosts=es01-linked,es03-linked`])
+    );
+    expect(nodes[2].params).toEqual(
+      expect.arrayContaining([`discovery.seed_hosts=es01-linked,es02-linked`])
+    );
+  });
+});
+
+describe('getSharedServerlessParams()', () => {
+  test('should return default master nodes with no arguments', () => {
+    const params = getSharedServerlessParams();
+    expect(params).toEqual(expect.arrayContaining(['cluster.initial_master_nodes=es01,es02,es03']));
+  });
+
+  test('should return suffixed master nodes for linked cluster', () => {
+    const params = getSharedServerlessParams('-linked');
+    expect(params).toEqual(
+      expect.arrayContaining(['cluster.initial_master_nodes=es01-linked,es02-linked,es03-linked'])
+    );
+  });
+});
+
 describe('resolveDockerImage()', () => {
   const defaultRepo = 'another/repo';
   const defaultImg = 'default/reg/repo:tag';
@@ -637,6 +692,37 @@ describe('resolveEsArgs()', () => {
     `);
   });
 
+  test('should use projectIdOverride when provided in UIAM mode', () => {
+    const overrideId = 'custom_project_id_123';
+    const esArgs = resolveEsArgs(
+      [],
+      {
+        ssl: true,
+        kibanaUrl: 'http://localhost:5601/',
+        projectType,
+        basePath: baseEsPath,
+        uiam: true,
+      },
+      overrideId
+    );
+
+    expect(findEnvValue(esArgs, 'serverless.project_id')).toBe(overrideId);
+    expect(findEnvValue(esArgs, 'serverless.organization_id')).toBeDefined();
+    expect(findEnvValue(esArgs, 'serverless.universal_iam_service.enabled')).toBe('true');
+  });
+
+  test('should use default project ID when no override is provided in UIAM mode', () => {
+    const esArgs = resolveEsArgs([], {
+      ssl: true,
+      kibanaUrl: 'http://localhost:5601/',
+      projectType,
+      basePath: baseEsPath,
+      uiam: true,
+    });
+
+    expect(findEnvValue(esArgs, 'serverless.project_id')).toBe('abcdef12345678901234567890123456');
+  });
+
   test('should append refresh interval override when ES_JAVA_OPTS is provided', () => {
     const esArgs = resolveEsArgs([], { esArgs: 'ES_JAVA_OPTS=-Xms1g -Xmx1g' });
 
@@ -831,13 +917,13 @@ describe('runServerlessCluster()', () => {
 
     // docker version (1)
     // docker ps (1)
-    // docker container rm (5 = 3 for ES nodes, 2 for UIAM containers)
+    // docker container rm (8 = 3 for ES nodes, 3 for linked ES nodes, 2 for UIAM containers)
     // docker network create (1)
     // docker pull (1)
     // docker inspect (1)
     // docker run (3)
     // docker logs (1)
-    expect(execa.mock.calls).toHaveLength(14);
+    expect(execa.mock.calls).toHaveLength(17);
 
     // UIAM containers should not be started when `--uiam` is not passed
     expect(runUiamContainerMock).not.toHaveBeenCalled();
@@ -855,13 +941,13 @@ describe('runServerlessCluster()', () => {
 
     // docker version (1)
     // docker ps (1)
-    // docker container rm (5 = 3 for ES nodes, 2 for UIAM containers)
+    // docker container rm (8 = 3 for ES nodes, 3 for linked ES nodes, 2 for UIAM containers)
     // docker network create (1)
     // docker pull (3 = 1 for ES nodes, 2 for UIAM containers)
     // docker inspect (2 = image info call for ES nodes is memoized in the previous test, 2 for UIAM containers)
     // docker run (3)
     // docker logs (1)
-    expect(execa.mock.calls).toHaveLength(17);
+    expect(execa.mock.calls).toHaveLength(20);
 
     expect(runUiamContainerMock).toHaveBeenCalledTimes(2);
     expect(runUiamContainerMock).toHaveBeenCalledWith(
@@ -1023,12 +1109,12 @@ describe('runDockerContainer()', () => {
     await expect(runDockerContainer(log, {})).resolves.toBeUndefined();
     // docker version (1)
     // docker ps (1)
-    // docker container rm (5 = 3 for ES nodes, 2 for UIAM containers)
+    // docker container rm (8 = 3 for ES nodes, 3 for linked ES nodes, 2 for UIAM containers)
     // docker network create (1)
     // docker pull (1)
     // docker inspect (1)
     // docker run (1)
-    expect(execa.mock.calls).toHaveLength(11);
+    expect(execa.mock.calls).toHaveLength(14);
   });
 });