Skip to content

Merge query_rule and query_ruleset namespaces into query_rules #2656

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.

Sign up for GitHub

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 10 commits into from
Jun 28, 2024
Merged

Merge query_rule and query_ruleset namespaces into query_rules #2656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
97bb3e6
Move query_ruleset and query_rule into top level query_rules
kderusso Jun 26, 2024
7843095
Generate output
kderusso Jun 26, 2024
a04d9e5
Rename to fit Elasticsearch namespace requirements
kderusso Jun 26, 2024
da6c6ff
Move directories to match new namespace
kderusso Jun 26, 2024
96a3f81
Generate output
kderusso Jun 26, 2024
dd0f90c
Make contrib
kderusso Jun 26, 2024
0929741
Rename query rules requests per PR feedback
kderusso Jun 27, 2024
152c4a2
Move files and generate output
kderusso Jun 27, 2024
095ed44
Merge remote-tracking branch 'origin/main' into kderusso/move-query-r…
pquentin Jun 28, 2024
df69ea4
Run make contrib
pquentin Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 33 additions & 33 deletions output/openapi/elasticsearch-openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24538,13 +24538,13 @@
"/_query_rules/{ruleset_id}/_rule/{rule_id}": {
"get": {
"tags": [
"query_rule.get"
"query_rules.get_rule"
],
"summary": "Returns the details about a query rule within a query ruleset",
"externalDocs": {
"url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-query-rule.html"
},
"operationId": "query-rule-get",
"operationId": "query-rules-get-rule",
"parameters": [
{
"in": "path",
Expand Down Expand Up @@ -24575,7 +24575,7 @@
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/query_ruleset._types:QueryRule"
"$ref": "#/components/schemas/query_rules._types:QueryRule"
}
}
}
Expand All @@ -24584,13 +24584,13 @@
},
"put": {
"tags": [
"query_rule.put"
"query_rules.put_rule"
],
"summary": "Creates or updates a query rule within a query ruleset",
"externalDocs": {
"url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/put-query-rule.html"
},
"operationId": "query-rule-put",
"operationId": "query-rules-put-rule",
"parameters": [
{
"in": "path",
Expand Down Expand Up @@ -24622,16 +24622,16 @@
"type": "object",
"properties": {
"type": {
"$ref": "#/components/schemas/query_ruleset._types:QueryRuleType"
"$ref": "#/components/schemas/query_rules._types:QueryRuleType"
},
"criteria": {
"type": "array",
"items": {
"$ref": "#/components/schemas/query_ruleset._types:QueryRuleCriteria"
"$ref": "#/components/schemas/query_rules._types:QueryRuleCriteria"
}
},
"actions": {
"$ref": "#/components/schemas/query_ruleset._types:QueryRuleActions"
"$ref": "#/components/schemas/query_rules._types:QueryRuleActions"
}
},
"required": [
Expand Down Expand Up @@ -24667,13 +24667,13 @@
},
"delete": {
"tags": [
"query_rule.delete"
"query_rules.delete_rule"
],
"summary": "Deletes a query rule within a query ruleset",
"externalDocs": {
"url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-query-rule.html"
},
"operationId": "query-rule-delete",
"operationId": "query-rules-delete-rule",
"parameters": [
{
"in": "path",
Expand Down Expand Up @@ -24715,13 +24715,13 @@
"/_query_rules/{ruleset_id}": {
"get": {
"tags": [
"query_ruleset.get"
"query_rules.get_ruleset"
],
"summary": "Returns the details about a query ruleset",
"externalDocs": {
"url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-query-ruleset.html"
},
"operationId": "query-ruleset-get",
"operationId": "query-rules-get-ruleset",
"parameters": [
{
"in": "path",
Expand All @@ -24741,7 +24741,7 @@
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/query_ruleset._types:QueryRuleset"
"$ref": "#/components/schemas/query_rules._types:QueryRuleset"
}
}
}
Expand All @@ -24750,13 +24750,13 @@
},
"put": {
"tags": [
"query_ruleset.put"
"query_rules.put_ruleset"
],
"summary": "Creates or updates a query ruleset",
"externalDocs": {
"url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/put-query-ruleset.html"
},
"operationId": "query-ruleset-put",
"operationId": "query-rules-put-ruleset",
"parameters": [
{
"in": "path",
Expand All @@ -24779,7 +24779,7 @@
"rules": {
"type": "array",
"items": {
"$ref": "#/components/schemas/query_ruleset._types:QueryRule"
"$ref": "#/components/schemas/query_rules._types:QueryRule"
}
}
},
Expand Down Expand Up @@ -24814,13 +24814,13 @@
},
"delete": {
"tags": [
"query_ruleset.delete"
"query_rules.delete_ruleset"
],
"summary": "Deletes a query ruleset",
"externalDocs": {
"url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-query-ruleset.html"
},
"operationId": "query-ruleset-delete",
"operationId": "query-rules-delete-ruleset",
"parameters": [
{
"in": "path",
Expand Down Expand Up @@ -24851,13 +24851,13 @@
"/_query_rules": {
"get": {
"tags": [
"query_ruleset.list"
"query_rules.list_rulesets"
],
"summary": "Returns summarized information about existing query rulesets",
"externalDocs": {
"url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/list-query-rulesets.html"
},
"operationId": "query-ruleset-list",
"operationId": "query-rules-list-rulesets",
"parameters": [
{
"in": "query",
Expand Down Expand Up @@ -24894,7 +24894,7 @@
"results": {
"type": "array",
"items": {
"$ref": "#/components/schemas/query_ruleset.list:QueryRulesetListItem"
"$ref": "#/components/schemas/query_rules.list_rulesets:QueryRulesetListItem"
}
}
},
Expand Down Expand Up @@ -92969,23 +92969,23 @@
"aggregations"
]
},
"query_ruleset._types:QueryRule": {
"query_rules._types:QueryRule": {
"type": "object",
"properties": {
"rule_id": {
"$ref": "#/components/schemas/_types:Id"
},
"type": {
"$ref": "#/components/schemas/query_ruleset._types:QueryRuleType"
"$ref": "#/components/schemas/query_rules._types:QueryRuleType"
},
"criteria": {
"type": "array",
"items": {
"$ref": "#/components/schemas/query_ruleset._types:QueryRuleCriteria"
"$ref": "#/components/schemas/query_rules._types:QueryRuleCriteria"
}
},
"actions": {
"$ref": "#/components/schemas/query_ruleset._types:QueryRuleActions"
"$ref": "#/components/schemas/query_rules._types:QueryRuleActions"
}
},
"required": [
Expand All @@ -92995,17 +92995,17 @@
"actions"
]
},
"query_ruleset._types:QueryRuleType": {
"query_rules._types:QueryRuleType": {
"type": "string",
"enum": [
"pinned"
]
},
"query_ruleset._types:QueryRuleCriteria": {
"query_rules._types:QueryRuleCriteria": {
"type": "object",
"properties": {
"type": {
"$ref": "#/components/schemas/query_ruleset._types:QueryRuleCriteriaType"
"$ref": "#/components/schemas/query_rules._types:QueryRuleCriteriaType"
},
"metadata": {
"type": "string"
Expand All @@ -93021,7 +93021,7 @@
"type"
]
},
"query_ruleset._types:QueryRuleCriteriaType": {
"query_rules._types:QueryRuleCriteriaType": {
"type": "string",
"enum": [
"global",
Expand All @@ -93037,7 +93037,7 @@
"always"
]
},
"query_ruleset._types:QueryRuleActions": {
"query_rules._types:QueryRuleActions": {
"type": "object",
"properties": {
"ids": {
Expand All @@ -93054,7 +93054,7 @@
}
}
},
"query_ruleset._types:QueryRuleset": {
"query_rules._types:QueryRuleset": {
"type": "object",
"properties": {
"ruleset_id": {
Expand All @@ -93064,7 +93064,7 @@
"description": "Rules associated with the query ruleset",
"type": "array",
"items": {
"$ref": "#/components/schemas/query_ruleset._types:QueryRule"
"$ref": "#/components/schemas/query_rules._types:QueryRule"
}
}
},
Expand All @@ -93073,7 +93073,7 @@
"rules"
]
},
"query_ruleset.list:QueryRulesetListItem": {
"query_rules.list_rulesets:QueryRulesetListItem": {
"type": "object",
"properties": {
"ruleset_id": {
Expand Down
Loading
Loading