Merge remote-tracking branch 'upstream/master' into 81738

Author: alexwizp

src/dev/build/tasks/patch_native_modules_task.ts

@@ -46,15 +46,30 @@ const packages: Package[] = [
     destinationPath: 'node_modules/re2/build/Release/re2.node',
     extractMethod: 'gunzip',
     archives: {
-      darwin: {
+      'darwin-x64': {
         url: 'https://github.com/uhop/node-re2/releases/download/1.15.4/darwin-x64-72.gz',
         sha256: '983106049bb86e21b7f823144b2b83e3f1408217401879b3cde0312c803512c9',
       },
-      linux: {
+      'linux-x64': {
         url: 'https://github.com/uhop/node-re2/releases/download/1.15.4/linux-x64-72.gz',
         sha256: '8b6692037f7b0df24dabc9c9b039038d1c3a3110f62121616b406c482169710a',
       },
-      win32: {
+
+      // ARM build is currently done manually as Github Actions used in upstream project
+      // do not natively support an ARM target.
+
+      // From a AWS Graviton instance:
+      // * checkout the node-re2 project,
+      // * install Node using the same minor used by Kibana
+      // * npm install, which will also create a build
+      // * gzip -c build/Release/re2.node > linux-arm64-72.gz
+      // * upload to kibana-ci-proxy-cache bucket
+      'linux-arm64': {
+        url:
+          'https://storage.googleapis.com/kibana-ci-proxy-cache/node-re2/uhop/node-re2/releases/download/1.15.4/linux-arm64-72.gz',
+        sha256: '5942353ec9cf46a39199818d474f7af137cfbb1bc5727047fe22f31f36602a7e',
+      },
+      'win32-x64': {
         url: 'https://github.com/uhop/node-re2/releases/download/1.15.4/win32-x64-72.gz',
         sha256: '0a6991e693577160c3e9a3f196bd2518368c52d920af331a1a183313e0175604',
       },
@@ -84,7 +99,7 @@ async function patchModule(
       `Can't patch ${pkg.name}'s native module, we were expecting version ${pkg.version} and found ${installedVersion}`
     );
   }
-  const platformName = platform.getName();
+  const platformName = platform.getNodeArch();
   const archive = pkg.archives[platformName];
   const archiveName = path.basename(archive.url);
   const downloadPath = config.resolveFromRepo(DOWNLOAD_DIRECTORY, pkg.name, archiveName);

x-pack/plugins/ml/common/types/capabilities.ts

@@ -123,7 +123,7 @@ export function getPluginPrivileges() {
       catalogue: [],
       savedObject: {
         all: [],
-        read: ['ml-job'],
+        read: [ML_SAVED_OBJECT_TYPE],
       },
       api: apmUserMlCapabilitiesKeys.map((k) => `ml:${k}`),
       ui: apmUserMlCapabilitiesKeys,

x-pack/plugins/ml/common/types/saved_objects.ts

@@ -27,3 +27,12 @@ export interface InitializeSavedObjectResponse {
   success: boolean;
   error?: any;
 }
+
+export interface DeleteJobCheckResponse {
+  [jobId: string]: DeleteJobPermission;
+}
+
+export interface DeleteJobPermission {
+  canDelete: boolean;
+  canUntag: boolean;
+}

x-pack/plugins/ml/server/lib/spaces_utils.ts

@@ -7,6 +7,7 @@
 import { Legacy } from 'kibana';
 import { KibanaRequest } from '../../../../../src/core/server';
 import { SpacesPluginStart } from '../../../spaces/server';
+import { PLUGIN_ID } from '../../common/constants/app';
 
 export type RequestFacade = KibanaRequest | Legacy.Request;
 
@@ -22,19 +23,34 @@ export function spacesUtilsProvider(
     const space = await (await getSpacesPlugin()).spacesService.getActiveSpace(
       request instanceof KibanaRequest ? request : KibanaRequest.from(request)
     );
-    return space.disabledFeatures.includes('ml') === false;
+    return space.disabledFeatures.includes(PLUGIN_ID) === false;
   }
 
-  async function getAllSpaces(): Promise<string[] | null> {
+  async function getAllSpaces() {
     if (getSpacesPlugin === undefined) {
       return null;
     }
     const client = (await getSpacesPlugin()).spacesService.createSpacesClient(
       request instanceof KibanaRequest ? request : KibanaRequest.from(request)
     );
-    const spaces = await client.getAll();
+    return await client.getAll();
+  }
+
+  async function getAllSpaceIds(): Promise<string[] | null> {
+    const spaces = await getAllSpaces();
+    if (spaces === null) {
+      return null;
+    }
     return spaces.map((s) => s.id);
   }
 
-  return { isMlEnabledInSpace, getAllSpaces };
+  async function getMlSpaceIds(): Promise<string[] | null> {
+    const spaces = await getAllSpaces();
+    if (spaces === null) {
+      return null;
+    }
+    return spaces.filter((s) => s.disabledFeatures.includes(PLUGIN_ID) === false).map((s) => s.id);
+  }
+
+  return { isMlEnabledInSpace, getAllSpaces, getAllSpaceIds, getMlSpaceIds };
 }

x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts

@@ -1095,7 +1095,9 @@ export class DataRecognizer {
           job.config.analysis_limits.model_memory_limit = modelMemoryLimit;
         }
       } catch (error) {
-        mlLog.warn(`Data recognizer could not estimate model memory limit ${error.body}`);
+        mlLog.warn(
+          `Data recognizer could not estimate model memory limit ${JSON.stringify(error.body)}`
+        );
       }
     }
 

x-pack/plugins/ml/server/plugin.ts

@@ -178,7 +178,10 @@ export class MlServerPlugin
     notificationRoutes(routeInit);
     resultsServiceRoutes(routeInit);
     jobValidationRoutes(routeInit, this.version);
-    savedObjectsRoutes(routeInit);
+    savedObjectsRoutes(routeInit, {
+      getSpaces,
+      resolveMlCapabilities,
+    });
     systemRoutes(routeInit, {
       getSpaces,
       cloud: plugins.cloud,

x-pack/plugins/ml/server/routes/apidoc.json

@@ -150,6 +150,7 @@
     "AssignJobsToSpaces",
     "RemoveJobsFromSpaces",
     "JobsSpaces",
+    "DeleteJobCheck",
 
     "TrainedModels",
     "GetTrainedModel",

x-pack/plugins/ml/server/routes/saved_objects.ts

@@ -5,14 +5,18 @@
  */
 
 import { wrapError } from '../client/error_wrapper';
-import { RouteInitialization } from '../types';
+import { RouteInitialization, SavedObjectsRouteDeps } from '../types';
 import { checksFactory, repairFactory } from '../saved_objects';
-import { jobsAndSpaces, repairJobObjects } from './schemas/saved_objects';
+import { jobsAndSpaces, repairJobObjects, jobTypeSchema } from './schemas/saved_objects';
+import { jobIdsSchema } from './schemas/job_service_schema';
 
 /**
  * Routes for job saved object management
  */
-export function savedObjectsRoutes({ router, routeGuard }: RouteInitialization) {
+export function savedObjectsRoutes(
+  { router, routeGuard }: RouteInitialization,
+  { getSpaces, resolveMlCapabilities }: SavedObjectsRouteDeps
+) {
   /**
    * @apiGroup JobSavedObjects
    *
@@ -220,4 +224,50 @@ export function savedObjectsRoutes({ router, routeGuard }: RouteInitialization)
       }
     })
   );
+
+  /**
+   * @apiGroup JobSavedObjects
+   *
+   * @api {get} /api/ml/saved_objects/delete_job_check Check whether user can delete a job
+   * @apiName DeleteJobCheck
+   * @apiDescription Check the user's ability to delete jobs. Returns whether they are able
+   *                 to fully delete the job and whether they are able to remove it from
+   *                 the current space.
+   *
+   * @apiSchema (body) jobIdsSchema (params) jobTypeSchema
+   *
+   */
+  router.post(
+    {
+      path: '/api/ml/saved_objects/can_delete_job/{jobType}',
+      validate: {
+        params: jobTypeSchema,
+        body: jobIdsSchema,
+      },
+      options: {
+        tags: ['access:ml:canGetJobs', 'access:ml:canGetDataFrameAnalytics'],
+      },
+    },
+    routeGuard.fullLicenseAPIGuard(async ({ request, response, jobSavedObjectService, client }) => {
+      try {
+        const { jobType } = request.params;
+        const { jobIds }: { jobIds: string[] } = request.body;
+
+        const { canDeleteJobs } = checksFactory(client, jobSavedObjectService);
+        const body = await canDeleteJobs(
+          request,
+          jobType,
+          jobIds,
+          getSpaces !== undefined,
+          resolveMlCapabilities
+        );
+
+        return response.ok({
+          body,
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
 }

x-pack/plugins/ml/server/routes/schemas/saved_objects.ts

@@ -13,3 +13,7 @@ export const jobsAndSpaces = schema.object({
 });
 
 export const repairJobObjects = schema.object({ simulate: schema.maybe(schema.boolean()) });
+
+export const jobTypeSchema = schema.object({
+  jobType: schema.string(),
+});

x-pack/plugins/ml/server/saved_objects/authorization.ts

@@ -6,6 +6,7 @@
 
 import { KibanaRequest } from 'kibana/server';
 import type { SecurityPluginSetup } from '../../../security/server';
+import { ML_SAVED_OBJECT_TYPE } from '../../common/types/saved_objects';
 
 export function authorizationProvider(authorization: SecurityPluginSetup['authz']) {
   async function authorizationCheck(request: KibanaRequest) {
@@ -18,7 +19,7 @@ export function authorizationProvider(authorization: SecurityPluginSetup['authz'
       request
     );
     const createMLJobAuthorizationAction = authorization.actions.savedObject.get(
-      'ml-job',
+      ML_SAVED_OBJECT_TYPE,
       'create'
     );
     const canCreateGlobally = (