From 8f4dd8b50926842d6efc4b9600f4a52ef7892de2 Mon Sep 17 00:00:00 2001
From: tirongi <giuseppe.tirone@ext.ec.europa.eu>
Date: Wed, 13 Dec 2023 10:47:39 +0100
Subject: [PATCH] Fix wrong elasti client setup when use custom URL

---
 .../Elasticsearch/Elasticsearch.ts            | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/packages/components/nodes/vectorstores/Elasticsearch/Elasticsearch.ts b/packages/components/nodes/vectorstores/Elasticsearch/Elasticsearch.ts
index 5f3cf20669a..04c90c6b074 100644
--- a/packages/components/nodes/vectorstores/Elasticsearch/Elasticsearch.ts
+++ b/packages/components/nodes/vectorstores/Elasticsearch/Elasticsearch.ts
@@ -183,13 +183,26 @@ const prepareConnectionOptions = (
     } else if (cloudId) {
         let username = getCredentialParam('username', credentialData, nodeData)
         let password = getCredentialParam('password', credentialData, nodeData)
-        elasticSearchClientOptions = {
-            cloud: {
-                id: cloudId
-            },
-            auth: {
-                username: username,
-                password: password
+        if (cloudId.startsWith('http')) {
+            elasticSearchClientOptions = {
+                node: cloudId,
+                auth: {
+                    username: username,
+                    password: password
+                },
+                tls: {
+                    rejectUnauthorized: false
+                }
+            }
+        } else {
+            elasticSearchClientOptions = {
+                cloud: {
+                    id: cloudId
+                },
+                auth: {
+                    username: username,
+                    password: password
+                }
             }
         }
     }