[IMP] connector_elasticsearch: add http auth + use server env

connector_elasticsearch/models/se_backend.py

@@ -19,6 +19,9 @@ class SeBackend(models.Model):
         string="ElasticSearch host",
         groups="connector_search_engine.group_connector_search_engine_manager",
     )
+    auth_type = fields.Selection(
+        selection=[("http", "HTTP"), ("api_key", "API key")], default="api_key"
+    )
     api_key_id = fields.Char(
         help="Elasticsearch Api Key ID",
         string="Api Key ID",
@@ -28,6 +31,28 @@ class SeBackend(models.Model):
         help="Elasticsearch Api Key",
         groups="connector_search_engine.group_connector_search_engine_manager",
     )
+    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.",
+    )
+
+    @property
+    def _server_env_fields(self):
+        env_fields = super()._server_env_fields
+        env_fields.update(
+            {
+                "es_server_host": {},
+                "auth_type": {},
+                "es_user": {},
+                "es_password": {},
+                "ssl": {},
+                "api_key_id": {},
+                "api_key": {},
+            }
+        )
+        return env_fields
 
     def _get_adapter_class(self):
         if self.backend_type == "elasticsearch":

connector_elasticsearch/tools/adapter.py

@@ -51,16 +51,22 @@
 
     def _get_es_client(self):
         backend = self.backend_record
-        api_key = (
-            (backend.api_key_id, backend.api_key)
-            if backend.api_key_id and backend.api_key
-            else None
-        )
-        return elasticsearch.Elasticsearch(
-            [backend.es_server_host],
-            connection_class=self._es_connection_class,
-            api_key=api_key,
-        )
+        if backend.auth_type == "api_key":
+            api_key = (
+                (backend.api_key_id, backend.api_key)
+                if backend.api_key_id and backend.api_key
+                else None
+            )
+            return elasticsearch.Elasticsearch(
+                [backend.es_server_host],
+                connection_class=self._es_connection_class,
+                api_key=api_key,
+            )
+        if backend.auth_type == "http":
+            auth = (backend.es_user, backend.es_password)
+            return elasticsearch.Elasticsearch(
+                [backend.es_server_host], http_auth=auth, use_ssl=backend.ssl
+            )
 
     def test_connection(self):
         es = self._es_client

connector_elasticsearch/views/se_backend.xml

@@ -12,8 +12,27 @@
                         placeholder="http://elastic:9200"
                         attrs="{'required': [('backend_type', '=', 'elasticsearch')]}"
                     />
-                    <field name="api_key_id" />
-                    <field name="api_key" />
+                    <field name="auth_type" />
+                    <field
+                        name="es_user"
+                        attrs="{'invisible': [('auth_type', '!=', 'http')]}"
+                    />
+                    <field
+                        name="es_password"
+                        attrs="{'invisible': [('auth_type', '!=', 'http')]}"
+                    />
+                    <field
+                        name="ssl"
+                        attrs="{'invisible': [('auth_type', '!=', 'http')]}"
+                    />
+                    <field
+                        name="api_key_id"
+                        attrs="{'invisible': [('auth_type', '!=', 'api_key')]}"
+                    />
+                    <field
+                        name="api_key"
+                        attrs="{'invisible': [('auth_type', '!=', 'api_key')]}"
+                    />
                 </group>
             </group>
         </field>

connector_search_engine/models/se_backend.py

@@ -43,7 +43,7 @@ def _compute_binding_count(self):
 
     @property
     def _server_env_fields(self):
-        return {"index_prefix_name": {}}
+        return {"index_prefix_name": {}, "backend_type": {}}
 
     @api.onchange("tech_name", "index_prefix_name")
     def _onchange_tech_name(self):