@cubejs-backend/elasticsearch-driver 0.30.73 → 0.31.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.31.0](https://github.com/cube-js/cube.js/compare/v0.30.75...v0.31.0) (2022-10-03)
+
+
+### Features
+
+* multiple data source ([#5326](https://github.com/cube-js/cube.js/issues/5326)) ([334af8c](https://github.com/cube-js/cube.js/commit/334af8c56cd02ae551844e9d1e9ab5e107fb1555))
+
+
+
+
+
 ## [0.30.73](https://github.com/cube-js/cube.js/compare/v0.30.72...v0.30.73) (2022-09-19)
 
 **Note:** Version bump only for package @cubejs-backend/elasticsearch-driver

package/driver/ElasticSearchDriver.js

@@ -1,41 +1,58 @@
 const { Client } = require('@elastic/elasticsearch');
 const SqlString = require('sqlstring');
+const { getEnv, assertDataSource } = require('@cubejs-backend/shared');
 const { BaseDriver } = require('@cubejs-backend/base-driver');
 
+/**
+ * ElasticSearch driver class.
+ */
 class ElasticSearchDriver extends BaseDriver {
   /**
    * Returns default concurrency value.
+   * @return {number}
    */
   static getDefaultConcurrency() {
     return 2;
   }
 
+  /**
+   * Class constructor.
+   */
   constructor(config = {}) {
     super();
 
+    const dataSource =
+      config.dataSource ||
+      assertDataSource('default');
+
     const auth = {
-      username: process.env.CUBEJS_DB_USER,
-      password: process.env.CUBEJS_DB_PASS,
+      username: getEnv('dbUser', { dataSource }),
+      password: getEnv('dbPass', { dataSource }),
     };
-
-    if (process.env.CUBEJS_DB_ELASTIC_APIKEY_ID || process.env.CUBEJS_DB_ELASTIC_APIKEY_KEY) {
+    if (
+      getEnv('elasticApiId', { dataSource }) ||
+      getEnv('elasticApiKey', { dataSource })
+    ) {
       auth.apiKey = {
-        id: process.env.CUBEJS_DB_ELASTIC_APIKEY_ID,
-        api_key: process.env.CUBEJS_DB_ELASTIC_APIKEY_KEY
+        id: getEnv('elasticApiId', { dataSource }),
+        api_key: getEnv('elasticApiKey', { dataSource }),
       };
     }
 
-    // TODO: This config applies to AWS ES, Elastic.co ES, Native ES and OpenDistro ES
-    // They have different dialects according to their respective documentation
+    // TODO: This config applies to AWS ES, Elastic.co ES, Native ES
+    // and OpenDistro ES. They have different dialects according to
+    // their respective documentation.
     this.config = {
-      url: process.env.CUBEJS_DB_URL,
-      ssl: this.getSslOptions(),
       auth,
+      url: getEnv('dbUrl', { dataSource }),
+      ssl: this.getSslOptions(dataSource),
       openDistro:
-        (process.env.CUBEJS_DB_ELASTIC_OPENDISTRO || 'false').toLowerCase() === 'true' ||
-        process.env.CUBEJS_DB_TYPE === 'odelasticsearch',
-      queryFormat: process.env.CUBEJS_DB_ELASTIC_QUERY_FORMAT || 'jdbc',
-      ...config
+        (getEnv('elasticOpenDistro', { dataSource }) || 'false')
+          .toLowerCase() === 'true' ||
+        getEnv('dbType', { dataSource }) === 'odelasticsearch',
+      queryFormat:
+        getEnv('elasticQueryFormat', { dataSource }) || 'jdbc',
+      ...config,
     };
 
     this.client = new Client({
@@ -57,6 +74,8 @@ class ElasticSearchDriver extends BaseDriver {
   }
 
   static driverEnvVariables() {
+    // TODO (buntarb): check how this method can/must be used with split
+    // names by the data source.
     return [
       'CUBEJS_DB_URL',
       'CUBEJS_DB_ELASTIC_QUERY_FORMAT',

package/package.json

@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/elasticsearch-driver",
   "description": "Cube.js elasticsearch database driver",
   "author": "Cube Dev, Inc.",
-  "version": "0.30.73",
+  "version": "0.31.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.js.git",
@@ -23,13 +23,14 @@
     "driver"
   ],
   "dependencies": {
-    "@cubejs-backend/base-driver": "^0.30.73",
+    "@cubejs-backend/base-driver": "^0.31.0",
+    "@cubejs-backend/shared": "^0.31.0",
     "@elastic/elasticsearch": "7.12.0",
     "sqlstring": "^2.3.1"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@cubejs-backend/linter": "^0.30.0",
+    "@cubejs-backend/linter": "^0.31.0",
     "@types/jest": "^26.0.20",
     "jest": "^26.6.3",
     "testcontainers": "^8.12"
@@ -47,5 +48,5 @@
       "**/?(*.)+(spec|test|integration).js?(x)"
     ]
   },
-  "gitHead": "d47987e8eab041fd9b5113feb3ab8f35afe38e16"
+  "gitHead": "8cdec759f298fb20c48194254ccc04b6fdad46bf"
 }