@sap/hdi-deploy - npm Package Compare versions

Comparing version 4.8.2 to 4.9.0

CHANGELOG.md

@@ -0,1 +1,6 @@
+## 4.9.0
+Features:
+- only log VCAP_SERVICES of hana service or user-provided service with hana tag 
+- use @sap/hana-client@2.19.18
+
 ## 4.8.2
@@ -2,0 +7,0 @@ Fixes:

deploy.js

@@ -621,4 +621,25 @@ 'use strict';
     if (typeof process.env.VCAP_SERVICES !== 'undefined') {
-      const vcaps = utils.mask_passwords_and_certificates_in_vcaps(JSON.stringify(JSON.parse(process.env.VCAP_SERVICES), null, 2));
-      logger.log('VCAP_SERVICES:', vcaps);
+      logger.log('VCAP_SERVICES: {');
+      const vcaps = JSON.parse(process.env.VCAP_SERVICES);
+      let isItFirstUPS = 0;
+      for (const service in vcaps) {
+        if (service === 'hana') {
+          logger.log(`"hana": ${utils.mask_passwords_and_certificates_in_vcaps(JSON.stringify(JSON.parse(JSON.stringify(vcaps.hana)), null, 2))}`);
+        } else if (service === 'user-provided') {
+          for (let i=0; i<vcaps[service].length; i++) {
+            if (vcaps[service][i].tags.indexOf('hana')!==-1) {
+              isItFirstUPS = isItFirstUPS+1;
+              const user_provided_service = utils.mask_passwords_and_certificates_in_vcaps(JSON.stringify(JSON.parse(JSON.stringify(vcaps[service][i])), null, 2));
+
+              if (isItFirstUPS === 1)
+                logger.log(`"user-provided": ${user_provided_service}`);
+              else
+                logger.log(user_provided_service);
+            }
+          }
+        } else {
+          logger.log('Not a hana service or user-provided service with hana tag');
+        }
+      }
+      logger.log('}');
     } else {
@@ -625,0 +646,0 @@ logger.log('VCAP_SERVICES: undefined');

lib/utils.js

@@ -222,2 +222,6 @@ 'use strict';
   const client_private_key_2_regexp = new RegExp('client_authentication_private_key:.*', 'ig');
+  const client_id_1_regexp = new RegExp('clientid:.*', 'ig');
+  const client_id_2_regexp = new RegExp('"clientid":.*', 'ig');
+  const client_secret_1_regexp = new RegExp('clientsecret:.*', 'ig');
+  const client_secret_2_regexp = new RegExp('"clientsecret":.*', 'ig');
   // eslint-disable-next-line no-control-regex
@@ -229,2 +233,6 @@ const client_private_key_3_regexp = new RegExp('key:(.|\n)*', 'g');
   vcaps = vcaps.replace(client_private_key_2_regexp, 'client_authentication_private_key: [..]');
+  vcaps = vcaps.replace(client_id_1_regexp, 'clientid: [..]');
+  vcaps = vcaps.replace(client_id_2_regexp, '"clientid": [..]');
+  vcaps = vcaps.replace(client_secret_1_regexp, 'clientsecret: [..]');
+  vcaps = vcaps.replace(client_secret_2_regexp, '"clientsecret": [..]');
   vcaps = vcaps.replace(client_private_key_3_regexp, 'key: [..]');
@@ -231,0 +239,0 @@ vcaps = vcaps.replace(client_private_key_4_regexp, '');

npm-shrinkwrap.json

 {
   "name": "@sap/hdi-deploy",
-  "version": "4.8.2",
+  "version": "4.9.0",
   "lockfileVersion": 1,
@@ -8,3 +8,3 @@ "requires": true,
     "@sap/hana-client": {
-      "version": "2.18.24",
+      "version": "2.19.18",
       "requires": {
@@ -39,8 +39,2 @@ "debug": "3.1.0"
       "dependencies": {
-        "assert-plus": {
-          "version": "1.0.0"
-        },
-        "clone": {
-          "version": "2.1.2"
-        },
         "core-util-is": {
@@ -54,25 +48,8 @@ "version": "1.0.2"
           }
-        },
-        "extsprintf": {
-          "version": "1.4.1"
-        },
-        "ms": {
-          "version": "2.1.2"
-        },
-        "node-cache": {
-          "version": "5.1.2",
-          "requires": {
-            "clone": "2.x"
-          }
-        },
-        "verror": {
-          "version": "1.10.0",
-          "requires": {
-            "assert-plus": "^1.0.0",
-            "core-util-is": "1.0.2",
-            "extsprintf": "^1.2.0"
-          }
         }
       }
     },
+    "assert-plus": {
+      "version": "1.0.0"
+    },
     "async": {
@@ -87,5 +64,11 @@ "version": "3.2.3"
     },
+    "clone": {
+      "version": "2.1.2"
+    },
     "dotenv": {
       "version": "10.0.0"
     },
+    "extsprintf": {
+      "version": "1.4.1"
+    },
     "fill-range": {
@@ -132,5 +115,14 @@ "version": "7.0.1",
     },
+    "ms": {
+      "version": "2.1.2"
+    },
     "neo-async": {
       "version": "2.6.2"
     },
+    "node-cache": {
+      "version": "5.1.2",
+      "requires": {
+        "clone": "2.x"
+      }
+    },
     "picomatch": {
@@ -155,2 +147,9 @@ "version": "2.3.1"
     },
+    "verror": {
+      "version": "1.10.0",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "extsprintf": "^1.2.0"
+      }
+    },
     "wordwrap": {
@@ -157,0 +156,0 @@ "version": "1.0.0"

package.json

 {
   "name": "@sap/hdi-deploy",
   "description": "HDI content deployment",
-  "version": "4.8.2",
+  "version": "4.9.0",
   "license": "See LICENSE file",
@@ -9,3 +9,3 @@ "repository": {},
   "dependencies": {
-    "@sap/hana-client": "2.18.24",
+    "@sap/hana-client": "2.19.18",
     "@sap/hdi": "4.5.1",
@@ -12,0 +12,0 @@ "@sap/xsenv": "3.4.0",

README.md

@@ -104,3 +104,3 @@ @sap/hdi-deploy
   "dependencies": {
-    "@sap/hdi-deploy": "4.8.2"
+    "@sap/hdi-deploy": "4.9.0"
   },
@@ -547,3 +547,3 @@ "scripts": {
   "dependencies": {
-    "@sap/hdi-deploy": "4.8.2",
+    "@sap/hdi-deploy": "4.9.0",
     "module1": "1.3.1",
@@ -1082,3 +1082,3 @@ "module2": "1.7.0"
         "name": "@sap/hdi-deploy",
-        "version": "4.8.2",
+        "version": "4.9.0",
         "features": {
@@ -1085,0 +1085,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

507580

increased by0.28%

Lines of code

10766

increased by0.25%

Dependency changes

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

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

• Updated@sap/hana-client@2.19.18