From c2c5f85c64c639af2a3789dd30121471ed7792b5 Mon Sep 17 00:00:00 2001 From: Joe Gallo Date: Tue, 17 Dec 2024 23:58:55 -0500 Subject: [PATCH] Fix an import and then make generate, etc --- output/openapi/elasticsearch-openapi.json | 6 +++-- output/schema/schema.json | 26 ++++++++++++++++--- output/typescript/types.ts | 5 ++-- .../GetIpLocationDatabaseResponse.ts | 2 +- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/output/openapi/elasticsearch-openapi.json b/output/openapi/elasticsearch-openapi.json index fc5329f502..c3ede242cf 100644 --- a/output/openapi/elasticsearch-openapi.json +++ b/output/openapi/elasticsearch-openapi.json @@ -70489,11 +70489,14 @@ "$ref": "#/components/schemas/_types:Id" }, "version": { - "type": "number" + "$ref": "#/components/schemas/_types:VersionNumber" }, "modified_date_millis": { "$ref": "#/components/schemas/_types:EpochTimeUnitMillis" }, + "modified_date": { + "$ref": "#/components/schemas/_types:EpochTimeUnitMillis" + }, "database": { "$ref": "#/components/schemas/ingest._types:DatabaseConfigurationFull" } @@ -70501,7 +70504,6 @@ "required": [ "id", "version", - "modified_date_millis", "database" ] }, diff --git a/output/schema/schema.json b/output/schema/schema.json index e3959a6249..7bd60b362c 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -147515,14 +147515,34 @@ "type": { "kind": "instance_of", "type": { - "name": "long", + "name": "VersionNumber", "namespace": "_types" } } }, { "name": "modified_date_millis", - "required": true, + "required": false, + "type": { + "kind": "instance_of", + "generics": [ + { + "kind": "instance_of", + "type": { + "name": "UnitMillis", + "namespace": "_types" + } + } + ], + "type": { + "name": "EpochTime", + "namespace": "_types" + } + } + }, + { + "name": "modified_date", + "required": false, "type": { "kind": "instance_of", "generics": [ @@ -147552,7 +147572,7 @@ } } ], - "specLocation": "ingest/get_ip_location_database/GetIpLocationDatabaseResponse.ts#L29-L34" + "specLocation": "ingest/get_ip_location_database/GetIpLocationDatabaseResponse.ts#L29-L35" }, { "kind": "request", diff --git a/output/typescript/types.ts b/output/typescript/types.ts index 698f991c67..a01d40e52f 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -13351,8 +13351,9 @@ export interface IngestGetGeoipDatabaseResponse { export interface IngestGetIpLocationDatabaseDatabaseConfigurationMetadata { id: Id - version: long - modified_date_millis: EpochTime + version: VersionNumber + modified_date_millis?: EpochTime + modified_date?: EpochTime database: IngestDatabaseConfigurationFull } diff --git a/specification/ingest/get_ip_location_database/GetIpLocationDatabaseResponse.ts b/specification/ingest/get_ip_location_database/GetIpLocationDatabaseResponse.ts index 24cdd9fed5..36f2b39aa8 100644 --- a/specification/ingest/get_ip_location_database/GetIpLocationDatabaseResponse.ts +++ b/specification/ingest/get_ip_location_database/GetIpLocationDatabaseResponse.ts @@ -18,7 +18,7 @@ */ import { DatabaseConfigurationFull } from '@ingest/_types/Database' -import { Id } from '@_types/common' +import { Id, VersionNumber } from '@_types/common' import { long } from '@_types/Numeric' import { EpochTime, UnitMillis } from '@_types/Time'