Type mapping removal for 2.0 (#52)

* Removing type mappings for 2.0 Signed-off-by: Vacha Shah <vachshah@amazon.com> * Remove include-type-name parameter Signed-off-by: Vacha Shah <vachshah@amazon.com> * Fixing tests to use correct yaml files for test inputs Signed-off-by: Vacha Shah <vachshah@amazon.com> * Add OpenSearch 2.0 to the test matrix Signed-off-by: Vacha Shah <vachshah@amazon.com> * Handling opendistro tests for yaml docs Signed-off-by: Vacha Shah <vachshah@amazon.com> * Addressing comments Signed-off-by: Vacha Shah <vachshah@amazon.com>
opensearch-project · May 27, 2022 · 26d5b6b · 26d5b6b
1 parent 13da93f
commit 26d5b6b
Show file tree

Hide file tree

Showing 42 changed files with 15 additions and 2,171 deletions.
diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml
@@ -22,6 +22,8 @@ jobs:
           - { cluster: 'opensearch', version: '1.2.4', secured: 'false' }
           - { cluster: 'opensearch', version: '1.1.0', secured: 'true' }
           - { cluster: 'opensearch', version: '1.1.0', secured: 'false' }
+          - { cluster: 'opensearch', version: '2.0.0', secured: 'true' }
+          - { cluster: 'opensearch', version: '2.0.0', secured: 'false' }
 
     steps:
       - name: Checkout

diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md
@@ -130,7 +130,7 @@ can be `to_string()`'ed and written to disk, and this is used to create much of
 1. Generate as much of the client as feasible from the REST API specs
 
     The REST API specs contain information about
-    - the URL parts e.g. `{index}/{type}/_search` and variants
+    - the URL parts e.g. `{index}/_search` and variants
     - accepted HTTP methods e.g. `GET`, `POST`
     - the URL query string parameters
     - whether the API accepts a body

diff --git a/api_generator/rest_specs/bulk.json b/api_generator/rest_specs/bulk.json
@@ -31,23 +31,6 @@
               "description":"Default index for items which don't provide one"
             }
           }
-        },
-        {
-          "path":"/{index}/{type}/_bulk",
-          "methods":[
-            "POST",
-            "PUT"
-          ],
-          "parts":{
-            "index":{
-              "type":"string",
-              "description":"Default index for items which don't provide one"
-            },
-            "type":{
-              "type":"string",
-              "description":"Default document type for items which don't provide one"
-            }
-          }
         }
       ]
     },

diff --git a/api_generator/rest_specs/count.json b/api_generator/rest_specs/count.json
@@ -32,27 +32,6 @@
               "description":"A comma-separated list of indices to restrict the results"
             }
           }
-        },
-        {
-          "path":"/{index}/{type}/_count",
-          "methods":[
-            "POST",
-            "GET"
-          ],
-          "parts":{
-            "index":{
-              "type":"list",
-              "description":"A comma-separated list of indices to restrict the results"
-            },
-            "type": {
-              "type" : "list",
-              "description" : "A comma-separated list of types to restrict the results"
-            }
-          },
-          "deprecated": {
-            "version" : "7.0.0",
-            "description" : "Specifying types in urls has been deprecated"
-          }
         }
       ]
     },

diff --git a/api_generator/rest_specs/create.json b/api_generator/rest_specs/create.json
@@ -28,32 +28,6 @@
               "description":"The name of the index"
             }
           }
-        },
-        {
-          "path":"/{index}/{type}/{id}/_create",
-          "methods":[
-            "PUT",
-            "POST"
-          ],
-          "parts":{
-            "id":{
-              "type":"string",
-              "description":"Document ID"
-            },
-            "index":{
-              "type":"string",
-              "description":"The name of the index"
-            },
-            "type":{
-              "type":"string",
-              "description":"The type of the document",
-              "deprecated":true
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"Specifying types in urls has been deprecated"
-          }
         }
       ]
     },

diff --git a/api_generator/rest_specs/delete.json b/api_generator/rest_specs/delete.json
@@ -26,31 +26,6 @@
               "description":"The name of the index"
             }
           }
-        },
-        {
-          "path":"/{index}/{type}/{id}",
-          "methods":[
-            "DELETE"
-          ],
-          "parts":{
-            "id":{
-              "type":"string",
-              "description":"The document ID"
-            },
-            "index":{
-              "type":"string",
-              "description":"The name of the index"
-            },
-            "type":{
-              "type":"string",
-              "description":"The type of the document",
-              "deprecated":true
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"Specifying types in urls has been deprecated"
-          }
         }
       ]
     },

diff --git a/api_generator/rest_specs/delete_by_query.json b/api_generator/rest_specs/delete_by_query.json
@@ -23,25 +23,6 @@
               "description":"A comma-separated list of index names to search; use `_all` or empty string to perform the operation on all indices"
             }
           }
-        },
-        {
-          "path" : "/{index}/{type}/_delete_by_query",
-          "methods": ["POST"],
-          "parts": {
-            "index": {
-              "required": true,
-              "type": "list",
-              "description": "A comma-separated list of index names to search; use `_all` or empty string to perform the operation on all indices"
-            },
-            "type": {
-              "type": "list",
-              "description": "A comma-separated list of document types to search; leave empty to perform the operation on all types"
-            }
-          },
-          "deprecated": {
-            "version" : "7.0.0",
-            "description" : "Specifying types in urls has been deprecated"
-          }
         }
       ]
     },

diff --git a/api_generator/rest_specs/exists.json b/api_generator/rest_specs/exists.json
@@ -26,31 +26,6 @@
               "description":"The name of the index"
             }
           }
-        },
-        {
-          "path":"/{index}/{type}/{id}",
-          "methods":[
-            "HEAD"
-          ],
-          "parts":{
-            "id":{
-              "type":"string",
-              "description":"The document ID"
-            },
-            "index":{
-              "type":"string",
-              "description":"The name of the index"
-            },
-            "type":{
-              "type":"string",
-              "description":"The type of the document (use `_all` to fetch the first document matching the ID across all types)",
-              "deprecated":true
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"Specifying types in urls has been deprecated"
-          }
         }
       ]
     },

diff --git a/api_generator/rest_specs/exists_source.json b/api_generator/rest_specs/exists_source.json
@@ -26,31 +26,6 @@
               "description":"The name of the index"
             }
           }
-        },
-        {
-          "path":"/{index}/{type}/{id}/_source",
-          "methods":[
-            "HEAD"
-          ],
-          "parts":{
-            "id":{
-              "type":"string",
-              "description":"The document ID"
-            },
-            "index":{
-              "type":"string",
-              "description":"The name of the index"
-            },
-            "type":{
-              "type":"string",
-              "description":"The type of the document; deprecated and optional starting with 7.0",
-              "deprecated":true
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"Specifying types in urls has been deprecated"
-          }
         }
       ]
     },

diff --git a/api_generator/rest_specs/explain.json b/api_generator/rest_specs/explain.json
@@ -28,32 +28,6 @@
               "description":"The name of the index"
             }
           }
-        },
-        {
-          "path":"/{index}/{type}/{id}/_explain",
-          "methods":[
-            "GET",
-            "POST"
-          ],
-          "parts":{
-            "id":{
-              "type":"string",
-              "description":"The document ID"
-            },
-            "index":{
-              "type":"string",
-              "description":"The name of the index"
-            },
-            "type":{
-              "type":"string",
-              "description":"The type of the document",
-              "deprecated":true
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"Specifying types in urls has been deprecated"
-          }
         }
       ]
     },

diff --git a/api_generator/rest_specs/get.json b/api_generator/rest_specs/get.json
@@ -26,31 +26,6 @@
               "description":"The name of the index"
             }
           }
-        },
-        {
-          "path":"/{index}/{type}/{id}",
-          "methods":[
-            "GET"
-          ],
-          "parts":{
-            "id":{
-              "type":"string",
-              "description":"The document ID"
-            },
-            "index":{
-              "type":"string",
-              "description":"The name of the index"
-            },
-            "type":{
-              "type":"string",
-              "description":"The type of the document (use `_all` to fetch the first document matching the ID across all types)",
-              "deprecated":true
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"Specifying types in urls has been deprecated"
-          }
         }
       ]
     },

diff --git a/api_generator/rest_specs/get_source.json b/api_generator/rest_specs/get_source.json
@@ -26,31 +26,6 @@
               "description":"The name of the index"
             }
           }
-        },
-        {
-          "path":"/{index}/{type}/{id}/_source",
-          "methods":[
-            "GET"
-          ],
-          "parts":{
-            "id":{
-              "type":"string",
-              "description":"The document ID"
-            },
-            "index":{
-              "type":"string",
-              "description":"The name of the index"
-            },
-            "type":{
-              "type":"string",
-              "description":"The type of the document; deprecated and optional starting with 7.0",
-              "deprecated":true
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"Specifying types in urls has been deprecated"
-          }
         }
       ]
     },

diff --git a/api_generator/rest_specs/index.json b/api_generator/rest_specs/index.json
@@ -40,53 +40,6 @@
               "description":"The name of the index"
             }
           }
-        },
-        {
-          "path":"/{index}/{type}",
-          "methods":[
-            "POST"
-          ],
-          "parts":{
-            "index":{
-              "type":"string",
-              "description":"The name of the index"
-            },
-            "type":{
-              "type":"string",
-              "description":"The type of the document",
-              "deprecated":true
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"Specifying types in urls has been deprecated"
-          }
-        },
-        {
-          "path":"/{index}/{type}/{id}",
-          "methods":[
-            "PUT",
-            "POST"
-          ],
-          "parts":{
-            "id":{
-              "type":"string",
-              "description":"Document ID"
-            },
-            "index":{
-              "type":"string",
-              "description":"The name of the index"
-            },
-            "type":{
-              "type":"string",
-              "description":"The type of the document",
-              "deprecated":true
-            }
-          },
-          "deprecated":{
-            "version":"7.0.0",
-            "description":"Specifying types in urls has been deprecated"
-          }
         }
       ]
     },

diff --git a/api_generator/rest_specs/indices.create.json b/api_generator/rest_specs/indices.create.json
@@ -27,10 +27,6 @@
       ]
     },
     "params":{
-      "include_type_name":{
-        "type":"boolean",
-        "description":"Whether a type should be expected in the body of the mappings."
-      },
       "wait_for_active_shards":{
         "type":"string",
         "description":"Set the number of active shards to wait for before the operation returns."