Merge remote-tracking branch 'origin/main' into google-model-garden-integration

Author: Jan-Kazlouski-elastic

compiler/src/compiler.ts

@@ -21,7 +21,11 @@ import { writeFile, mkdir } from 'fs/promises'
 import { join } from 'path'
 import stringify from 'safe-stable-stringify'
 import { Model } from './model/metamodel'
-import { compileEndpoints, compileSpecification } from './model/build-model'
+import {
+  compileEndpoints,
+  compileSpecification,
+  reAddAvailability
+} from './model/build-model'
 import buildJsonSpec, { JsonSpec } from './model/json-spec'
 import { ValidationErrors } from './validation-errors'
 
@@ -54,6 +58,7 @@ export default class Compiler {
     this.jsonSpec = buildJsonSpec()
     const endpoints = compileEndpoints()
     this.model = compileSpecification(endpoints, this.specsFolder, this.outputFolder)
+    this.model = reAddAvailability(this.model) // resync availability information based on json spec if typescript has none.
     return this
   }
 

compiler/src/model/build-model.ts

@@ -58,6 +58,24 @@ import {
 
 const jsonSpec = buildJsonSpec()
 
+export function reAddAvailability (model: model.Model): model.Model {
+  for (const [api, spec] of jsonSpec.entries()) {
+    for (const endpoint of model.endpoints) {
+      if (endpoint.name === api) {
+        if ((spec.stability != null || spec.visibility != null) && (endpoint.availability.stack === undefined && endpoint.availability.serverless === undefined)) {
+          endpoint.availability = {
+            stack: {
+              stability: spec.stability,
+              visibility: spec.visibility
+            }
+          }
+        }
+      }
+    }
+  }
+  return model
+}
+
 export function compileEndpoints (): Record<string, model.Endpoint> {
   // Create endpoints and merge them with
   // the recorded mappings if present.
@@ -72,12 +90,7 @@ export function compileEndpoints (): Record<string, model.Endpoint> {
       // Setting these values by default should be removed
       // when we no longer use rest-api-spec stubs as the
       // source of truth for stability/visibility.
-      availability: {
-        stack: {
-          stability: spec.stability,
-          visibility: spec.visibility
-        }
-      },
+      availability: {},
       request: null,
       requestBodyRequired: Boolean(spec.body?.required),
       response: null,
@@ -89,8 +102,15 @@ export function compileEndpoints (): Record<string, model.Endpoint> {
         }
       })
     }
+
+    // temporary workaround for APIs that are serverless-only
+    // until we can stop depending on rest-api-spec for availability
+    if (api === 'project.tags') {
+      delete map[api].availability.stack
+    }
+
     if (typeof spec.feature_flag === 'string') {
-      map[api].availability.stack.featureFlag = spec.feature_flag
+      map[api].availability.stack = { featureFlag: spec.feature_flag }
     }
   }
   return map

docs/overlays/elasticsearch-shared-overlays.yaml

@@ -1152,3 +1152,11 @@ actions:
   - target: "$.components['schemas']['cat._types.CatTransformColumn'].enum"
     description: Remove enum array from cat transforms
     remove: true
+# Simplify duration type
+  - target: "$.components['schemas']['_types.Duration'].oneOf"
+    description: Remove existing oneOf definition for Duration
+    remove: true
+  - target: "$.components['schemas']['_types.Duration']"
+    description: Re-add a simple string type for Duration
+    update:
+      type: string