small changes

Author: nirajprakash

es_data_provider/dist/city_list.js

@@ -49,12 +49,12 @@ const upload = async (bulk) => {
         console.log("Upload 2: ", process.env.CA_64_CRT);
         client = new elasticsearch_1.Client({
             node: process.env.ELASTIC_URL,
-            tls: {
-                ca: Buffer.from(process.env.CA_64_CRT, 'base64').toString('utf8'),
-                checkServerIdentity: (host, cert) => {
-                    return undefined;
-                }
-            },
+            // tls: {
+            //     ca: Buffer.from(process.env.CA_64_CRT, 'base64').toString('utf8'),
+            //     checkServerIdentity: (host, cert) => {
+            //         return undefined
+            //     }
+            // },
             auth: {
                 username: process.env.ELASTIC_USERNAME ?? "",
                 password: process.env.ELASTIC_PASSWORD ?? ""

es_data_provider/dist/event_generator.js

@@ -87,12 +87,12 @@ const clearAndCreate = async () => {
     if (process.env.CA_64_CRT) {
         client = new elasticsearch_1.Client({
             node: process.env.ELASTIC_URL,
-            tls: {
-                ca: Buffer.from(process.env.CA_64_CRT, 'base64').toString('utf8'),
-                checkServerIdentity: (host, cert) => {
-                    return undefined;
-                }
-            },
+            // tls: {
+            //     ca: Buffer.from(process.env.CA_64_CRT, 'base64').toString('utf8'),
+            //     checkServerIdentity : (host, cert) => {
+            //         return undefined
+            //     }
+            // },
             auth: {
                 username: process.env.ELASTIC_USERNAME ?? "",
                 password: process.env.ELASTIC_PASSWORD ?? ""
@@ -170,12 +170,12 @@ const upload = async (bulk) => {
     if (process.env.CA_64_CRT) {
         client = new elasticsearch_1.Client({
             node: process.env.ELASTIC_URL,
-            tls: {
-                ca: Buffer.from(process.env.CA_64_CRT, 'base64').toString('utf8'),
-                checkServerIdentity: (host, cert) => {
-                    return undefined;
-                }
-            },
+            // tls: {
+            //     ca: Buffer.from(process.env.CA_64_CRT, 'base64').toString('utf8'),
+            //     checkServerIdentity : (host, cert) => {
+            //         return undefined
+            //     }
+            // },
             auth: {
                 username: process.env.ELASTIC_USERNAME ?? "",
                 password: process.env.ELASTIC_PASSWORD ?? ""

es_data_provider/scripts/city_list.ts

@@ -77,14 +77,14 @@ const upload = async (bulk: any[]) => {
 
         client = new Client({
             node: process.env.ELASTIC_URL,
-            tls: {
-                ca: Buffer.from(process.env.CA_64_CRT, 'base64').toString('utf8'),
-                checkServerIdentity: (host, cert) => {
-                    return undefined
+            // tls: {
+            //     ca: Buffer.from(process.env.CA_64_CRT, 'base64').toString('utf8'),
+            //     checkServerIdentity: (host, cert) => {
+            //         return undefined
 
-                }
+            //     }
 
-            },
+            // },
             auth: {
                 username: process.env.ELASTIC_USERNAME ?? "",
                 password: process.env.ELASTIC_PASSWORD ?? ""

es_data_provider/scripts/event_generator.ts

@@ -118,13 +118,13 @@ const clearAndCreate = async () =>{
     if (process.env.CA_64_CRT) {
         client = new Client({
             node: process.env.ELASTIC_URL,
-            tls: {
-                ca: Buffer.from(process.env.CA_64_CRT, 'base64').toString('utf8'),
-                checkServerIdentity : (host, cert) => {
-                    return undefined
+            // tls: {
+            //     ca: Buffer.from(process.env.CA_64_CRT, 'base64').toString('utf8'),
+            //     checkServerIdentity : (host, cert) => {
+            //         return undefined
 
-                }
-            },
+            //     }
+            // },
             auth: {
                 username: process.env.ELASTIC_USERNAME ?? "",
                 password: process.env.ELASTIC_PASSWORD ?? ""
@@ -212,13 +212,13 @@ const upload = async (bulk: any[]) => {
     if (process.env.CA_64_CRT) {
         client = new Client({
             node: process.env.ELASTIC_URL,
-            tls: {
-                ca: Buffer.from(process.env.CA_64_CRT, 'base64').toString('utf8'),
-                checkServerIdentity : (host, cert) => {
-                    return undefined
+            // tls: {
+            //     ca: Buffer.from(process.env.CA_64_CRT, 'base64').toString('utf8'),
+            //     checkServerIdentity : (host, cert) => {
+            //         return undefined
 
-                }
-            },
+            //     }
+            // },
             auth: {
                 username: process.env.ELASTIC_USERNAME ?? "",
                 password: process.env.ELASTIC_PASSWORD ?? ""

src/data/elastic/elastic.ts

@@ -48,6 +48,18 @@ function getElasticOptions(): ClientOptions {
                 password: process.env.NEXT_ELASTIC_PASSWORD ?? ""
             }
 
+        };
+    } else if (process.env.NEXT_ELASTIC_USERNAME) {
+
+        console.log("getElasticOptions elastic : ",process.env.NEXT_ELASTIC_URL )
+        return {
+            node: process.env.NEXT_ELASTIC_URL,
+            
+            auth: {
+                username: process.env.NEXT_ELASTIC_USERNAME ?? "",
+                password: process.env.NEXT_ELASTIC_PASSWORD ?? ""
+            }
+
         };
     } else {
        return {