@sap/hdi-deploy - npm Package Compare versions

Comparing version 3.11.11 to 3.11.12

CHANGELOG.md

@@ -0,1 +1,8 @@
+## 3.11.12
+Changes:
+- segfault-handler is no longer installed as a optional dependency - needs to be provided via parallel installation if required
+
+Fixes:
+- check the return code of HDI API calls to correctly detect errors
+
 ## 3.11.11
@@ -2,0 +9,0 @@ Fixes:

deploy.js

@@ -404,2 +404,3 @@ 'use strict';
         });
+        logger.log('Successfully initialized segfault-handler.');
     } catch (e){
@@ -406,0 +407,0 @@ logger.error(`Warning: Could not initialize segfault handler because of: ${e}`);

lib/tasks.js

@@ -9,2 +9,17 @@ 'use strict';
 
+function hdi_callback(callback, calltype='HDI'){
+  return function(error, result){
+    if(error){
+      return callback(error);
+    } else {
+      if (result && result.rc && result.rc === -1) {
+        const e = new Error(`${calltype} call failed!`);
+        e.result = result;
+        return callback(e, result);
+      } else {
+        return callback(null, result);
+      }
+    }
+  };
+}
 
@@ -253,11 +268,8 @@ const messages_hdi = require('./messages.hdi.js');
       tasks.push((callback) => this.container.lock(lockContainerTimeout, [], (e, result) => {
-        if (e) {
-          if (e.code === 258 || e.code === 328) {
-            this.logger.warn(`Locking is not supported by the container or the container cannot be locked due to missing privileges; locking is skipped. (database error ${e.code})`);
-            return callback(null, result);
-          } else {
-            return callback(e);
-          }
+        if (e && (e.code === 258 || e.code === 328)) {
+          this.logger.warn(`Locking is not supported by the container or the container cannot be locked due to missing privileges; locking is skipped. (database error ${e.code})`);
+          return callback(null, result);
         } else {
-          return callback(null, result);
+          // Not the nicest, but...
+          return hdi_callback(callback)(e, result);
         }
@@ -283,3 +295,3 @@ }));
       tasks.push(this.logger.logfnTimerInit('unlocking-container', 'Unlocking the container "%s"...', this.schema));
-      tasks.push((callback) => this.container.unlock(callback));
+      tasks.push((callback) => this.container.unlock(hdi_callback(callback)));
       tasks.push(this.logger.logfnTimerDelta('unlocking-container', 'Unlocking the container "%s"... ok', this.schema));
@@ -354,6 +366,6 @@ return tasks;
       const parameters = [new Parameter('RECURSIVE', 'TRUE'), new Parameter('IGNORE_NON_EXISTING_PATHS', 'TRUE')];
-      tasks.push((callback) => this.container.delete(folders, parameters, callback));
+      tasks.push((callback) => this.container.delete(folders, parameters, hdi_callback(callback, 'DELETE')));
     }
 
-    tasks.push((callback) => this.container.write(this.deployContent, null, callback));
+    tasks.push((callback) => this.container.write(this.deployContent, null, hdi_callback(callback, 'WRITE')));
     tasks.push(this.logger.logfnTimerDelta('synchronizing-files', 'Synchronizing files with the container "%s"... ok', this.schema));
@@ -412,3 +424,3 @@
       async.waterfall([
-        (innerCB) => this.container.status(this.serverTopDirs.map((a) => new Folder(a[0])), null, innerCB),
+        (innerCB) => this.container.status(this.serverTopDirs.map((a) => new Folder(a[0])), null, hdi_callback(innerCB, 'STATUS')),
         (result, innerCB) => {
@@ -487,3 +499,3 @@ const {deployFiles, undeployFiles} = prepareMake(result.results, this.options, this.content);
             (cb) => {
-              this.container.grantContainerSchemaPrivileges(defaultPermissionSet, [], cb);
+              this.container.grantContainerSchemaPrivileges(defaultPermissionSet, [], hdi_callback(cb));
             },
@@ -503,3 +515,3 @@ this.logger.logfnTimerDelta('regrant-default-permissions', 'Regranting default permission set to global role "%s"... ok', containerAccessRoleName)
               const role = new SchemaRole(defaultAccessRoleName, '', containerAccessRoleName);
-              this.container.grantContainerSchemaRoles([role], [], cb);
+              this.container.grantContainerSchemaRoles([role], [], hdi_callback(cb));
             },
@@ -510,3 +522,3 @@ this.logger.logfnTimerDelta('grant-default-role', 'Granting container-local default access role "%s"."%s" to global role "%s"... ok', this.schema, defaultAccessRoleName, containerAccessRoleName),
             (cb) => {
-              this.container.revokeContainerSchemaPrivileges(defaultPermissionSet, [], cb);
+              this.container.revokeContainerSchemaPrivileges(defaultPermissionSet, [], hdi_callback(cb));
             },
@@ -560,3 +572,3 @@ this.logger.logfnTimerDelta('revoke-default-permissions', 'Revoking default permission set from global role "%s"... ok', containerAccessRoleName)
             this.logger.logfnTimerInit('grant-debug-role', 'Granting container-local development debug role "%s"."%s" to global role "%s"...', this.schema, developmentDebugRoleName, containerAccessRoleName),
-            (cb) => this.container.grantContainerSchemaRoles([new SchemaRole(developmentDebugRoleName, '', containerAccessRoleName)], [], cb),
+            (cb) => this.container.grantContainerSchemaRoles([new SchemaRole(developmentDebugRoleName, '', containerAccessRoleName)], [], hdi_callback(cb)),
             this.logger.logfnTimerDelta('grant-debug-role', 'Granting container-local development debug role "%s"."%s" to global role "%s"... ok', this.schema, developmentDebugRoleName, containerAccessRoleName)
@@ -563,0 +575,0 @@ ], callback);

npm-shrinkwrap.json

 {
   "name": "@sap/hdi-deploy",
-  "version": "3.11.11",
+  "version": "3.11.12",
   "lockfileVersion": 1,
@@ -49,15 +49,2 @@ "requires": true,
     },
-    "@types/color-name": {
-      "version": "1.1.1"
-    },
-    "ansi-regex": {
-      "version": "5.0.0"
-    },
-    "ansi-styles": {
-      "version": "4.2.1",
-      "requires": {
-        "@types/color-name": "^1.1.1",
-        "color-convert": "^2.0.1"
-      }
-    },
     "assert-plus": {
@@ -69,141 +56,30 @@ "version": "1.0.0"
     },
-    "bindings": {
-      "version": "1.5.0",
-      "optional": true,
-      "requires": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "camelcase": {
-      "version": "5.3.1"
-    },
-    "cliui": {
-      "version": "6.0.0",
-      "requires": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      }
-    },
-    "color-convert": {
-      "version": "2.0.1",
-      "requires": {
-        "color-name": "~1.1.4"
-      }
-    },
-    "color-name": {
-      "version": "1.1.4"
-    },
-    "commander": {
-      "version": "2.20.3"
-    },
     "core-util-is": {
       "version": "1.0.2"
     },
-    "decamelize": {
-      "version": "1.2.0"
-    },
-    "emoji-regex": {
-      "version": "8.0.0"
-    },
     "extsprintf": {
       "version": "1.4.0"
     },
-    "file-uri-to-path": {
-      "version": "1.0.0",
-      "optional": true
-    },
-    "find-up": {
-      "version": "4.1.0",
-      "requires": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
-    "get-caller-file": {
-      "version": "2.0.5"
-    },
     "handlebars": {
-      "version": "4.7.4",
+      "version": "4.7.6",
       "requires": {
+        "minimist": "^1.2.5",
         "neo-async": "^2.6.0",
         "source-map": "^0.6.1",
         "uglify-js": "^3.1.4",
-        "yargs": "^15.3.1"
+        "wordwrap": "^1.0.0"
       }
     },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0"
+    "minimist": {
+      "version": "1.2.5"
     },
-    "locate-path": {
-      "version": "5.0.0",
-      "requires": {
-        "p-locate": "^4.1.0"
-      }
-    },
-    "nan": {
-      "version": "2.14.1",
-      "optional": true
-    },
     "neo-async": {
-      "version": "2.6.1"
+      "version": "2.6.2"
     },
-    "p-limit": {
-      "version": "2.3.0",
-      "requires": {
-        "p-try": "^2.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "4.1.0",
-      "requires": {
-        "p-limit": "^2.2.0"
-      }
-    },
-    "p-try": {
-      "version": "2.2.0"
-    },
-    "path-exists": {
-      "version": "4.0.0"
-    },
-    "require-directory": {
-      "version": "2.1.1"
-    },
-    "require-main-filename": {
-      "version": "2.0.0"
-    },
-    "segfault-handler": {
-      "version": "1.3.0",
-      "optional": true,
-      "requires": {
-        "bindings": "^1.2.1",
-        "nan": "^2.14.0"
-      }
-    },
-    "set-blocking": {
-      "version": "2.0.0"
-    },
     "source-map": {
       "version": "0.6.1"
     },
-    "string-width": {
-      "version": "4.2.0",
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
-      }
-    },
-    "strip-ansi": {
-      "version": "6.0.0",
-      "requires": {
-        "ansi-regex": "^5.0.0"
-      }
-    },
     "uglify-js": {
-      "version": "3.9.4",
-      "optional": true,
-      "requires": {
-        "commander": "~2.20.3"
-      }
+      "version": "3.10.0",
+      "optional": true
     },
@@ -218,40 +94,6 @@ "verror": {
     },
-    "which-module": {
-      "version": "2.0.0"
-    },
-    "wrap-ansi": {
-      "version": "6.2.0",
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      }
-    },
-    "y18n": {
-      "version": "4.0.0"
-    },
-    "yargs": {
-      "version": "15.3.1",
-      "requires": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.1"
-      }
-    },
-    "yargs-parser": {
-      "version": "18.1.3",
-      "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
+    "wordwrap": {
+      "version": "1.0.0"
     }
   }
 }

package.json

@@ -1,1 +0,58 @@
-{"bundleDependencies":false,"dependencies":{"@sap/hana-client":"2.4.182","@sap/hdi":"2.2.5","@sap/xsenv":"2.2.0","async":"3.1.0","handlebars":"4.7.4","segfault-handler":"1.3.0"},"deprecated":false,"description":"HDI content deployment","devDependencies":{"command-line-args":"^4.0.7","command-line-usage":"^4.0.2","eslint":"^4.18.2","filter-node-package":"2.0.0","istanbul":"0.4.5","jshint":"2.9.4","mocha":"3.1.2","node-style":"^2.0.1","rewire":"2.5.2","semver":"^6.1.1","shelljs":"0.6.0","should":"11.1.1","sinon":"1.17.6","uuid":"3.1.0"},"engines":{"node":"^6.9.1 || ^8.0.0 || ^10.0.0 || ^12.0.0"},"main":"deploy.js","name":"@sap/hdi-deploy","optionalDependencies":{"segfault-handler":"1.3.0"},"repository":{},"scripts":{"eslint":"eslint *.js lib/","lint":"jshint *.js lib/ test/","prepare-release":"clean-packages && npm prune --production && ls -al","start":"node deploy.js","test":"test/test-quick.sh","test-all":"test/test-all.sh","test-all-filtered":"test/test-all-filtered.sh","test-all-filtered.win":"test\\test-all-filtered.bat","test-all.js":"node test-all-filtered.js","test-all.win":"test\\test-all.bat","test.js":"node test-quick.js","test.win":"test\\test-quick.bat","wrap":"rm -rf node_modules && rm npm-shrinkwrap.json && npm install && npm dedupe && npm shrinkwrap && clean-shrinkwrap"},"version":"3.11.11","license":"SEE LICENSE IN developer-license-3.1.txt"}
+{
+  "name": "@sap/hdi-deploy",
+  "description": "HDI content deployment",
+  "version": "3.11.12",
+  "repository": {},
+  "main": "deploy.js",
+  "dependencies": {
+    "@sap/hdi": "2.2.5",
+    "@sap/hana-client": "2.4.182",
+    "@sap/xsenv": "2.2.0",
+    "async": "3.1.0",
+    "handlebars": "4.7.6"
+  },
+  "devDependencies": {
+    "command-line-args": "^4.0.7",
+    "command-line-usage": "^4.0.2",
+    "eslint": "^4.18.2",
+    "filter-node-package": "2.0.0",
+    "istanbul": "0.4.5",
+    "jshint": "2.9.4",
+    "mocha": "3.1.2",
+    "node-style": "^2.0.1",
+    "rewire": "2.5.2",
+    "semver": "^6.1.1",
+    "shelljs": "0.6.0",
+    "should": "11.1.1",
+    "sinon": "1.17.6",
+    "uuid": "3.1.0"
+  },
+  "engines": {
+    "node": "^6.9.1 || ^8.0.0 || ^10.0.0 || ^12.0.0"
+  },
+  "files": [
+    "package.json",
+    "lib",
+    "deploy.js",
+    "library.js",
+    "node_modules",
+    "npm-shrinkwrap.json",
+    "README.md",
+    "CHANGELOG.md"
+  ],
+  "scripts": {
+    "start": "node deploy.js",
+    "wrap": "rm -rf node_modules && rm npm-shrinkwrap.json && npm install && npm dedupe && npm shrinkwrap && clean-shrinkwrap",
+    "prepare-release": "clean-packages && npm prune --production && ls -al",
+    "lint": "jshint *.js lib/ test/",
+    "eslint": "eslint *.js lib/",
+    "test": "test/test-quick.sh",
+    "test.js": "node test-quick.js",
+    "test-all.js": "node test-all-filtered.js",
+    "test.win": "test\\test-quick.bat",
+    "test-all": "test/test-all.sh",
+    "test-all.win": "test\\test-all.bat",
+    "test-all-filtered": "test/test-all-filtered.sh",
+    "test-all-filtered.win": "test\\test-all-filtered.bat"
+  }
+}

README.md

@@ -104,3 +104,3 @@ @sap/hdi-deploy
   "dependencies": {
-    "@sap/hdi-deploy": "3.11.11"
+    "@sap/hdi-deploy": "3.11.12"
   },
@@ -519,3 +519,3 @@ "scripts": {
   "dependencies": {
-    "@sap/hdi-deploy": "3.11.11",
+    "@sap/hdi-deploy": "3.11.12",
     "module1": "1.3.1",
@@ -1044,3 +1044,3 @@ "module2": "1.7.0"
         "name": "@sap/hdi-deploy",
-        "version": "3.11.11",
+        "version": "3.11.12",
         "features": {
@@ -1047,0 +1047,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

No License Found

License

(Experimental) License information could not be found.

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

Misc. License Issues

License

(Experimental) A package's licensing information has fine-grained problems.

Found 1 instance in 1 package

Unidentified License

License

(Experimental) Something that seems like a license was found, but its contents could not be matched with a known license.

Found 1 instance in 1 package

Improved metrics

Dependency count

5

decreased by-28.57%

Number of medium license alerts

0

decreased by-100%

License quality

100

increased by25%

Worsened metrics

Total package byte prevSize

448752

decreased by-21.51%

Number of package files

85

decreased by-2.3%

Lines of code

9656

decreased by-1.48%

Dependency changes

• + Addedhandlebars@4.7.6(transitive)

• + Addedminimist@1.2.8(transitive)

• + Addedwordwrap@1.0.0(transitive)

• - Removedsegfault-handler@1.3.0

• - Removedansi-regex@5.0.1(transitive)

• - Removedansi-styles@4.3.0(transitive)

• - Removedbindings@1.5.0(transitive)

• - Removedcamelcase@5.3.1(transitive)

• - Removedcliui@6.0.0(transitive)

• - Removedcolor-convert@2.0.1(transitive)

• - Removedcolor-name@1.1.4(transitive)

• - Removeddecamelize@1.2.0(transitive)

• - Removedemoji-regex@8.0.0(transitive)

• - Removedfile-uri-to-path@1.0.0(transitive)

• - Removedfind-up@4.1.0(transitive)

• - Removedget-caller-file@2.0.5(transitive)

• - Removedhandlebars@4.7.4(transitive)

• - Removedis-fullwidth-code-point@3.0.0(transitive)

• - Removedlocate-path@5.0.0(transitive)

• - Removednan@2.22.0(transitive)

• - Removedp-limit@2.3.0(transitive)

• - Removedp-locate@4.1.0(transitive)

• - Removedp-try@2.2.0(transitive)

• - Removedpath-exists@4.0.0(transitive)

• - Removedrequire-directory@2.1.1(transitive)

• - Removedrequire-main-filename@2.0.0(transitive)

• - Removedsegfault-handler@1.3.0(transitive)

• - Removedset-blocking@2.0.0(transitive)

• - Removedstring-width@4.2.3(transitive)

• - Removedstrip-ansi@6.0.1(transitive)

• - Removedwhich-module@2.0.1(transitive)

• - Removedwrap-ansi@6.2.0(transitive)

• - Removedy18n@4.0.3(transitive)

• - Removedyargs@15.4.1(transitive)

• - Removedyargs-parser@18.1.3(transitive)

• Updatedhandlebars@4.7.6