Merge branch '9.0' into backport/9.0/pr-236506

Author: baileycash-elastic

.github/CODEOWNERS

@@ -1005,6 +1005,7 @@ x-pack/solutions/security/packages/navigation @elastic/security-threat-hunting-i
 x-pack/solutions/security/packages/security-ai-prompts @elastic/security-generative-ai
 x-pack/solutions/security/packages/side-nav @elastic/security-threat-hunting-investigations
 x-pack/solutions/security/packages/storybook/config @elastic/security-threat-hunting-investigations
+x-pack/solutions/security/packages/test-api-clients @elastic/security-detection-rule-management
 x-pack/solutions/security/packages/upselling @elastic/security-threat-hunting-investigations
 x-pack/solutions/security/plugins/cloud_defend @elastic/kibana-cloud-security-posture
 x-pack/solutions/security/plugins/cloud_security_posture @elastic/kibana-cloud-security-posture

kbn_pm/src/commands/build_shared_packages.mjs

@@ -9,7 +9,7 @@
 
 import { run } from '../lib/spawn.mjs';
 
-/** @type {import("../lib/command").Command} */
+/** @type {import('../lib/command').Command} */
 export const command = {
   name: 'build-shared',
   intro: 'Builds shared packages with webpack',
@@ -35,6 +35,10 @@ export const command = {
       [':build-webpack'].concat(!cache ? ['-u'] : []).concat(dist ? ['--', '--dist'] : []),
       {
         pipe: !quiet,
+        env: {
+          ...process.env,
+          ...(!cache ? { MOON_CACHE: 'off' } : {}),
+        },
       }
     );
 

kbn_pm/src/commands/clean_command.mjs

@@ -9,7 +9,7 @@
 
 import { dedent } from '../lib/indent.mjs';
 import { cleanPaths } from '../lib/clean.mjs';
-import { findPluginCleanPaths } from '../lib/find_clean_paths.mjs';
+import { collectBazelPaths, findPluginCleanPaths } from '../lib/find_clean_paths.mjs';
 import Path from 'path';
 import { REPO_ROOT } from '../lib/paths.mjs';
 
@@ -37,6 +37,8 @@ export const command = {
 
     await cleanPaths(log, [
       ...(await findPluginCleanPaths(log)),
+      ...collectBazelPaths(),
+      Path.resolve(REPO_ROOT, '.moon', 'cache'),
       Path.resolve(REPO_ROOT, '.es', 'cache'),
     ]);
   },

package.json

@@ -127,13 +127,13 @@
     "@elastic/node-crypto": "^1.2.3",
     "@elastic/numeral": "^2.5.1",
     "@elastic/opentelemetry-node": "^1.1.1",
-    "@elastic/react-search-ui": "^1.20.2",
-    "@elastic/react-search-ui-views": "^1.20.2",
+    "@elastic/react-search-ui": "^1.24.2",
+    "@elastic/react-search-ui-views": "^1.24.2",
     "@elastic/request-converter": "^9.0.1",
     "@elastic/request-crypto": "^2.0.3",
-    "@elastic/search-ui": "^1.20.2",
-    "@elastic/search-ui-app-search-connector": "^1.20.2",
-    "@elastic/search-ui-engines-connector": "^1.20.2",
+    "@elastic/search-ui": "^1.24.2",
+    "@elastic/search-ui-app-search-connector": "^1.24.1",
+    "@elastic/search-ui-engines-connector": "^1.24.2",
     "@emotion/cache": "^11.11.0",
     "@emotion/css": "^11.11.0",
     "@emotion/react": "^11.11.0",
@@ -845,6 +845,7 @@
     "@kbn/security-solution-serverless": "link:x-pack/solutions/security/plugins/security_solution_serverless",
     "@kbn/security-solution-side-nav": "link:x-pack/solutions/security/packages/side-nav",
     "@kbn/security-solution-storybook-config": "link:x-pack/solutions/security/packages/storybook/config",
+    "@kbn/security-solution-test-api-clients": "link:x-pack/solutions/security/packages/test-api-clients",
     "@kbn/security-solution-upselling": "link:x-pack/solutions/security/packages/upselling",
     "@kbn/security-test-endpoints-plugin": "link:x-pack/test/security_functional/plugins/test_endpoints",
     "@kbn/security-ui-components": "link:x-pack/platform/packages/private/security/ui_components",

src/dev/build/tasks/build_packages_task.ts

@@ -109,6 +109,7 @@ export const BuildPackages: Task = {
     await buildWebpackBundles({
       quiet: false,
       dist: true,
+      noCache: true,
     });
 
     const transformConfig: TransformConfig = {
@@ -307,8 +308,20 @@ export const BuildPackages: Task = {
   },
 };
 
-export async function buildWebpackBundles({ quiet, dist }: { quiet: boolean; dist: boolean }) {
-  const options = [quiet ? ['--quiet'] : [], dist ? ['--dist'] : []].flat();
+export async function buildWebpackBundles({
+  quiet,
+  dist,
+  noCache,
+}: {
+  quiet: boolean;
+  dist: boolean;
+  noCache?: boolean;
+}) {
+  const options = [
+    quiet ? ['--quiet'] : [],
+    dist ? ['--dist'] : [],
+    noCache ? ['--no-cache'] : [],
+  ].flat();
   const stdio: StdioOption[] = quiet
     ? ['ignore', 'pipe', 'pipe']
     : ['inherit', 'inherit', 'inherit'];

src/platform/packages/shared/kbn-openapi-generator/src/template_service/templates/api_client_supertest.handlebars

@@ -9,18 +9,18 @@
 
 import { ELASTIC_HTTP_VERSION_HEADER, X_ELASTIC_INTERNAL_ORIGIN_REQUEST } from '@kbn/core-http-common';
 import { replaceParams } from '@kbn/openapi-common/shared';
-import { FtrProviderContext } from 'x-pack/test/api_integration/ftr_provider_context';
-
-import { routeWithNamespace } from 'x-pack/test/common/utils/security_solution';
 
 {{#each operations}}
-import { 
+import type {
   {{operationId}}RequestQueryInput,
   {{operationId}}RequestParamsInput,
   {{operationId}}RequestBodyInput
 } from '{{replace sourcePath 'schema.yaml' 'gen'}}';
 {{/each}}
 
+import type { FtrProviderContext } from '@kbn/ftr-common-functional-services';
+import { getRouteUrlForSpace } from '@kbn/spaces-plugin/common';
+
 export function SecuritySolutionApiProvider({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
@@ -33,14 +33,14 @@ export function SecuritySolutionApiProvider({ getService }: FtrProviderContext)
     {{/if}}
     {{camelCase operationId}}({{#if (or requestQuery requestParams requestBody)}}props: {{operationId}}Props, {{/if}}kibanaSpace: string = 'default') {
       return supertest
-        .{{method}}(routeWithNamespace({{#if requestParams}}replaceParams('{{path}}', props.params){{else}}'{{path}}'{{/if}}, kibanaSpace))
+        .{{method}}(getRouteUrlForSpace({{#if requestParams}}replaceParams('{{path}}', props.params){{else}}'{{path}}'{{/if}}, kibanaSpace))
         .set('kbn-xsrf', 'true')
         .set(ELASTIC_HTTP_VERSION_HEADER, '{{version}}')
         .set(X_ELASTIC_INTERNAL_ORIGIN_REQUEST, 'kibana')
         {{~#if requestBody}}.send(props.body as object){{/if}}
         {{~#if requestQuery}}.query(props.query){{/if}}
       },
-  {{/each}} 
+  {{/each}}
   }
 }
 

tsconfig.base.json

@@ -1676,6 +1676,8 @@
       "@kbn/security-solution-side-nav/*": ["x-pack/solutions/security/packages/side-nav/*"],
       "@kbn/security-solution-storybook-config": ["x-pack/solutions/security/packages/storybook/config"],
       "@kbn/security-solution-storybook-config/*": ["x-pack/solutions/security/packages/storybook/config/*"],
+      "@kbn/security-solution-test-api-clients": ["x-pack/solutions/security/packages/test-api-clients"],
+      "@kbn/security-solution-test-api-clients/*": ["x-pack/solutions/security/packages/test-api-clients/*"],
       "@kbn/security-solution-upselling": ["x-pack/solutions/security/packages/upselling"],
       "@kbn/security-solution-upselling/*": ["x-pack/solutions/security/packages/upselling/*"],
       "@kbn/security-test-endpoints-plugin": ["x-pack/test/security_functional/plugins/test_endpoints"],

x-pack/platform/plugins/shared/osquery/scripts/openapi/generate.js

@@ -32,7 +32,7 @@ const OSQUERY_ROOT = resolve(__dirname, '../..');
     bundle: {
       outFile: join(
         REPO_ROOT,
-        'x-pack/test/api_integration/services/security_solution_osquery_api.gen.ts'
+        'x-pack/solutions/security/packages/test-api-clients/supertest/osquery.gen.ts'
       ),
     },
   });

x-pack/platform/plugins/shared/spaces/common/get_spaced_route_url.ts

@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+/**
+ * Wraps the provided Kibana route URL with the Kibana space ID.
+ * "default" space is equivalent to an empty value and doesn't lead to adding any space aware path.
+ *
+ * @param routeUrl the route url string
+ * @param spaceId [optional] the Kibana space to account for in the route url
+ *
+ * Examples:
+ * - `getRouteUrlForSpace('/api/some_endpoint')` returns `/api/some_endpoint`
+ * - `getRouteUrlForSpace('/api/some_endpoint', 'default')` returns `/api/some_endpoint`
+ * - `getRouteUrlForSpace('/api/some_endpoint', 'my_space') returns `/s/my_space/api/some_endpoint`
+ */
+export function getRouteUrlForSpace(routeUrl: string, spaceId?: string): string {
+  return spaceId ? `/s/${spaceId}${routeUrl}` : routeUrl;
+}

x-pack/platform/plugins/shared/spaces/common/index.ts

@@ -13,6 +13,7 @@ export {
   DEFAULT_SPACE_ID,
   API_VERSIONS,
 } from './constants';
+export { getRouteUrlForSpace } from './get_spaced_route_url';
 export { addSpaceIdToPath, getSpaceIdFromPath } from './lib/spaces_url_parser';
 export type {
   Space,