-
Notifications
You must be signed in to change notification settings - Fork 25.6k
Improve resolve/cluster yaml test #121315
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
e9aec28
10_basic_resolve_cluster.yml syntax fix
quux00 60c63fc
Updated spec and added additional test for resolve/cluster
quux00 4843ec0
Merge remote-tracking branch 'elastic/main' into fix/resolve-cluster-…
quux00 e6ff3c7
Merge remote-tracking branch 'elastic/main' into fix/resolve-cluster-…
quux00 001e180
Merge remote-tracking branch 'elastic/main' into fix/resolve-cluster-…
quux00 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
79 changes: 40 additions & 39 deletions
79
rest-api-spec/src/main/resources/rest-api-spec/api/indices.resolve_cluster.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,56 @@ | ||
| { | ||
| "indices.resolve_cluster":{ | ||
| "documentation":{ | ||
| "url":"https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-resolve-cluster-api.html", | ||
| "description":"Resolves the specified index expressions to return information about each cluster, including the local cluster, if included." | ||
| "indices.resolve_cluster": { | ||
| "documentation": { | ||
| "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/indices-resolve-cluster-api.html", | ||
| "description": "Resolves the specified index expressions to return information about each cluster. If no index expression is provided, this endpoint will return information about all the remote clusters that are configured on the local cluster." | ||
| }, | ||
| "stability":"stable", | ||
| "visibility":"public", | ||
| "headers":{ | ||
| "accept": [ "application/json"] | ||
| "stability": "stable", | ||
| "visibility": "public", | ||
| "headers": { | ||
| "accept": ["application/json"] | ||
| }, | ||
| "url":{ | ||
| "paths":[ | ||
| "url": { | ||
| "paths": [ | ||
| { | ||
| "path":"/_resolve/cluster/{name}", | ||
| "methods":[ | ||
| "GET" | ||
| ], | ||
| "parts":{ | ||
| "name":{ | ||
| "type":"list", | ||
| "description":"A comma-separated list of cluster:index names or wildcard expressions" | ||
| "path": "/_resolve/cluster", | ||
| "methods": ["GET"] | ||
| }, | ||
| { | ||
| "path": "/_resolve/cluster/{name}", | ||
| "methods": ["GET"], | ||
| "parts": { | ||
| "name": { | ||
| "type": "list", | ||
| "description": "A comma-separated list of cluster:index names or wildcard expressions" | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "params":{ | ||
| "ignore_unavailable":{ | ||
| "type":"boolean", | ||
| "description":"Whether specified concrete indices should be ignored when unavailable (missing or closed)" | ||
| "params": { | ||
| "ignore_unavailable": { | ||
| "type": "boolean", | ||
| "description": "Whether specified concrete indices should be ignored when unavailable (missing or closed). Only allowed when providing an index expression." | ||
| }, | ||
| "ignore_throttled": { | ||
| "type": "boolean", | ||
| "description": "Whether specified concrete, expanded or aliased indices should be ignored when throttled. Only allowed when providing an index expression." | ||
| }, | ||
| "ignore_throttled":{ | ||
| "type":"boolean", | ||
| "description":"Whether specified concrete, expanded or aliased indices should be ignored when throttled" | ||
| "allow_no_indices": { | ||
| "type": "boolean", | ||
| "description": "Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified). Only allowed when providing an index expression." | ||
| }, | ||
| "allow_no_indices":{ | ||
| "type":"boolean", | ||
| "description":"Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)" | ||
| "expand_wildcards": { | ||
| "type": "enum", | ||
| "options": ["open", "closed", "hidden", "none", "all"], | ||
| "default": "open", | ||
| "description": "Whether wildcard expressions should get expanded to open or closed indices (default: open). Only allowed when providing an index expression." | ||
| }, | ||
| "expand_wildcards":{ | ||
| "type":"enum", | ||
| "options":[ | ||
| "open", | ||
| "closed", | ||
| "hidden", | ||
| "none", | ||
| "all" | ||
| ], | ||
| "default":"open", | ||
| "description":"Whether wildcard expressions should get expanded to open or closed indices (default: open)" | ||
| "timeout": { | ||
| "type": "time", | ||
| "description": "The maximum time to wait for remote clusters to respond" | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't we use capabilities instead of direct version numbers? I'm still a bit confused in which case what is used.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Probably a good follow-on ticket. I've not added any capabilities for the stuff we've been doing so far, but also not sure the yaml tests support capability based checks. This is the standard way to do it for yaml tests (see higher up in the yaml doc for the 8.13 restrictions).