global: allow opensearch 2.x

Author: max-moser

.github/workflows/tests.yml

@@ -31,28 +31,28 @@ jobs:
       matrix:
           python-version: [3.7, 3.8, 3.9]
           requirements-level: [pypi]
-          db-service: [postgresql10, postgresql13]
-          search-service: [opensearch1,elasticsearch7]
+          db-service: [postgresql10,postgresql13]
+          search-service: [opensearch2,elasticsearch7]
           exclude:
           - python-version: 3.7
             db-service: postgresql13
-            search-service: opensearch1
+            search-service: opensearch2
 
           - python-version: 3.7
             db-service: postgresql13
             search-service: elasticsearch7
 
           - python-version: 3.8
             db-service: postgresql10
-            search-service: opensearch1
+            search-service: opensearch2
 
           - python-version: 3.8
             db-service: postgresql10
             search-service: elasticsearch7
 
           - python-version: 3.9
             db-service: postgresql10
-            search-service: opensearch1
+            search-service: opensearch2
 
           - python-version: 3.9
             db-service: postgresql10
@@ -64,8 +64,8 @@ jobs:
           - db-service: postgresql13
             DB_EXTRAS: "postgresql"
 
-          - search-service: opensearch1
-            SEARCH_EXTRAS: "opensearch1"
+          - search-service: opensearch2
+            SEARCH_EXTRAS: "opensearch2"
 
           - search-service: elasticsearch7
             SEARCH_EXTRAS: "elasticsearch7"

INSTALL.rst

@@ -5,4 +5,4 @@ Invenio-Drafts-Resources is on PyPI so all you need is:
 
 .. code-block:: console
 
-   $ pip install invenio-drafts-resources[opensearch1,postgresql]
+   $ pip install invenio-drafts-resources[opensearch2,postgresql]

setup.cfg

@@ -28,19 +28,21 @@ packages = find:
 python_requires = >=3.7
 zip_safe = False
 install_requires =
-    invenio-records-resources>=0.21.3,<0.22.0
+    invenio-records-resources>=0.21.4,<0.22.0
 
 [options.extras_require]
 tests =
     pytest-black>=0.3.0
-    pytest-invenio>=2.0.0,<3.0.0
+    pytest-invenio>=2.1.0,<3.0.0
     invenio-app>=1.3.1,<2.0.0
     Sphinx>=4.5.0
     invenio-db[mysql,postgresql]>=1.0.9,<2.0.0
 elasticsearch7 =
-    invenio-search[elasticsearch7]>=2.0.0,<3.0.0
+    invenio-search[elasticsearch7]>=2.1.0,<3.0.0
 opensearch1 =
-    invenio-search[opensearch1]>=2.0.0,<3.0.0
+    invenio-search[opensearch1]>=2.1.0,<3.0.0
+opensearch2 =
+    invenio-search[opensearch2]>=2.1.0,<3.0.0
 
 [options.entry_points]
 invenio_i18n.translations =

tests/mock_module/mappings/os-v2/__init__.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of Invenio.
+# Copyright (C) 2022 CERN.
+#
+# Invenio-Drafts-Resources is free software; you can redistribute it and/or
+# modify it under the terms of the MIT License; see LICENSE file for more
+# details.
+
+"""OpenSearch version 2 mappings."""

tests/mock_module/mappings/os-v2/draftsresources/__init__.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of Invenio.
+# Copyright (C) 2022 CERN.
+#
+# Invenio-Drafts-Resources is free software; you can redistribute it and/or
+# modify it under the terms of the MIT License; see LICENSE file for more
+# details.
+
+"""OpenSearch version 2 mappings."""

tests/mock_module/mappings/os-v2/draftsresources/drafts/draft-v1.0.0.json

@@ -0,0 +1,72 @@
+{
+  "mappings": {
+    "properties": {
+      "id": {
+        "type": "keyword"
+      },
+      "metadata": {
+        "type": "object",
+        "properties": {
+          "title": {
+            "type": "text"
+          },
+          "type": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "keyword"
+              },
+              "subtype": {
+                "type": "keyword"
+              }
+            }
+          }
+        }
+      },
+      "parent": {
+        "properties": {
+          "id": {
+            "type": "keyword"
+          }
+        }
+      },
+      "created": {
+        "type": "date"
+      },
+      "updated": {
+        "type": "date"
+      },
+      "expires_at": {
+        "type": "date"
+      },
+      "uuid": {
+        "type": "keyword"
+      },
+      "versions": {
+        "properties": {
+          "index": {
+            "type": "integer"
+          },
+          "is_latest": {
+            "type": "boolean"
+          },
+          "is_latest_draft": {
+            "type": "boolean"
+          },
+          "latest_id": {
+            "type": "keyword"
+          },
+          "latest_index": {
+            "type": "integer"
+          },
+          "next_draft_id": {
+            "type": "keyword"
+          }
+        }
+      },
+      "version_id": {
+        "type": "integer"
+      }
+    }
+  }
+}

tests/mock_module/mappings/os-v2/draftsresources/records/record-v1.0.0.json

@@ -0,0 +1,72 @@
+{
+  "mappings": {
+    "properties": {
+      "id": {
+        "type": "keyword"
+      },
+      "parent": {
+        "properties": {
+          "id": {
+            "type": "keyword"
+          }
+        }
+      },
+      "metadata": {
+        "type": "object",
+        "properties": {
+          "title": {
+            "type": "text"
+          },
+          "type": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "keyword"
+              },
+              "subtype": {
+                "type": "keyword"
+              }
+            }
+          }
+        }
+      },
+      "created": {
+        "type": "date"
+      },
+      "updated": {
+        "type": "date"
+      },
+      "expires_at": {
+        "type": "date"
+      },
+      "uuid": {
+        "type": "keyword"
+      },
+      "versions": {
+        "properties": {
+          "index": {
+            "type": "integer"
+          },
+          "is_latest": {
+            "type": "boolean"
+          },
+          "is_latest_draft": {
+            "type": "boolean"
+          },
+          "latest_id": {
+            "type": "keyword"
+          },
+          "latest_index": {
+            "type": "integer"
+          },
+          "next_draft_id": {
+            "type": "keyword"
+          }
+        }
+      },
+      "version_id": {
+        "type": "integer"
+      }
+    }
+  }
+}

tests/records/test_api.py

@@ -263,7 +263,7 @@ def test_draft_indexing(app, db, search, example_draft, indexer):
     assert indexer.index(example_draft)["result"] == "created"
     # Retrieve document from search cluster
     data = current_search_client.get(
-        "draftsresources-drafts-draft-v1.0.0", id=example_draft.id, doc_type="_doc"
+        "draftsresources-drafts-draft-v1.0.0", id=example_draft.id
     )
 
     # Loads the search cluster data and compare