Rename query rules namespace in rest api spec

rest-api-spec/src/main/resources/rest-api-spec/api/query_rule.delete.json → rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.delete_rule.json

@@ -1,5 +1,5 @@
 {
-  "query_rule.delete": {
+  "query_rules.delete_rule": {
     "documentation": {
       "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-query-rule.html",
       "description": "Deletes an individual query rule within a ruleset."

rest-api-spec/src/main/resources/rest-api-spec/api/query_ruleset.delete.json → rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.delete_ruleset.json

@@ -1,5 +1,5 @@
 {
-  "query_ruleset.delete": {
+  "query_rules.delete_ruleset": {
     "documentation": {
       "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/delete-query-ruleset.html",
       "description": "Deletes a query ruleset."

rest-api-spec/src/main/resources/rest-api-spec/api/query_rule.get.json → rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.get_rule.json

@@ -1,5 +1,5 @@
 {
-  "query_rule.get": {
+  "query_rules.get_rule": {
     "documentation": {
       "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-query-rule.html",
       "description": "Returns the details about an individual query rule within a ruleset."

rest-api-spec/src/main/resources/rest-api-spec/api/query_ruleset.get.json → rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.get_ruleset.json

@@ -1,5 +1,5 @@
 {
-  "query_ruleset.get": {
+  "query_rules.get_ruleset": {
     "documentation": {
       "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/get-query-ruleset.html",
       "description": "Returns the details about a query ruleset."

rest-api-spec/src/main/resources/rest-api-spec/api/query_ruleset.list.json → rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.list_rulesets.json

@@ -1,5 +1,5 @@
 {
-  "query_ruleset.list": {
+  "query_rules.list_rulesets": {
     "documentation": {
       "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/list-query-rulesets.html",
       "description": "Lists query rulesets."

rest-api-spec/src/main/resources/rest-api-spec/api/query_rule.put.json → rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.put_rule.json

@@ -1,5 +1,5 @@
 {
-  "query_rule.put": {
+  "query_rules.put_rule": {
     "documentation": {
       "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/put-query-rule.html",
       "description": "Creates or updates a query rule within a ruleset."

rest-api-spec/src/main/resources/rest-api-spec/api/query_ruleset.put.json → rest-api-spec/src/main/resources/rest-api-spec/api/query_rules.put_ruleset.json

@@ -1,5 +1,5 @@
 {
-  "query_ruleset.put": {
+  "query_rules.put_ruleset": {
     "documentation": {
       "url": "https://www.elastic.co/guide/en/elasticsearch/reference/master/put-query-ruleset.html",
       "description": "Creates or updates a query ruleset."

x-pack/plugin/ent-search/qa/rest/build.gradle

@@ -14,8 +14,7 @@ restResources {
       'nodes',
       'indices',
       'index',
-      'query_ruleset',
-      'query_rule',
+      'query_rules',
       'search_application',
       'xpack',
       'security',

x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/20_usage.yml

@@ -28,15 +28,15 @@ teardown:
 ---
 "xpack usage includes Enterprise Search":
   - do:
-      xpack.usage: {}
+      xpack.usage: { }
 
   - match: {
     enterprise_search: {
       enabled: true,
       available: true,
       search_applications: { count: 0 },
       analytics_collections: { count: 0 },
-      query_rulesets: {  total_count: 0, total_rule_count: 0, min_rule_count: 0, max_rule_count: 0 }
+      query_rulesets: { total_count: 0, total_rule_count: 0, min_rule_count: 0, max_rule_count: 0 }
     }
   }
 
@@ -53,15 +53,15 @@ teardown:
                     query: "{{query_string}}"
 
   - do:
-      xpack.usage: {}
+      xpack.usage: { }
 
   - match: {
     enterprise_search: {
       enabled: true,
       available: true,
       search_applications: { count: 1 },
       analytics_collections: { count: 0 },
-      query_rulesets: {  total_count: 0, total_rule_count: 0, min_rule_count: 0, max_rule_count: 0 }
+      query_rulesets: { total_count: 0, total_rule_count: 0, min_rule_count: 0, max_rule_count: 0 }
     }
   }
 
@@ -82,15 +82,15 @@ teardown:
         name: test-analytics-collection
 
   - do:
-      xpack.usage: {}
+      xpack.usage: { }
 
   - match: {
     enterprise_search: {
       enabled: true,
       available: true,
       search_applications: { count: 2 },
       analytics_collections: { count: 1 },
-      query_rulesets: {  total_count: 0, total_rule_count: 0, min_rule_count: 0, max_rule_count: 0 }
+      query_rulesets: { total_count: 0, total_rule_count: 0, min_rule_count: 0, max_rule_count: 0 }
     }
   }
 
@@ -99,15 +99,15 @@ teardown:
         name: test-search-application-2
 
   - do:
-      xpack.usage: {}
+      xpack.usage: { }
 
   - match: {
     enterprise_search: {
       enabled: true,
       available: true,
       search_applications: { count: 1 },
       analytics_collections: { count: 1 },
-      query_rulesets: {  total_count: 0, total_rule_count: 0, min_rule_count: 0, max_rule_count: 0 }
+      query_rulesets: { total_count: 0, total_rule_count: 0, min_rule_count: 0, max_rule_count: 0 }
     }
   }
 
@@ -116,20 +116,20 @@ teardown:
         name: test-analytics-collection
 
   - do:
-      xpack.usage: {}
+      xpack.usage: { }
 
   - match: {
     enterprise_search: {
       enabled: true,
       available: true,
       search_applications: { count: 1 },
       analytics_collections: { count: 0 },
-      query_rulesets: {  total_count: 0, total_rule_count: 0, min_rule_count: 0, max_rule_count: 0 }
+      query_rulesets: { total_count: 0, total_rule_count: 0, min_rule_count: 0, max_rule_count: 0 }
     }
   }
 
   - do:
-      query_ruleset.put:
+      query_rules.put_ruleset:
         ruleset_id: test-query-ruleset
         body:
           rules:
@@ -155,7 +155,7 @@ teardown:
                   - 'id4'
 
   - do:
-      query_ruleset.put:
+      query_rules.put_ruleset:
         ruleset_id: test-query-ruleset2
         body:
           rules:
@@ -199,12 +199,12 @@ teardown:
       available: true,
       search_applications: { count: 1 },
       analytics_collections: { count: 0 },
-      query_rulesets: {  total_count: 2, total_rule_count: 5, min_rule_count: 2, max_rule_count: 3, rule_criteria_total_counts: { exact: 5 } }
+      query_rulesets: { total_count: 2, total_rule_count: 5, min_rule_count: 2, max_rule_count: 3, rule_criteria_total_counts: { exact: 5 } }
     }
   }
 
   - do:
-      query_ruleset.delete:
+      query_rules.delete_ruleset:
         ruleset_id: test-query-ruleset2
 
   - do:
@@ -216,7 +216,7 @@ teardown:
       available: true,
       search_applications: { count: 1 },
       analytics_collections: { count: 0 },
-      query_rulesets: {  total_count: 1, total_rule_count: 2, min_rule_count: 2, max_rule_count: 2, rule_criteria_total_counts: { exact: 2 } }
+      query_rulesets: { total_count: 1, total_rule_count: 2, min_rule_count: 2, max_rule_count: 2, rule_criteria_total_counts: { exact: 2 } }
     }
   }
 

x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/rules/10_query_ruleset_put.yml

@@ -6,19 +6,19 @@ setup:
 ---
 teardown:
   - do:
-      query_ruleset.delete:
+      query_rules.delete_ruleset:
         ruleset_id: test-ruleset
         ignore: 404
 
   - do:
-      query_ruleset.delete:
+      query_rules.delete_ruleset:
         ruleset_id: test-query-ruleset-recreating
         ignore: 404
 
 ---
 'Create Query Ruleset':
   - do:
-      query_ruleset.put:
+      query_rules.put_ruleset:
         ruleset_id: test-ruleset
         body:
           rules:
@@ -48,7 +48,7 @@ teardown:
   - match: { result: 'created' }
 
   - do:
-      query_ruleset.get:
+      query_rules.get_ruleset:
         ruleset_id: test-ruleset
   - match: { ruleset_id: test-ruleset }
   - match:
@@ -79,7 +79,7 @@ teardown:
 ---
 'Create Query Ruleset - Resource already exists':
   - do:
-      query_ruleset.put:
+      query_rules.put_ruleset:
         ruleset_id: test-query-ruleset-recreating
         body:
           rules:
@@ -96,7 +96,7 @@ teardown:
   - match: { result: 'created' }
 
   - do:
-      query_ruleset.put:
+      query_rules.put_ruleset:
         ruleset_id: test-query-ruleset-recreating
         body:
           rules:
@@ -120,7 +120,7 @@ teardown:
   - do:
       catch: forbidden
       headers: { Authorization: "Basic ZW50c2VhcmNoLXVzZXI6ZW50c2VhcmNoLXVzZXItcGFzc3dvcmQ=" }  # user
-      query_ruleset.put:
+      query_rules.put_ruleset:
         ruleset_id: forbidden-query-ruleset
         body:
           rules:

x-pack/plugin/ent-search/qa/rest/src/yamlRestTest/resources/rest-api-spec/test/entsearch/rules/20_query_ruleset_list.yml

@@ -3,7 +3,7 @@ setup:
       cluster_features: [ "gte_v8.10.0" ]
       reason: Introduced in 8.10.0
   - do:
-      query_ruleset.put:
+      query_rules.put_ruleset:
         ruleset_id: test-query-ruleset-3
         body:
           rules:
@@ -29,7 +29,7 @@ setup:
                   - 'id4'
 
   - do:
-      query_ruleset.put:
+      query_rules.put_ruleset:
         ruleset_id: test-query-ruleset-1
         body:
           rules:
@@ -65,7 +65,7 @@ setup:
                   - 'id6'
 
   - do:
-      query_ruleset.put:
+      query_rules.put_ruleset:
         ruleset_id: test-query-ruleset-2
         body:
           rules:
@@ -112,29 +112,29 @@ setup:
 ---
 teardown:
   - do:
-      query_ruleset.delete:
+      query_rules.delete_ruleset:
         ruleset_id: test-query-ruleset-1
         ignore: 404
 
   - do:
-      query_ruleset.delete:
+      query_rules.delete_ruleset:
         ruleset_id: test-query-ruleset-2
         ignore: 404
 
   - do:
-      query_ruleset.delete:
+      query_rules.delete_ruleset:
         ruleset_id: test-query-ruleset-3
         ignore: 404
 
   - do:
-      query_ruleset.delete:
+      query_rules.delete_ruleset:
         ruleset_id: a-test-query-ruleset-with-lots-of-criteria
         ignore: 404
 
 ---
 "List Query Rulesets":
   - do:
-      query_ruleset.list: { }
+      query_rules.list_rulesets: { }
 
   - match: { count: 3 }
 
@@ -154,7 +154,7 @@ teardown:
 ---
 "List Query Rulesets - with from":
   - do:
-      query_ruleset.list:
+      query_rules.list_rulesets:
         from: 1
 
   - match: { count: 3 }
@@ -171,7 +171,7 @@ teardown:
 ---
 "List Query Rulesets - with size":
   - do:
-      query_ruleset.list:
+      query_rules.list_rulesets:
         size: 2
 
   - match: { count: 3 }
@@ -188,26 +188,26 @@ teardown:
 ---
 "List Query Rulesets - empty":
   - do:
-      query_ruleset.delete:
+      query_rules.delete_ruleset:
         ruleset_id: test-query-ruleset-1
 
   - do:
-      query_ruleset.delete:
+      query_rules.delete_ruleset:
         ruleset_id: test-query-ruleset-2
 
   - do:
-      query_ruleset.delete:
+      query_rules.delete_ruleset:
         ruleset_id: test-query-ruleset-3
 
   - do:
-      query_ruleset.list: { }
+      query_rules.list_rulesets: { }
 
   - match: { count: 0 }
 
 ---
 "List Query Rulesets with multiple rules":
   - do:
-      query_ruleset.put:
+      query_rules.put_ruleset:
         ruleset_id: a-test-query-ruleset-with-lots-of-criteria
         body:
           rules:
@@ -267,7 +267,7 @@ teardown:
                   - 'id10'
 
   - do:
-      query_ruleset.list:
+      query_rules.list_rulesets:
         from: 0
         size: 1
 
@@ -293,7 +293,7 @@ teardown:
   - do:
       catch: forbidden
       headers: { Authorization: "Basic ZW50c2VhcmNoLXVzZXI6ZW50c2VhcmNoLXVzZXItcGFzc3dvcmQ=" }  # user
-      query_ruleset.list: { }
+      query_rules.list_rulesets: { }
 
   - match: { error.type: 'security_exception' }