detect npm errors

Author: pcoop

__tests__/api/BundlePush/BundlePusher.test.ts

@@ -280,6 +280,22 @@ describe("BundlePusher01", () => {
         expect(membersSpy).toHaveBeenCalledTimes(2);
         expect(submitSpy).toHaveBeenCalledTimes(1);
     });
+    it("should tolerate delete of empty directory", async () => {
+        shellSpy.mockImplementation((session: any, cmd: string, dir: string, stdoutHandler: (data: string) => void) => {
+          stdoutHandler("Injected FSUM9195 empty directory message");
+        });
+
+        await runPushTest("__tests__/__resources__/ExampleBundle01", true,
+              "PUSH operation completed.");
+
+        expect(zosMFSpy).toHaveBeenCalledTimes(1);
+        expect(sshSpy).toHaveBeenCalledTimes(1);
+        expect(createSpy).toHaveBeenCalledTimes(1);
+        expect(listSpy).toHaveBeenCalledTimes(1);
+        expect(shellSpy).toHaveBeenCalledTimes(1);
+        expect(membersSpy).toHaveBeenCalledTimes(2);
+        expect(submitSpy).toHaveBeenCalledTimes(2);
+    });
     it("should handle error with attribs file", async () => {
         existsSpy.mockImplementation((data: string) => {
           if (data.indexOf(".zosattributes") > -1) {
@@ -421,7 +437,8 @@ describe("BundlePusher01", () => {
         });
 
         await runPushTestWithError("__tests__/__resources__/ExampleBundle01", false,
-              "A problem occurred attempting to run 'npm install' in remote directory '/u/ThisDoesNotExist/12345678'. " +
+              "A problem occurred attempting to run 'export PATH=\"$PATH:/usr/lpp/IBM/cnj/IBM/node-latest-os390-s390x/bin\" " +
+              "&& npm install' in remote directory '/u/ThisDoesNotExist/12345678'. " +
               "Problem is: The output from the remote command implied that an error occurred.");
 
         expect(consoleText).toContain("Injected stdout error message");
@@ -455,7 +472,8 @@ describe("BundlePusher01", () => {
         });
 
         await runPushTestWithError("__tests__/__resources__/ExampleBundle01", false,
-              "A problem occurred attempting to run 'npm install' in remote directory '/u/ThisDoesNotExist/12345678'. " +
+              "A problem occurred attempting to run 'export PATH=\"$PATH:/usr/lpp/IBM/cnj/IBM/node-latest-os390-s390x/bin\" " +
+              "&& npm install' in remote directory '/u/ThisDoesNotExist/12345678'. " +
               "Problem is: The output from the remote command implied that an error occurred.");
 
         expect(consoleText).toContain("Injected FSUM7351 not found message");
@@ -470,6 +488,41 @@ describe("BundlePusher01", () => {
         expect(readSpy).toHaveBeenCalledTimes(1);
         expect(uploadSpy).toHaveBeenCalledTimes(1);
     });
+    it("should handle failure of remote npm install with node error", async () => {
+        shellSpy.mockImplementation((session: any, cmd: string, dir: string, stdoutHandler: (data: string) => void) => {
+          if (cmd.indexOf("npm install") > -1) {
+            stdoutHandler("Injected npm ERR! Exit status 1 message");
+          }
+          else {
+            return true;
+          }
+        });
+        existsSpy.mockImplementation((data: string) => {
+          if (data.indexOf(".zosattributes") > -1) {
+            return false;
+          }
+          if (data.indexOf("package.json") > -1) {
+            return true;
+          }
+        });
+
+        await runPushTestWithError("__tests__/__resources__/ExampleBundle01", false,
+              "A problem occurred attempting to run 'export PATH=\"$PATH:/usr/lpp/IBM/cnj/IBM/node-latest-os390-s390x/bin\" " +
+              "&& npm install' in remote directory '/u/ThisDoesNotExist/12345678'. " +
+              "Problem is: The output from the remote command implied that an error occurred.");
+
+        expect(consoleText).toContain("Injected npm ERR! Exit status 1 message");
+        expect(zosMFSpy).toHaveBeenCalledTimes(1);
+        expect(sshSpy).toHaveBeenCalledTimes(1);
+        expect(createSpy).toHaveBeenCalledTimes(1);
+        expect(listSpy).toHaveBeenCalledTimes(1);
+        expect(shellSpy).toHaveBeenCalledTimes(1);
+        expect(membersSpy).toHaveBeenCalledTimes(0);
+        expect(submitSpy).toHaveBeenCalledTimes(0);
+        expect(existsSpy).toHaveBeenCalledTimes(2);
+        expect(readSpy).toHaveBeenCalledTimes(1);
+        expect(uploadSpy).toHaveBeenCalledTimes(1);
+    });
     it("should handle error with remote bundle deploy", async () => {
         submitSpy.mockImplementationOnce(() => { throw new Error("Injected deploy error"); });
 

src/api/BundlePush/BundlePusher.ts

@@ -292,18 +292,27 @@ export class BundlePusher {
 
   private async runNpmInstall(sshSession: SshSession) {
     this.updateStatus("Running npm install for the remote bundle");
-    await this.runSshCommandInRemoteDirectory(sshSession, this.params.arguments.bundledir, "npm install");
+
+    // Attempt to set the PATH for the default location of Node on z/OS. Note,
+    // we might be able to improve this by looking for the location via the
+    // architected .profile within the USSCONFIG structure.
+    const setNodehomeCmd = "export PATH=\"$PATH:/usr/lpp/IBM/cnj/IBM/node-latest-os390-s390x/bin\"";
+    await this.runSshCommandInRemoteDirectory(sshSession, this.params.arguments.bundledir, setNodehomeCmd + " && npm install");
   }
 
   private async runSshCommandInRemoteDirectory(sshSession: SshSession, directory: string, sshCommand: string) {
     try {
       this.sshOutputText = "";
       const shell = await Shell.executeSshCwd(sshSession, sshCommand, directory, this.sshOutput.bind(this));
 
-      // Did the SSH command work? It's unclear how to tell, but for starters let's look for the word
-      // 'error' in the output text.
-      if (this.sshOutputText.toUpperCase().indexOf("ERROR ") > -1 ||
-          this.sshOutputText.toUpperCase().indexOf("FSUM") > -1 ) {
+      // Did the SSH command work? It's unclear how to tell, but for starters let's look for common
+      // signifiers in the output text. Note that FSUM9195 implies that we've tried to delete an
+      // empty directory - that's permitted.
+      const upperCaseOutputText = this.sshOutputText.toUpperCase();
+      if (upperCaseOutputText.indexOf("ERROR ") > -1 ||
+          (upperCaseOutputText.indexOf("FSUM") > -1 &&
+           upperCaseOutputText.indexOf("FSUM9195") === -1) ||
+          upperCaseOutputText.indexOf("ERR!") > -1 ) {
         // if we've not already logged the output, log it now
         if (this.params.arguments.verbose !== true)
         {