[16.0] [REF] connector_elasticsearch: elasticsearch v8 compatibility

connector_elasticsearch/README.rst

@@ -1,7 +1,3 @@
-.. image:: https://odoo-community.org/readme-banner-image
-   :target: https://odoo-community.org/get-involved?utm_source=readme
-   :alt: Odoo Community Association
-
 =======================
 connector_elasticsearch
 =======================
@@ -17,7 +13,7 @@ connector_elasticsearch
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
     :target: https://odoo-community.org/page/development-status
     :alt: Beta
-.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsearch--engine-lightgray.png?logo=github
@@ -45,6 +41,12 @@ Elasticsearch_ indexes.
 Changelog
 =========
 
+16.0.0.3.0
+~~~~~~~~~~
+
+* elasticsearch v8 compatibility: The connector now supports Elasticsearch
+  v8.*.* versions.
+
 12.0.?.?.? (unreleased)
 ~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -78,6 +80,7 @@ Contributors
 * Raphaël Reverdy <raphael.reverdy@akretion.com>
 * Simone Orsi <simone.orsi@camptocamp.com>
 * Iván Todorovich <ivan.todorovich@camptocamp.com>
+* Thomas Binsfeld <thomas.binsfeld@acsone.eu>
 
 Maintainers
 ~~~~~~~~~~~

connector_elasticsearch/__manifest__.py

@@ -5,7 +5,7 @@
     "name": "connector_elasticsearch",
     "category": "Connector",
     "summary": "Connector For Elasticsearch Search Engine",
-    "version": "16.0.0.2.2",
+    "version": "16.0.0.3.0",
     "license": "AGPL-3",
     "author": "ACSONE SA/NV, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/search-engine",
@@ -15,6 +15,12 @@
     ],
     "demo": ["demo/backend_demo.xml"],
     # TODO: Get latest improvements from elasticsearch library
-    "external_dependencies": {"python": ["elasticsearch>=7.0.0,<=7.13.4", "requests"]},
+    "external_dependencies": {
+        "python": [
+            "elasticsearch>=8.0.0,<9.0.0",
+            "elastic-transport>=8.15.1,<9.0.0",
+            "requests",
+        ]
+    },
     "installable": True,
 }

connector_elasticsearch/i18n/connector_elasticsearch.pot

@@ -141,11 +141,6 @@ msgstr ""
 msgid "Retry on timeout"
 msgstr ""
 
-#. module: connector_elasticsearch
-#: model_terms:ir.ui.view,arch_db:connector_elasticsearch.se_backend_form_view
-msgid "SSL"
-msgstr ""
-
 #. module: connector_elasticsearch
 #: model:ir.model,name:connector_elasticsearch.model_se_backend
 msgid "Se Backend"
@@ -156,11 +151,6 @@ msgstr ""
 msgid "Se Index"
 msgstr ""
 
-#. module: connector_elasticsearch
-#: model:ir.model.fields,field_description:connector_elasticsearch.field_se_backend__ssl
-msgid "Ssl"
-msgstr ""
-
 #. module: connector_elasticsearch
 #: model_terms:ir.ui.view,arch_db:connector_elasticsearch.se_backend_form_view
 msgid "Timeout"
@@ -218,12 +208,6 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#. module: connector_elasticsearch
-#: model:ir.model.fields,help:connector_elasticsearch.field_se_backend__ssl
-msgid ""
-"Verify SSL certificates. Only set to False in development environments."
-msgstr ""
-
 #. module: connector_elasticsearch
 #: model_terms:ir.ui.view,arch_db:connector_elasticsearch.se_backend_form_view
 msgid "http://elastic:9200"

connector_elasticsearch/i18n/it.po

@@ -148,11 +148,6 @@ msgstr "Password"
 msgid "Retry on timeout"
 msgstr "Ritenta al timeout"
 
-#. module: connector_elasticsearch
-#: model_terms:ir.ui.view,arch_db:connector_elasticsearch.se_backend_form_view
-msgid "SSL"
-msgstr "SSL"
-
 #. module: connector_elasticsearch
 #: model:ir.model,name:connector_elasticsearch.model_se_backend
 msgid "Se Backend"
@@ -163,11 +158,6 @@ msgstr "Backend SE"
 msgid "Se Index"
 msgstr "Indice SE"
 
-#. module: connector_elasticsearch
-#: model:ir.model.fields,field_description:connector_elasticsearch.field_se_backend__ssl
-msgid "Ssl"
-msgstr "SSL"
-
 #. module: connector_elasticsearch
 #: model_terms:ir.ui.view,arch_db:connector_elasticsearch.se_backend_form_view
 msgid "Timeout"
@@ -228,12 +218,6 @@ msgstr "Impossibile contattare l'host."
 msgid "User"
 msgstr "Utente"
 
-#. module: connector_elasticsearch
-#: model:ir.model.fields,help:connector_elasticsearch.field_se_backend__ssl
-msgid "Verify SSL certificates. Only set to False in development environments."
-msgstr ""
-"Verifica certificati SSL. Impostare a False solo in ambienti di sviluppo."
-
 #. module: connector_elasticsearch
 #: model_terms:ir.ui.view,arch_db:connector_elasticsearch.se_backend_form_view
 msgid "http://elastic:9200"

connector_elasticsearch/models/se_backend.py

@@ -33,10 +33,6 @@ class SeBackend(models.Model):
     )
     es_user = fields.Char(help="Leave blank if not using http authentication.")
     es_password = fields.Char(help="Leave blank if not using http authentication.")
-    ssl = fields.Boolean(
-        default=True,
-        help="Verify SSL certificates. Only set to False in development environments.",
-    )
     es_timeout = fields.Integer(
         string="Elasticsearch timeout",
         default=10,
@@ -63,7 +59,6 @@ def _server_env_fields(self):
                 "auth_type": {},
                 "es_user": {},
                 "es_password": {},
-                "ssl": {},
                 "api_key_id": {},
                 "api_key": {},
             }

connector_elasticsearch/readme/CONTRIBUTORS.rst

@@ -3,3 +3,4 @@
 * Raphaël Reverdy <raphael.reverdy@akretion.com>
 * Simone Orsi <simone.orsi@camptocamp.com>
 * Iván Todorovich <ivan.todorovich@camptocamp.com>
+* Thomas Binsfeld <thomas.binsfeld@acsone.eu>

connector_elasticsearch/readme/HISTORY.rst

@@ -1,3 +1,9 @@
+16.0.0.3.0
+~~~~~~~~~~
+
+* elasticsearch v8 compatibility: The connector now supports Elasticsearch
+  v8.*.* versions.
+
 12.0.?.?.? (unreleased)
 ~~~~~~~~~~~~~~~~~~~~~~~
 

connector_elasticsearch/static/description/index.html

@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
-<title>README.rst</title>
+<title>connector_elasticsearch</title>
 <style type="text/css">
 
 /*
@@ -360,43 +360,46 @@
 </style>
 </head>
 <body>
-<div class="document">
+<div class="document" id="connector-elasticsearch">
+<h1 class="title">connector_elasticsearch</h1>
 
-
-<a class="reference external image-reference" href="https://odoo-community.org/get-involved?utm_source=readme">
-<img alt="Odoo Community Association" src="https://odoo-community.org/readme-banner-image" />
-</a>
-<div class="section" id="connector-elasticsearch">
-<h1>connector_elasticsearch</h1>
 <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:78a5e739fb7a867f6a968d7a4cae5e9778d3e5b3afa33a598b232e03ceb48b07
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/search-engine/tree/16.0/connector_elasticsearch"><img alt="OCA/search-engine" src="https://img.shields.io/badge/github-OCA%2Fsearch--engine-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/search-engine-16-0/search-engine-16-0-connector_elasticsearch"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/search-engine&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/search-engine/tree/16.0/connector_elasticsearch"><img alt="OCA/search-engine" src="https://img.shields.io/badge/github-OCA%2Fsearch--engine-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/search-engine-16-0/search-engine-16-0-connector_elasticsearch"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/search-engine&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This addon provides the bases to implement addons to export information to
 <a class="reference external" href="https://www.elastic.co/">Elasticsearch</a> indexes.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
 <li><a class="reference internal" href="#changelog" id="toc-entry-1">Changelog</a><ul>
-<li><a class="reference internal" href="#unreleased" id="toc-entry-2">12.0.?.?.? (unreleased)</a></li>
+<li><a class="reference internal" href="#section-1" id="toc-entry-2">16.0.0.3.0</a></li>
+<li><a class="reference internal" href="#unreleased" id="toc-entry-3">12.0.?.?.? (unreleased)</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-4">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-5">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-6">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-7">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-8">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="section" id="changelog">
-<h2><a class="toc-backref" href="#toc-entry-1">Changelog</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-1">Changelog</a></h1>
+<div class="section" id="section-1">
+<h2><a class="toc-backref" href="#toc-entry-2">16.0.0.3.0</a></h2>
+<ul class="simple">
+<li>elasticsearch v8 compatibility: The connector now supports Elasticsearch
+v8.*.* versions.</li>
+</ul>
+</div>
 <div class="section" id="unreleased">
-<h3><a class="toc-backref" href="#toc-entry-2">12.0.?.?.? (unreleased)</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-3">12.0.?.?.? (unreleased)</a></h2>
 <ul class="simple">
 <li>connector_elasticsearch: Makes the config on index required only if the
 index is linked to an elastisearch backend. This change allows the usage
@@ -405,33 +408,34 @@ <h3><a class="toc-backref" href="#toc-entry-2">12.0.?.?.? (unreleased)</a></h3>
 </div>
 </div>
 <div class="section" id="bug-tracker">
-<h2><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/search-engine/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
 <a class="reference external" href="https://github.com/OCA/search-engine/issues/new?body=module:%20connector_elasticsearch%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h2><a class="toc-backref" href="#toc-entry-4">Credits</a></h2>
+<h1><a class="toc-backref" href="#toc-entry-5">Credits</a></h1>
 <div class="section" id="authors">
-<h3><a class="toc-backref" href="#toc-entry-5">Authors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-6">Authors</a></h2>
 <ul class="simple">
 <li>ACSONE SA/NV</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h3><a class="toc-backref" href="#toc-entry-6">Contributors</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
 <ul class="simple">
 <li>Laurent Corron &lt;<a class="reference external" href="mailto:laurentcorron&#64;gmail.com">laurentcorron&#64;gmail.com</a>&gt;</li>
 <li>Laurent Mignon &lt;<a class="reference external" href="mailto:laurent.mignon&#64;acsone.eu">laurent.mignon&#64;acsone.eu</a>&gt;</li>
 <li>Raphaël Reverdy &lt;<a class="reference external" href="mailto:raphael.reverdy&#64;akretion.com">raphael.reverdy&#64;akretion.com</a>&gt;</li>
 <li>Simone Orsi &lt;<a class="reference external" href="mailto:simone.orsi&#64;camptocamp.com">simone.orsi&#64;camptocamp.com</a>&gt;</li>
 <li>Iván Todorovich &lt;<a class="reference external" href="mailto:ivan.todorovich&#64;camptocamp.com">ivan.todorovich&#64;camptocamp.com</a>&gt;</li>
+<li>Thomas Binsfeld &lt;<a class="reference external" href="mailto:thomas.binsfeld&#64;acsone.eu">thomas.binsfeld&#64;acsone.eu</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h3><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h3>
+<h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org">
 <img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
@@ -444,6 +448,5 @@ <h3><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h3>
 </div>
 </div>
 </div>
-</div>
 </body>
 </html>

connector_elasticsearch/tests/cassettes/TestConnectorElasticsearch.test_index_adapter.yaml

@@ -14,7 +14,7 @@ interactions:
       - elasticsearch-py/7.13.4 (Python 3.10.6)
       x-elastic-client-meta:
       - es=7.13.4,py=3.10.6,t=7.13.4,rq=2.28.2,h=bp
-    method: POST
+    method: PUT
     uri: http://elastic:9200/_bulk
   response:
     body:
@@ -24,6 +24,8 @@ interactions:
       - '252'
       content-type:
       - application/json; charset=UTF-8
+      x-elastic-product:
+        - Elasticsearch
     status:
       code: 200
       message: OK

connector_elasticsearch/tests/cassettes/TestConnectorElasticsearch.test_index_adapter_delete.yaml

@@ -18,6 +18,8 @@ interactions:
       - '106'
       content-type:
       - application/json; charset=UTF-8
+      x-elastic-product:
+        - Elasticsearch
     status:
       code: 200
       message: OK
@@ -42,6 +44,8 @@ interactions:
       - '21'
       content-type:
       - application/json; charset=UTF-8
+      x-elastic-product:
+        - Elasticsearch
     status:
       code: 200
       message: OK
@@ -64,6 +68,8 @@ interactions:
       - '569'
       content-type:
       - application/json; charset=UTF-8
+      x-elastic-product:
+        - Elasticsearch
     status:
       code: 404
       message: Not Found
@@ -88,6 +94,8 @@ interactions:
       - '101'
       content-type:
       - application/json; charset=UTF-8
+      x-elastic-product:
+        - Elasticsearch
     status:
       code: 200
       message: OK
@@ -112,6 +120,8 @@ interactions:
       - '21'
       content-type:
       - application/json; charset=UTF-8
+      x-elastic-product:
+        - Elasticsearch
     status:
       code: 200
       message: OK
@@ -138,7 +148,7 @@ interactions:
       - elasticsearch-py/7.13.4 (Python 3.10.6)
       x-elastic-client-meta:
       - es=7.13.4,py=3.10.6,t=7.13.4,rq=2.28.2,h=bp
-    method: POST
+    method: PUT
     uri: http://elastic:9200/_bulk
   response:
     body:
@@ -148,6 +158,8 @@ interactions:
       - '686'
       content-type:
       - application/json; charset=UTF-8
+      x-elastic-product:
+        - Elasticsearch
     status:
       code: 200
       message: OK
@@ -166,7 +178,7 @@ interactions:
       - elasticsearch-py/7.13.4 (Python 3.10.6)
       x-elastic-client-meta:
       - es=7.13.4,py=3.10.6,t=7.13.4,rq=2.28.2,h=bp
-    method: POST
+    method: PUT
     uri: http://elastic:9200/_bulk
   response:
     body:
@@ -176,6 +188,8 @@ interactions:
       - '471'
       content-type:
       - application/json; charset=UTF-8
+      x-elastic-product:
+        - Elasticsearch
     status:
       code: 200
       message: OK
@@ -200,6 +214,8 @@ interactions:
       - '45'
       content-type:
       - application/json; charset=UTF-8
+      x-elastic-product:
+        - Elasticsearch
     status:
       code: 200
       message: OK