@sap/hdi-deploy - npm Package Compare versions

Comparing version 4.2.3 to 4.3.0

CHANGELOG.md

@@ -0,1 +1,7 @@
+## 4.3.0
+Features:
+- allow passing arbitrary parameters to @sap/hana-client
+- use @sap/hdi@4.2.0
+- use @sap/hana-client@2.10.20
+
 ## 4.2.3
@@ -2,0 +8,0 @@ Features:

lib/hana-helper.js

@@ -244,4 +244,4 @@ 'use strict';
  */
-module.exports = function (host, port, user, password, certificate, dbhosts, hostname_in_certificate, validate_certificate, encrypt, client_key, client_cert) {
-  const credentials = enrich_credentials_with_session_variables();
+module.exports = function (host, port, user, password, certificate, dbhosts, hostname_in_certificate, validate_certificate, encrypt, client_key, client_cert, other_parameters) {
+  let credentials = enrich_credentials_with_session_variables();
 
@@ -293,3 +293,8 @@ credentials.user = user;
   }
+  if (other_parameters !== undefined) {
+    logger.trace('other parameters in credentials : ', other_parameters);
+    credentials = { ...credentials, ...other_parameters };
+  }
 
+
   const client = hana_client.createConnection();
@@ -296,0 +301,0 @@

lib/privileges/privilege_utils.js

@@ -268,3 +268,3 @@ 'use strict';
     const action = isGrantAction ? 'grantor' : 'revoker';
-
+    let other_parameters_in_credentials = utils.removeManagedCredentials(creds);
     let host = creds.host;
@@ -293,2 +293,3 @@ let port = creds.port;
       encrypt = targetCreds.encrypt;
+      other_parameters_in_credentials = utils.removeManagedCredentials(targetCreds);
     }
@@ -310,3 +311,3 @@
 
-    const client = hana_helper(host, port, user, password, certificate, hosts, hostname_in_certificate, validate_certificate, encrypt, client_private_key, client_certificate);
+    const client = hana_helper(host, port, user, password, certificate, hosts, hostname_in_certificate, validate_certificate, encrypt, client_private_key, client_certificate, other_parameters_in_credentials);
     connections.push({client, file: __filename});
@@ -313,0 +314,0 @@

lib/utils.js

@@ -237,2 +237,17 @@ 'use strict';
 
+
+/*
+ * remove all the basic credentials which are already passed to hana_helper
+ *
+ * @param {Object} credentials object
+ * @returns {Object} filtered credential object
+ */
+function removeManagedCredentials (credentials) {
+  const remainingCredentialParameters = Object.assign({}, credentials);
+  ['host', 'port', 'user', 'password', 'hdi_user', 'hdi_password', 'certificate', 'db_hosts', 'hostname_in_certificate', 'validate_certificate', 'encrypt', 'client_authentication_private_key', 'client_authentication_certificate', 'accessRole', 'cdsAccessRole', 'schema', 'containerGroup'].forEach(e => delete remainingCredentialParameters[e]);
+  return remainingCredentialParameters;
+}
+
+exports.removeManagedCredentials = removeManagedCredentials;
+
 /**
@@ -239,0 +254,0 @@ * Create a container object with the supplied credentials.

lib/version.container-api.js

@@ -7,2 +7,3 @@ 'use strict';
 const connections = require('./connections');
+const utils = require('./utils');
 
@@ -57,2 +58,3 @@ /**
 function getVersion (credentials, cb) {
+  const other_parameters_in_credentials =  utils.removeManagedCredentials(credentials);
   const client = hana_helper(
@@ -69,3 +71,4 @@ credentials.host,
     credentials.client_authentication_private_key,
-    credentials.client_authentication_certificate
+    credentials.client_authentication_certificate,
+    other_parameters_in_credentials
   );
@@ -72,0 +75,0 @@ connections.push({client, file: __filename});

lib/version.hdi-version.js

@@ -7,2 +7,3 @@ 'use strict';
 const connections = require('./connections');
+const utils = require('./utils');
 
@@ -57,2 +58,3 @@ /**
 function getVersion (credentials, cb) {
+  const other_parameters_in_credentials =  utils.removeManagedCredentials(credentials);
   const client = hana_helper(
@@ -69,3 +71,4 @@ credentials.host,
     credentials.client_authentication_private_key,
-    credentials.client_authentication_certificate
+    credentials.client_authentication_certificate,
+    other_parameters_in_credentials
   );
@@ -72,0 +75,0 @@ connections.push({client, file: __filename});

lib/version.server.js

@@ -7,3 +7,5 @@ 'use strict';
 const connections = require('./connections');
+const utils = require('./utils');
 
+
 /**
@@ -102,2 +104,3 @@ * Class to handle the server version.
 function getVersion (credentials, cb) {
+  const other_parameters_in_credentials =  utils.removeManagedCredentials(credentials);
   const client = hana_helper(
@@ -114,3 +117,4 @@ credentials.host,
     credentials.client_authentication_private_key,
-    credentials.client_authentication_certificate
+    credentials.client_authentication_certificate,
+    other_parameters_in_credentials
   );
@@ -117,0 +121,0 @@ connections.push({client, file: __filename});

npm-shrinkwrap.json

 {
   "name": "@sap/hdi-deploy",
-  "version": "4.2.3",
+  "version": "4.3.0",
   "lockfileVersion": 1,
@@ -8,3 +8,3 @@ "requires": true,
     "@sap/hana-client": {
-      "version": "2.9.28",
+      "version": "2.10.20",
       "requires": {
@@ -26,3 +26,3 @@ "debug": "3.1.0"
     "@sap/hdi": {
-      "version": "4.1.0",
+      "version": "4.2.0",
       "requires": {
@@ -124,3 +124,3 @@ "async": "3.1.0"
     "uglify-js": {
-      "version": "3.14.3",
+      "version": "3.14.4",
       "optional": true
@@ -127,0 +127,0 @@ },

package.json

 {
   "name": "@sap/hdi-deploy",
   "description": "HDI content deployment",
-  "version": "4.2.3",
+  "version": "4.3.0",
   "license": "See LICENSE file",
@@ -9,4 +9,4 @@ "repository": {},
   "dependencies": {
-    "@sap/hana-client": "2.9.28",
-    "@sap/hdi": "4.1.0",
+    "@sap/hana-client": "2.10.20",
+    "@sap/hdi": "4.2.0",
     "@sap/xsenv": "3.1.0",
@@ -13,0 +13,0 @@ "async": "3.1.0",

README.md

@@ -104,3 +104,3 @@ @sap/hdi-deploy
   "dependencies": {
-    "@sap/hdi-deploy": "4.2.3"
+    "@sap/hdi-deploy": "4.3.0"
   },
@@ -545,3 +545,3 @@ "scripts": {
   "dependencies": {
-    "@sap/hdi-deploy": "4.2.3",
+    "@sap/hdi-deploy": "4.3.0",
     "module1": "1.3.1",
@@ -1077,3 +1077,3 @@ "module2": "1.7.0"
         "name": "@sap/hdi-deploy",
-        "version": "4.2.3",
+        "version": "4.3.0",
         "features": {
@@ -1080,0 +1080,0 @@ "info": 2,

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

475297

increased by0.37%

Lines of code

9990

increased by0.28%

Dependency changes

• + Added@sap/hana-client@2.10.20(transitive)

• + Added@sap/hdi@4.2.0(transitive)

• - Removed@sap/hana-client@2.9.28(transitive)

• - Removed@sap/hdi@4.1.0(transitive)

• Updated@sap/hana-client@2.10.20

• Updated@sap/hdi@4.2.0