Merge pull request #80 from pcoop/branch1

Error handling for Create failures

Author: pcoop

__tests__/api/BundlePush/BundlePusher.test.ts

@@ -10,7 +10,7 @@
 */
 
 import { BundlePusher } from "../../../src/api/BundlePush/BundlePusher";
-import { IHandlerParameters } from "@zowe/imperative";
+import { IHandlerParameters, ImperativeError, IImperativeError } from "@zowe/imperative";
 import * as PushBundleDefinition from "../../../src/cli/push/bundle/PushBundle.definition";
 import * as fse from "fs-extra";
 import * as fs from "fs";
@@ -190,6 +190,45 @@ describe("BundlePusher01", () => {
         expect(sshSpy).toHaveBeenCalledTimes(1);
         expect(createSpy).toHaveBeenCalledTimes(1);
     });
+    it("should complain if remote target dir can't be found", async () => {
+        createSpy.mockImplementationOnce(() => {
+          const cause = "{ \"category\": 8, \"rc\": -1, \"reason\": 93651005 }";
+          const impError: IImperativeError = { msg: "Injected Create error", causeErrors: cause };
+          throw new ImperativeError(impError);
+        });
+        await runPushTestWithError("__tests__/__resources__/ExampleBundle01",  false,
+          "The target directory does not exist, consider creating it by issuing: \nzowe zos-uss issue ssh \"mkdir -p /u/ThisDoesNotExist\"");
+
+        expect(zosMFSpy).toHaveBeenCalledTimes(1);
+        expect(sshSpy).toHaveBeenCalledTimes(1);
+        expect(createSpy).toHaveBeenCalledTimes(1);
+    });
+    it("should complain if remote bundle dir not auth", async () => {
+        createSpy.mockImplementationOnce(() => {
+          const cause = "{ \"category\": 8, \"rc\": -1, \"reason\": -276865003 }";
+          const impError: IImperativeError = { msg: "Injected Create error", causeErrors: cause };
+          throw new ImperativeError(impError);
+        });
+        await runPushTestWithError("__tests__/__resources__/ExampleBundle01",  false,
+          "You are not authorized to create the target bundle directory '/u/ThisDoesNotExist/12345678'.");
+
+        expect(zosMFSpy).toHaveBeenCalledTimes(1);
+        expect(sshSpy).toHaveBeenCalledTimes(1);
+        expect(createSpy).toHaveBeenCalledTimes(1);
+    });
+    it("should not complain if remote bundle dir already exists", async () => {
+        createSpy.mockImplementationOnce(() => {
+          const cause = "{ \"category\": 1, \"rc\": 4, \"reason\": 19 }";
+          const impError: IImperativeError = { msg: "Injected Create error", causeErrors: cause };
+          throw new ImperativeError(impError);
+        });
+        await runPushTest("__tests__/__resources__/ExampleBundle01",  false,
+              "PUSH operation completed.");
+
+        expect(zosMFSpy).toHaveBeenCalledTimes(1);
+        expect(sshSpy).toHaveBeenCalledTimes(1);
+        expect(createSpy).toHaveBeenCalledTimes(1);
+    });
     it("should complain if remote bundle dir error", async () => {
         listSpy.mockImplementationOnce(() => { throw new Error( "Injected List error" ); });
         await runPushTestWithError("__tests__/__resources__/ExampleBundle01",  false, "Injected List error");

src/api/BundlePush/BundlePusher.ts

@@ -263,23 +263,38 @@ export class BundlePusher {
 
     const WARNING = 4;
     const ALREADY_EXISTS = 19;
+    const EIGHT = 8;
+    const TARGET_DIR_NOT_EXIST = 93651005;
+    const NO_PERMISSION = -276865003;
     try {
       await Create.uss(zosMFSession, this.params.arguments.bundledir, "directory");
     }
     catch (error) {
-      try {
-        const json = JSON.parse(error.causeErrors);
-        if (json.category === 1 &&
-            json.rc === WARNING &&
-            json.reason === ALREADY_EXISTS) {
-          // if it already exists, no worries
-          return;
+      if (error.causeErrors !== undefined)
+      {
+        const cause = JSON.parse(error.causeErrors);
+
+        // Special case some known errors
+        if (cause !== undefined) {
+          if (cause.category === 1 &&
+              cause.rc === WARNING &&
+              cause.reason === ALREADY_EXISTS) {
+            // if it already exists, no worries
+            return;
+          }
+          if (cause.category === EIGHT &&
+              cause.rc === -1 &&
+              cause.reason === TARGET_DIR_NOT_EXIST) {
+            throw new Error("The target directory does not exist, consider creating it by issuing: \n" +
+                            "zowe zos-uss issue ssh \"mkdir -p " + this.params.arguments.targetdir + "\"");
+          }
+          if (cause.category === EIGHT &&
+              cause.rc === -1 &&
+              cause.reason === NO_PERMISSION) {
+            throw new Error("You are not authorized to create the target bundle directory '" + this.params.arguments.bundledir + "'.");
+          }
         }
       }
-      catch (innerError) {
-        // If this occurs we probably didn't receive an ImperativeError
-      }
-
       throw new Error("A problem occurred attempting to create directory '" + this.params.arguments.bundledir + "'. " +
                       "Problem is: " + error.message);
     }