From 745be8330b8b553b3169231813cb5ecec425ac46 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Thu, 11 May 2023 10:45:48 +0100 Subject: [PATCH 1/2] Make index settings blocks stringified --- output/schema/schema.json | 54 +++++++++++++------ output/typescript/types.ts | 8 +-- specification/indices/_types/IndexSettings.ts | 8 +-- 3 files changed, 47 insertions(+), 23 deletions(-) diff --git a/output/schema/schema.json b/output/schema/schema.json index f68c20afba..7cd880c427 100644 --- a/output/schema/schema.json +++ b/output/schema/schema.json @@ -102594,10 +102594,19 @@ "name": "read_only", "required": false, "type": { + "generics": [ + { + "kind": "instance_of", + "type": { + "name": "boolean", + "namespace": "_builtins" + } + } + ], "kind": "instance_of", "type": { - "name": "boolean", - "namespace": "_builtins" + "name": "Stringified", + "namespace": "_spec_utils" } } }, @@ -102605,10 +102614,19 @@ "name": "read_only_allow_delete", "required": false, "type": { + "generics": [ + { + "kind": "instance_of", + "type": { + "name": "boolean", + "namespace": "_builtins" + } + } + ], "kind": "instance_of", "type": { - "name": "boolean", - "namespace": "_builtins" + "name": "Stringified", + "namespace": "_spec_utils" } } }, @@ -102616,10 +102634,19 @@ "name": "read", "required": false, "type": { + "generics": [ + { + "kind": "instance_of", + "type": { + "name": "boolean", + "namespace": "_builtins" + } + } + ], "kind": "instance_of", "type": { - "name": "boolean", - "namespace": "_builtins" + "name": "Stringified", + "namespace": "_spec_utils" } } }, @@ -102627,23 +102654,20 @@ "name": "write", "required": false, "type": { - "items": [ + "generics": [ { "kind": "instance_of", "type": { "name": "boolean", "namespace": "_builtins" } - }, - { - "kind": "instance_of", - "type": { - "name": "string", - "namespace": "_builtins" - } } ], - "kind": "union_of" + "kind": "instance_of", + "type": { + "name": "Stringified", + "namespace": "_spec_utils" + } } }, { diff --git a/output/typescript/types.ts b/output/typescript/types.ts index 18459b046e..e49fa8696a 100644 --- a/output/typescript/types.ts +++ b/output/typescript/types.ts @@ -9618,10 +9618,10 @@ export interface IndicesIndexSegmentSort { } export interface IndicesIndexSettingBlocks { - read_only?: boolean - read_only_allow_delete?: boolean - read?: boolean - write?: boolean | string + read_only?: SpecUtilsStringified + read_only_allow_delete?: SpecUtilsStringified + read?: SpecUtilsStringified + write?: SpecUtilsStringified metadata?: SpecUtilsStringified } diff --git a/specification/indices/_types/IndexSettings.ts b/specification/indices/_types/IndexSettings.ts index a36bc91e1a..4126f37387 100644 --- a/specification/indices/_types/IndexSettings.ts +++ b/specification/indices/_types/IndexSettings.ts @@ -243,10 +243,10 @@ export class SettingsQueryString { } export class IndexSettingBlocks { - read_only?: boolean - read_only_allow_delete?: boolean - read?: boolean - write?: boolean | string // TODO: should be bool only + read_only?: Stringified + read_only_allow_delete?: Stringified + read?: Stringified + write?: Stringified metadata?: Stringified } From 6aac51ddd0544d2cc08c7657deb100aed002d35d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20Saint-F=C3=A9lix?= Date: Fri, 12 May 2023 11:04:03 +0200 Subject: [PATCH 2/2] Update stack version in build validation step --- .github/workflows/validate-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate-pr.yml b/.github/workflows/validate-pr.yml index 703518796f..638c22b2d4 100644 --- a/.github/workflows/validate-pr.yml +++ b/.github/workflows/validate-pr.yml @@ -18,7 +18,7 @@ jobs: if: github.repository_owner == 'elastic' # this action will fail if executed from a fork runs-on: ubuntu-latest env: - STACK_VERSION: 8.6-SNAPSHOT + STACK_VERSION: 8.9-SNAPSHOT steps: - uses: actions/checkout@v2