Fix misc issues found with java-client+recordings (#1945) (#1949)

Co-authored-by: Sylvain Wallez <[email protected]>

Author: github-actions[bot]

output/schema/schema.json

@@ -18,15 +18,16 @@
  */
 
 import { Field, Fields, Indices, Name } from '@_types/common'
+import { SingleKeyDictionary } from '@spec_utils/Dictionary'
 
 export class Summary {
-  config: Configuration
+  config: SingleKeyDictionary<PolicyType, Policy>
 }
 
-export class Configuration {
-  geo_match?: Policy
-  match: Policy
-  range: Policy
+export enum PolicyType {
+  geo_match,
+  match,
+  range
 }
 
 export class Policy {
@@ -35,4 +36,5 @@ export class Policy {
   match_field: Field
   query?: string
   name?: Name
+  elasticsearch_version?: string
 }

output/typescript/types.ts

@@ -20,8 +20,10 @@
 import { Dictionary } from '@spec_utils/Dictionary'
 import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 import { ActionStatusOptions } from '@watcher/_types/Action'
-import { Id, IndexName, Name } from '@_types/common'
+import { Id, IndexName, Name, VersionNumber, VersionType } from '@_types/common'
 import { DateTime } from '@_types/Time'
+import { AdditionalProperties } from '@spec_utils/behaviors'
+import { Stringified } from '@spec_utils/Stringified'
 
 export class Ingest {
   timestamp: DateTime
@@ -42,11 +44,17 @@ export class Document {
   _source: UserDefinedValue
 }
 
-export class DocumentSimulation {
+/**
+ * The simulated document, with optional metadata.
+ */
+export class DocumentSimulation
+  implements AdditionalProperties<string, string>
+{
   _id: Id
   _index: IndexName
   _ingest: Ingest
-  _parent?: string
   _routing?: string
   _source: Dictionary<string, UserDefinedValue>
+  _version?: Stringified<VersionNumber>
+  _version_type?: VersionType
 }

specification/enrich/_types/Policy.ts

@@ -39,6 +39,6 @@ export interface Request extends RequestBase {
     /**
      * A sequence of one or more JSON documents containing the license information.
      */
-    licenses: Array<License>
+    licenses?: Array<License>
   }
 }

specification/ingest/simulate/types.ts

@@ -24,6 +24,7 @@ export class CertificateInformation {
   expiry: DateTime
   format: string
   has_private_key: boolean
+  issuer?: string
   path: string
   serial_number: string
   subject_dn: string

specification/license/post/PostLicenseRequest.ts

@@ -130,6 +130,16 @@ export class Settings {
    * @server_default 500
    */
   max_page_search_size?: integer
+
+  /**
+   * If `true`, the transform runs in unattended mode. In unattended mode, the transform retries indefinitely in case
+   * of an error which means the transform never fails. Setting the number of retries other than infinite fails in
+   * validation.
+   *
+   * @since 8.5.0
+   * @server_default false
+   */
+  unattended?: boolean
 }
 
 export class Source {

specification/ssl/certificates/types.ts

@@ -25,6 +25,7 @@ import { Job, JobStatistics } from '@ml/_types/Job'
 import { double, integer, long, uint, ulong } from '@_types/Numeric'
 import { AdditionalProperties } from '@spec_utils/behaviors'
 import { Duration, DurationValue, UnitMillis } from '@_types/Time'
+import { UserDefinedValue } from '@spec_utils/UserDefinedValue'
 
 export class Base {
   available: boolean
@@ -230,6 +231,7 @@ export class MlInferenceTrainedModelsCount {
   total: long
   prepackaged: long
   other: long
+  pass_through?: long
   regression?: long
   classification?: long
   ner?: long
@@ -341,27 +343,18 @@ export class FrozenIndices extends Base {
   indices_count: long
 }
 
-export class AllJobs {
+export class JobUsage {
   count: integer
-  detectors: Dictionary<string, integer>
-  created_by: Dictionary<string, string | integer>
-  model_size: Dictionary<string, integer>
-  forecasts: Dictionary<string, integer>
-}
-
-// The 'jobs' entry in MachineLearning can either contain a dictionary of
-// individual jobs or a single summary entry under the key '_all'.
-// The layout of the summary varies from that of the individual job,
-// and is specified in the 'AllJobs' class (defined above).
-export class Jobs implements AdditionalProperties<string, Job> {
-  _all?: AllJobs
+  created_by: Dictionary<string, long>
+  detectors: JobStatistics
+  forecasts: MlJobForecasts
+  model_size: JobStatistics
 }
 
 export class MachineLearning extends Base {
   datafeeds: Dictionary<string, Datafeed>
-  // TODO: xPack marks the entire Job definition as optional
-  //       while the MlJob has many required properties.
-  jobs: Jobs
+  /** Job usage statistics. The `_all` entry is always present and gathers statistics for all jobs. */
+  jobs: Dictionary<string, JobUsage>
   node_count: integer
   data_frame_analytics_jobs: MlDataFrameAnalyticsJobs
   inference: MlInference