From 514f9411cd9b4fe86f18e618520b3969f12b3d2a Mon Sep 17 00:00:00 2001 From: dblock Date: Tue, 16 Jul 2024 09:28:07 -0400 Subject: [PATCH] Test against OpenSearch 1.3.17. Signed-off-by: dblock --- .github/workflows/test-spec.yml | 1 + CHANGELOG.md | 1 + spec/schemas/_common.yaml | 5 +++++ spec/schemas/_core.bulk.yaml | 4 ++++ spec/schemas/_core.get.yaml | 2 ++ spec/schemas/_core.search.yaml | 2 ++ spec/schemas/cat.health.yaml | 4 ++++ tests/cat/cluster_manager.yaml | 1 + tests/cat/health.yaml | 4 ---- tests/cat/master.yaml | 12 ++++++++++++ tests/cat/nodes.yaml | 2 -- tests/cluster/component_template.yaml | 18 +++++++++++++++++- tests/indices/clone.yaml | 14 +++++++++++++- tests/indices/close.yaml | 19 +++++++++++++++++++ tests/indices/index.yaml | 18 ++++++++++++++++++ tests/indices/index_template.yaml | 8 ++++++++ tests/indices/mapping.yml | 17 ++++++++++++++++- tests/indices/open.yaml | 21 +++++++++++++++++++-- tests/indices/settings.yaml | 13 +++++++++++++ tests/indices/shrink.yaml | 21 +++++++++++++++++++-- tests/indices/split.yaml | 26 ++++++++++++++++++++++++-- 21 files changed, 198 insertions(+), 15 deletions(-) create mode 100644 tests/cat/master.yaml diff --git a/.github/workflows/test-spec.yml b/.github/workflows/test-spec.yml index 3769aa126..7938d925e 100644 --- a/.github/workflows/test-spec.yml +++ b/.github/workflows/test-spec.yml @@ -23,6 +23,7 @@ jobs: strategy: matrix: entry: + - {version: 1.3.17, admin_password: admin} - {version: 2.0.0, admin_password: admin} - {version: 2.15.0} - {version: 2.16.0, hub: opensearchstaging} diff --git a/CHANGELOG.md b/CHANGELOG.md index e170d4005..c417fbdad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Added `cluster_manager_timeout` to `HEAD /{index}` ([#421](https://github.com/opensearch-project/opensearch-api-specification/pull/421)) - Added missing fields to `/_nodes/stats` ([#415](https://github.com/opensearch-project/opensearch-api-specification/pull/415)) - Added missing metrics options to `/_nodes/stats` ([#422](https://github.com/opensearch-project/opensearch-api-specification/pull/422)) +- Added tests against OpenSearch 1.3 ([#424](https://github.com/opensearch-project/opensearch-api-specification/pull/424)) ### Changed diff --git a/spec/schemas/_common.yaml b/spec/schemas/_common.yaml index 9821b6c6d..b080de313 100644 --- a/spec/schemas/_common.yaml +++ b/spec/schemas/_common.yaml @@ -6,6 +6,9 @@ info: paths: {} components: schemas: + Type: + type: string + x-version-removed: '2.0' Id: type: string AcknowledgedResponseBase: @@ -1315,6 +1318,8 @@ components: WriteResponseBase: type: object properties: + _type: + $ref: '#/components/schemas/Type' _id: $ref: '#/components/schemas/Id' _index: diff --git a/spec/schemas/_core.bulk.yaml b/spec/schemas/_core.bulk.yaml index 90bac8a39..a4e03fd19 100644 --- a/spec/schemas/_core.bulk.yaml +++ b/spec/schemas/_core.bulk.yaml @@ -110,6 +110,10 @@ components: ResponseItem: type: object properties: + _type: + description: The document type. + type: string + x-version-removed: '2.0' _id: description: The document ID associated with the operation. anyOf: diff --git a/spec/schemas/_core.get.yaml b/spec/schemas/_core.get.yaml index 947aad4fc..42f70ce2a 100644 --- a/spec/schemas/_core.get.yaml +++ b/spec/schemas/_core.get.yaml @@ -9,6 +9,8 @@ components: GetResult: type: object properties: + _type: + $ref: '_common.yaml#/components/schemas/Type' _index: $ref: '_common.yaml#/components/schemas/IndexName' fields: diff --git a/spec/schemas/_core.search.yaml b/spec/schemas/_core.search.yaml index 5ec0b7813..4ee0cbeaf 100644 --- a/spec/schemas/_core.search.yaml +++ b/spec/schemas/_core.search.yaml @@ -43,6 +43,8 @@ components: Hit: type: object properties: + _type: + type: string _index: $ref: '_common.yaml#/components/schemas/IndexName' _id: diff --git a/spec/schemas/cat.health.yaml b/spec/schemas/cat.health.yaml index f6989038b..6e7afc949 100644 --- a/spec/schemas/cat.health.yaml +++ b/spec/schemas/cat.health.yaml @@ -52,3 +52,7 @@ components: discovered_cluster_manager: description: cluster manager is discovered or not type: string + discovered_master: + x-version-removed: '2.0' + description: cluster manager is discovered or not + type: string diff --git a/tests/cat/cluster_manager.yaml b/tests/cat/cluster_manager.yaml index ab27df451..3f0686d32 100644 --- a/tests/cat/cluster_manager.yaml +++ b/tests/cat/cluster_manager.yaml @@ -3,6 +3,7 @@ $schema: ../../json_schemas/test_story.schema.yaml description: Test cat/cluster_manager endpoints. chapters: - synopsis: Cat with a json response. + version: '>= 2.0' path: /_cat/cluster_manager method: GET parameters: diff --git a/tests/cat/health.yaml b/tests/cat/health.yaml index 35d1713b6..2d9305475 100644 --- a/tests/cat/health.yaml +++ b/tests/cat/health.yaml @@ -55,7 +55,6 @@ chapters: - node.total: '1' status: yellow node.data: '1' - discovered_cluster_manager: 'true' - synopsis: Cat in different formats (format=yaml). method: GET path: /_cat/health @@ -68,7 +67,6 @@ chapters: - node.total: '1' status: yellow node.data: '1' - discovered_cluster_manager: 'true' - synopsis: Cat in different formats (format=cbor). method: GET path: /_cat/health @@ -81,7 +79,6 @@ chapters: - node.total: '1' status: yellow node.data: '1' - discovered_cluster_manager: 'true' - synopsis: Cat in different formats (format=smile). method: GET path: /_cat/health @@ -94,4 +91,3 @@ chapters: - node.total: '1' status: yellow node.data: '1' - discovered_cluster_manager: 'true' \ No newline at end of file diff --git a/tests/cat/master.yaml b/tests/cat/master.yaml new file mode 100644 index 000000000..7954f6bc1 --- /dev/null +++ b/tests/cat/master.yaml @@ -0,0 +1,12 @@ +$schema: ../../json_schemas/test_story.schema.yaml + +description: Test cat/master endpoints. +chapters: + - synopsis: Cat with a json response. + version: '< 2.0' + path: /_cat/master + method: GET + parameters: + format: json + response: + status: 200 diff --git a/tests/cat/nodes.yaml b/tests/cat/nodes.yaml index ab484e295..432cd60e0 100644 --- a/tests/cat/nodes.yaml +++ b/tests/cat/nodes.yaml @@ -9,5 +9,3 @@ chapters: format: json response: status: 200 - payload: - - cluster_manager: '*' diff --git a/tests/cluster/component_template.yaml b/tests/cluster/component_template.yaml index 78ba7eea4..05838d5db 100644 --- a/tests/cluster/component_template.yaml +++ b/tests/cluster/component_template.yaml @@ -53,13 +53,29 @@ chapters: method: HEAD parameters: name: template1 - cluster_manager_timeout: 10s local: false response: status: 200 + - synopsis: Check if the component template exists (cluster_manager_timeout). + path: /_component_template/{name} + method: HEAD + version: '>= 2.0' + parameters: + name: template1 + cluster_manager_timeout: 10s + response: + status: 200 - synopsis: Get all component templates. path: /_component_template method: GET + parameters: + local: false + response: + status: 200 + - synopsis: Get all component templates (cluster_manager_timeout). + path: /_component_template + method: GET + version: '>= 2.0' parameters: cluster_manager_timeout: 10s local: false diff --git a/tests/indices/clone.yaml b/tests/indices/clone.yaml index e1d88d74d..cf0e5fcfc 100644 --- a/tests/indices/clone.yaml +++ b/tests/indices/clone.yaml @@ -14,6 +14,9 @@ epilogues: - path: /games2 method: DELETE status: [200, 404] + - path: /games3 + method: DELETE + status: [200, 404] chapters: - synopsis: Block writes to the source index. path: /{index}/_settings @@ -31,7 +34,6 @@ chapters: index: movies target: games1 wait_for_active_shards: 1 - cluster_manager_timeout: 10s timeout: 10s response: status: 200 @@ -49,3 +51,13 @@ chapters: wait_for_completion: true response: status: 200 + - synopsis: Clone an index (cluster_manager_timeout). + version: '>= 2.0' + path: /{index}/_clone/{target} + method: POST + parameters: + index: movies + target: games3 + cluster_manager_timeout: 10s + response: + status: 200 diff --git a/tests/indices/close.yaml b/tests/indices/close.yaml index 0766f3085..3427b1b12 100644 --- a/tests/indices/close.yaml +++ b/tests/indices/close.yaml @@ -5,10 +5,16 @@ prologues: - path: /movies method: PUT status: [200] + - path: /games + method: PUT + status: [200] epilogues: - path: /movies method: DELETE status: [200, 404] + - path: /games + method: DELETE + status: [200, 404] chapters: - synopsis: Close an index. path: /{index}/_close @@ -19,6 +25,19 @@ chapters: expand_wildcards: all ignore_unavailable: true wait_for_active_shards: 0 + timeout: 30s + response: + status: 200 + payload: + indices: + movies: + closed: true + - synopsis: Close an index (cluster_manager_timeout). + path: /{index}/_close + method: POST + version: '>= 2.0' + parameters: + index: games cluster_manager_timeout: 30s timeout: 30s response: diff --git a/tests/indices/index.yaml b/tests/indices/index.yaml index e91becc8e..931c42110 100644 --- a/tests/indices/index.yaml +++ b/tests/indices/index.yaml @@ -49,6 +49,15 @@ chapters: - synopsis: Check if the index `movies` exists. It should not. path: /{index} method: HEAD + parameters: + index: movies + response: + status: 404 + + - synopsis: Check if the index `movies` exists (cluster_manager_timeout). It should not. + path: /{index} + method: HEAD + version: '>= 2.0' parameters: index: movies cluster_manager_timeout: 10s @@ -77,6 +86,15 @@ chapters: - synopsis: Delete the `books` and `games` indices. path: /{index} method: DELETE + version: '< 2.0' + parameters: + index: books,games + + - synopsis: Delete the `books` index (cluster_manager_timeout). + path: /{index} + method: DELETE + version: '>= 2.0' parameters: index: books,games cluster_manager_timeout: 10s + diff --git a/tests/indices/index_template.yaml b/tests/indices/index_template.yaml index 645312864..c61011894 100644 --- a/tests/indices/index_template.yaml +++ b/tests/indices/index_template.yaml @@ -65,6 +65,14 @@ chapters: - synopsis: Check that an index template exists. path: /_index_template/{name} method: HEAD + parameters: + name: daily_logs + response: + status: 200 + - synopsis: Check that an index template exists (cluster_manager_timeout). + path: /_index_template/{name} + method: HEAD + version: '>= 2.0' parameters: name: daily_logs cluster_manager_timeout: 10s diff --git a/tests/indices/mapping.yml b/tests/indices/mapping.yml index d91ed48b1..4d4860f05 100644 --- a/tests/indices/mapping.yml +++ b/tests/indices/mapping.yml @@ -66,7 +66,6 @@ chapters: allow_no_indices: true expand_wildcards: none ignore_unavailable: true - cluster_manager_timeout: 1s timeout: 10s write_index_only: true request_body: @@ -78,3 +77,19 @@ chapters: status: 200 payload: acknowledged: true + - synopsis: Update mapping for an index (cluster_manager_timeout). + path: /{index}/_mapping + method: PUT + version: '>= 2.0' + parameters: + index: movies + cluster_manager_timeout: 1s + request_body: + payload: + properties: + producer: + type: text + response: + status: 200 + payload: + acknowledged: true \ No newline at end of file diff --git a/tests/indices/open.yaml b/tests/indices/open.yaml index e69d9802a..61aa6fc4b 100644 --- a/tests/indices/open.yaml +++ b/tests/indices/open.yaml @@ -8,14 +8,20 @@ prologues: - path: /games method: PUT status: [200] + - path: /films + method: PUT + status: [200] - path: /movies/_close method: POST status: [200] - path: /games/_close method: POST status: [200] + - path: /films/_close + method: POST + status: [200] epilogues: - - path: /movies,games + - path: /movies,games,films method: DELETE status: [200, 404] chapters: @@ -28,7 +34,6 @@ chapters: expand_wildcards: all ignore_unavailable: true wait_for_active_shards: 0 - cluster_manager_timeout: 30s timeout: 30s response: status: 200 @@ -54,3 +59,15 @@ chapters: payload: shards_acknowledged: true acknowledged: true + - synopsis: Open a closed index (cluster_manager_timeout). + path: /{index}/_open + method: POST + version: '>= 2.0' + parameters: + index: films + cluster_manager_timeout: 30s + response: + status: 200 + payload: + shards_acknowledged: true + acknowledged: true \ No newline at end of file diff --git a/tests/indices/settings.yaml b/tests/indices/settings.yaml index e690fc253..dc5a85f7b 100644 --- a/tests/indices/settings.yaml +++ b/tests/indices/settings.yaml @@ -13,6 +13,19 @@ chapters: - synopsis: Get global settings. path: /_settings method: GET + parameters: + allow_no_indices: true + expand_wildcards: none + flat_settings: true + include_defaults: true + ignore_unavailable: true + local: true + response: + status: 200 + - synopsis: Get global settings (cluster_manager_timeout). + path: /_settings + method: GET + version: '>= 2.0' parameters: allow_no_indices: true expand_wildcards: none diff --git a/tests/indices/shrink.yaml b/tests/indices/shrink.yaml index db83a4954..8d6ce5b23 100644 --- a/tests/indices/shrink.yaml +++ b/tests/indices/shrink.yaml @@ -21,6 +21,9 @@ epilogues: - path: /movies3 method: DELETE status: [200, 404] + - path: /movies4 + method: DELETE + status: [200, 404] chapters: - synopsis: Block writes to the source index. path: /{index}/_settings @@ -38,7 +41,6 @@ chapters: index: movies target: movies1 wait_for_active_shards: 1 - cluster_manager_timeout: 10s timeout: 10s response: status: 200 @@ -63,6 +65,21 @@ chapters: index: movies target: movies3 wait_for_active_shards: 1 + timeout: 10s + response: + status: 200 + payload: + shards_acknowledged: true + acknowledged: true + index: movies3 + - synopsis: Shrink an index (cluster_manager_timeout). + path: /{index}/_shrink/{target} + method: POST + version: '>= 2.0' + parameters: + index: movies + target: movies1 + wait_for_active_shards: 1 cluster_manager_timeout: 10s timeout: 10s response: @@ -70,4 +87,4 @@ chapters: payload: shards_acknowledged: true acknowledged: true - index: movies3 \ No newline at end of file + index: movies4 diff --git a/tests/indices/split.yaml b/tests/indices/split.yaml index 41ca8053c..53b3e3658 100644 --- a/tests/indices/split.yaml +++ b/tests/indices/split.yaml @@ -21,6 +21,9 @@ epilogues: - path: /movies3 method: DELETE status: [200, 404] + - path: /movies4 + method: DELETE + status: [200, 404] chapters: - synopsis: Block writes to the source index. path: /{index}/_settings @@ -38,7 +41,6 @@ chapters: index: movies target: movies1 wait_for_active_shards: 1 - cluster_manager_timeout: 10s timeout: 10s request_body: payload: @@ -73,6 +75,26 @@ chapters: index: movies target: movies3 wait_for_active_shards: 1 + timeout: 10s + request_body: + payload: + settings: + index: + number_of_shards: 6 + response: + status: 200 + payload: + shards_acknowledged: true + acknowledged: true + index: movies3 + - synopsis: Split an index (cluster_manager_timeout). + path: /{index}/_split/{target} + method: POST + version: '>= 2.0' + parameters: + index: movies + target: movies1 + wait_for_active_shards: 1 cluster_manager_timeout: 10s timeout: 10s request_body: @@ -85,4 +107,4 @@ chapters: payload: shards_acknowledged: true acknowledged: true - index: movies3 \ No newline at end of file + index: movies4 \ No newline at end of file