Revert "Add mock identity provider for serverless (elastic#170852)"

This reverts commit 1fb0313.

.github/CODEOWNERS

@@ -534,7 +534,6 @@ x-pack/packages/ml/runtime_field_utils @elastic/ml-ui
 x-pack/packages/ml/string_hash @elastic/ml-ui
 x-pack/packages/ml/trained_models_utils @elastic/ml-ui
 x-pack/packages/ml/url_state @elastic/ml-ui
-packages/kbn-mock-idp-plugin @elastic/kibana-security
 packages/kbn-monaco @elastic/appex-sharedux
 x-pack/plugins/monitoring_collection @elastic/obs-ux-infra_services-team
 x-pack/plugins/monitoring @elastic/obs-ux-infra_services-team

package.json

@@ -1233,7 +1233,6 @@
     "@kbn/managed-vscode-config": "link:packages/kbn-managed-vscode-config",
     "@kbn/managed-vscode-config-cli": "link:packages/kbn-managed-vscode-config-cli",
     "@kbn/management-storybook-config": "link:packages/kbn-management/storybook/config",
-    "@kbn/mock-idp-plugin": "link:packages/kbn-mock-idp-plugin",
     "@kbn/openapi-generator": "link:packages/kbn-openapi-generator",
     "@kbn/optimizer": "link:packages/kbn-optimizer",
     "@kbn/optimizer-webpack-helpers": "link:packages/kbn-optimizer-webpack-helpers",

packages/kbn-es/src/cli_commands/serverless.ts

@@ -38,7 +38,6 @@ export const serverless: Command = {
       --host              Publish ES docker container on additional host IP
       --port              The port to bind to on 127.0.0.1 [default: ${DEFAULT_PORT}]
       --ssl               Enable HTTP SSL on the ES cluster
-      --kibanaUrl         Fully qualified URL where Kibana is hosted (including base path). [default: https://localhost:5601/]
       --skipTeardown      If this process exits, leave the ES cluster running in the background
       --waitForReady      Wait for the ES cluster to be ready to serve requests
       --resources         Overrides resources under ES 'config/' directory, which are by default
@@ -74,7 +73,7 @@ export const serverless: Command = {
         files: 'F',
       },
 
-      string: ['tag', 'image', 'basePath', 'resources', 'host', 'kibanaUrl'],
+      string: ['tag', 'image', 'basePath', 'resources', 'host'],
       boolean: ['clean', 'ssl', 'kill', 'background', 'skipTeardown', 'waitForReady'],
 
       default: defaults,

packages/kbn-es/src/paths.ts

@@ -8,7 +8,6 @@
 
 import Os from 'os';
 import { resolve } from 'path';
-import { REPO_ROOT } from '@kbn/repo-info';
 
 function maybeUseBat(bin: string) {
   return Os.platform().startsWith('win') ? `${bin}.bat` : bin;
@@ -52,8 +51,6 @@ export const SERVERLESS_SECRETS_SSL_PATH = resolve(
 
 export const SERVERLESS_JWKS_PATH = resolve(__dirname, './serverless_resources/jwks.json');
 
-export const SERVERLESS_IDP_METADATA_PATH = resolve(REPO_ROOT, '.es', 'idp_metadata.xml');
-
 export const SERVERLESS_RESOURCES_PATHS = [
   SERVERLESS_OPERATOR_USERS_PATH,
   SERVERLESS_ROLE_MAPPING_PATH,

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

@@ -32,17 +32,15 @@ import {
   ServerlessOptions,
 } from './docker';
 import { ToolingLog, ToolingLogCollectingWriter } from '@kbn/tooling-log';
-import { CA_CERT_PATH, ES_P12_PATH } from '@kbn/dev-utils';
+import { ES_P12_PATH } from '@kbn/dev-utils';
 import {
   SERVERLESS_CONFIG_PATH,
   SERVERLESS_RESOURCES_PATHS,
   SERVERLESS_SECRETS_PATH,
   SERVERLESS_JWKS_PATH,
-  SERVERLESS_IDP_METADATA_PATH,
 } from '../paths';
 import * as waitClusterUtil from './wait_until_cluster_ready';
 import * as waitForSecurityIndexUtil from './wait_for_security_index';
-import * as mockIdpPluginUtil from '@kbn/mock-idp-plugin/common';
 
 jest.mock('execa');
 const execa = jest.requireMock('execa');
@@ -60,8 +58,6 @@ jest.mock('./wait_for_security_index', () => ({
   waitForSecurityIndex: jest.fn(),
 }));
 
-jest.mock('@kbn/mock-idp-plugin/common');
-
 const log = new ToolingLog();
 const logWriter = new ToolingLogCollectingWriter();
 log.setWriters([logWriter]);
@@ -73,8 +69,6 @@ const serverlessObjectStorePath = `${baseEsPath}/${serverlessDir}`;
 
 const waitUntilClusterReadyMock = jest.spyOn(waitClusterUtil, 'waitUntilClusterReady');
 const waitForSecurityIndexMock = jest.spyOn(waitForSecurityIndexUtil, 'waitForSecurityIndex');
-const ensureSAMLRoleMappingMock = jest.spyOn(mockIdpPluginUtil, 'ensureSAMLRoleMapping');
-const createMockIdpMetadataMock = jest.spyOn(mockIdpPluginUtil, 'createMockIdpMetadata');
 
 beforeEach(() => {
   jest.resetAllMocks();
@@ -429,66 +423,6 @@ describe('resolveEsArgs()', () => {
       ]
     `);
   });
-
-  test('should add SAML realm args when kibanaUrl and SSL are passed', () => {
-    const esArgs = resolveEsArgs([], {
-      ssl: true,
-      kibanaUrl: 'https://localhost:5601/',
-    });
-
-    expect(esArgs).toHaveLength(26);
-    expect(esArgs).toMatchInlineSnapshot(`
-      Array [
-        "--env",
-        "xpack.security.http.ssl.enabled=true",
-        "--env",
-        "xpack.security.http.ssl.keystore.path=/usr/share/elasticsearch/config/certs/elasticsearch.p12",
-        "--env",
-        "xpack.security.http.ssl.verification_mode=certificate",
-        "--env",
-        "xpack.security.authc.realms.saml.mock-idp.order=0",
-        "--env",
-        "xpack.security.authc.realms.saml.mock-idp.idp.metadata.path=/usr/share/elasticsearch/config/secrets/idp_metadata.xml",
-        "--env",
-        "xpack.security.authc.realms.saml.mock-idp.idp.entity_id=urn:mock-idp",
-        "--env",
-        "xpack.security.authc.realms.saml.mock-idp.sp.entity_id=https://localhost:5601",
-        "--env",
-        "xpack.security.authc.realms.saml.mock-idp.sp.acs=https://localhost:5601/api/security/saml/callback",
-        "--env",
-        "xpack.security.authc.realms.saml.mock-idp.sp.logout=https://localhost:5601/logout",
-        "--env",
-        "xpack.security.authc.realms.saml.mock-idp.attributes.principal=http://saml.elastic-cloud.com/attributes/principal",
-        "--env",
-        "xpack.security.authc.realms.saml.mock-idp.attributes.groups=http://saml.elastic-cloud.com/attributes/roles",
-        "--env",
-        "xpack.security.authc.realms.saml.mock-idp.attributes.name=http://saml.elastic-cloud.com/attributes/email",
-        "--env",
-        "xpack.security.authc.realms.saml.mock-idp.attributes.mail=http://saml.elastic-cloud.com/attributes/name",
-      ]
-    `);
-  });
-
-  test('should not add SAML realm args when security is disabled', () => {
-    const esArgs = resolveEsArgs([['xpack.security.enabled', 'false']], {
-      ssl: true,
-      kibanaUrl: 'https://localhost:5601/',
-    });
-
-    expect(esArgs).toHaveLength(8);
-    expect(esArgs).toMatchInlineSnapshot(`
-      Array [
-        "--env",
-        "xpack.security.enabled=false",
-        "--env",
-        "xpack.security.http.ssl.enabled=true",
-        "--env",
-        "xpack.security.http.ssl.keystore.path=/usr/share/elasticsearch/config/certs/elasticsearch.p12",
-        "--env",
-        "xpack.security.http.ssl.verification_mode=certificate",
-      ]
-    `);
-  });
 });
 
 describe('setupServerlessVolumes()', () => {
@@ -529,29 +463,21 @@ describe('setupServerlessVolumes()', () => {
     expect(existsSync(`${serverlessObjectStorePath}/cluster_state/lease`)).toBe(false);
   });
 
-  test('should add SSL and IDP metadata volumes when ssl and kibanaUrl are passed', async () => {
+  test('should add SSL volumes when ssl is passed', async () => {
     mockFs(existingObjectStore);
-    createMockIdpMetadataMock.mockResolvedValue('<xml/>');
 
-    const volumeCmd = await setupServerlessVolumes(log, {
-      basePath: baseEsPath,
-      ssl: true,
-      kibanaUrl: 'https://localhost:5603/',
-    });
-
-    expect(createMockIdpMetadataMock).toHaveBeenCalledTimes(1);
-    expect(createMockIdpMetadataMock).toHaveBeenCalledWith('https://localhost:5603/');
+    const volumeCmd = await setupServerlessVolumes(log, { basePath: baseEsPath, ssl: true });
 
     const requiredPaths = [
       `${baseEsPath}:/objectstore:z`,
-      SERVERLESS_IDP_METADATA_PATH,
       ES_P12_PATH,
       ...SERVERLESS_RESOURCES_PATHS,
     ];
     const pathsNotIncludedInCmd = requiredPaths.filter(
       (path) => !volumeCmd.some((cmd) => cmd.includes(path))
     );
-    expect(volumeCmd).toHaveLength(22);
+
+    expect(volumeCmd).toHaveLength(20);
     expect(pathsNotIncludedInCmd).toEqual([]);
   });
 
@@ -617,7 +543,6 @@ describe('runServerlessEsNode()', () => {
 
 describe('runServerlessCluster()', () => {
   test('should start 3 serverless nodes', async () => {
-    waitUntilClusterReadyMock.mockResolvedValue();
     mockFs({
       [baseEsPath]: {},
     });
@@ -642,27 +567,7 @@ describe('runServerlessCluster()', () => {
     expect(waitUntilClusterReadyMock.mock.calls[0][0].readyTimeout).toEqual(undefined);
   });
 
-  test(`should create SAML role mapping when ssl and kibanaUrl are passed`, async () => {
-    waitUntilClusterReadyMock.mockResolvedValue();
-    mockFs({
-      [CA_CERT_PATH]: '',
-      [baseEsPath]: {},
-    });
-    execa.mockImplementation(() => Promise.resolve({ stdout: '' }));
-    createMockIdpMetadataMock.mockResolvedValue('<xml/>');
-
-    await runServerlessCluster(log, {
-      basePath: baseEsPath,
-      waitForReady: true,
-      ssl: true,
-      kibanaUrl: 'https://localhost:5601/',
-    });
-
-    expect(ensureSAMLRoleMappingMock).toHaveBeenCalledTimes(1);
-  });
-
   test(`should wait for the security index`, async () => {
-    waitUntilClusterReadyMock.mockResolvedValue();
     waitForSecurityIndexMock.mockResolvedValue();
     mockFs({
       [baseEsPath]: {},
@@ -675,7 +580,6 @@ describe('runServerlessCluster()', () => {
   });
 
   test(`should not wait for the security index when security is disabled`, async () => {
-    waitUntilClusterReadyMock.mockResolvedValue();
     mockFs({
       [baseEsPath]: {},
     });