7.x only REST specification fixes (elastic#56736)

Fixes for the REST specification specific to 7.x * remove ignore "cat.thread_pool.json" and add the "" as valid option. elastic#55984 deprecated this field since it these params here have no effect on this specific API * remove ignore "indices.put_mapping.json" by adding the required / in the path to pass validation.
jbaiera · May 26, 2020 · 920677a · 920677a
1 parent 74b2c8a
commit 920677a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/rest-api-spec/build.gradle b/rest-api-spec/build.gradle
@@ -10,8 +10,3 @@ artifacts {
   restSpecs(new File(projectDir, "src/main/resources/rest-api-spec/api"))
   restTests(new File(projectDir, "src/main/resources/rest-api-spec/test"))
 }
-
-validateRestSpec {
-   ignore "cat.thread_pool.json"
-   ignore "indices.put_mapping.json"
-}
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/cat.thread_pool.json b/rest-api-spec/src/main/resources/rest-api-spec/api/cat.thread_pool.json
@@ -44,7 +44,7 @@
           "p"
         ],
         "deprecated":{
-          "version":"7.8.0",
+          "version":"7.7.0",
           "description":"Setting this value has no effect and will be removed from the specification."
         }
       },

diff --git a/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_mapping.json b/rest-api-spec/src/main/resources/rest-api-spec/api/indices.put_mapping.json
@@ -127,7 +127,7 @@
           }
         },
         {
-          "path":"{index}/_mappings",
+          "path":"/{index}/_mappings",
           "methods":[
             "PUT",
             "POST"

diff --git a/rest-api-spec/src/main/resources/schema.json b/rest-api-spec/src/main/resources/schema.json
@@ -201,7 +201,7 @@
                     "type": "array",
                     "items": {
                         "type": "string",
-                        "pattern": "^[a-zA-Z_]+$"
+                        "pattern": "^\\d*|[a-zA-Z_]+$"
                     },
                     "title": "Valid options when type is an enum"
                 },
-Original file line number
+Diff line change
@@ Expand Up / @@ -127,7 +127,7 @@ @@
               }
             },
             {
-              "path":"{index}/_mappings",
+              "path":"/{index}/_mappings",
               "methods":[
                 "PUT",
                 "POST"
@@ Expand Down @@