Merge pull request #28 from pcoop/branch1

submitjobs status on errors

Author: matthewpwilson

__tests__/api/BundleDeploy/__snapshots__/BundleDeployer.test.ts.snap

@@ -16,7 +16,7 @@ exports[`BundleDeployer01 should complain if status can't be determined 1`] = `"
 
 exports[`BundleDeployer01 should complain if status can't be determined 2`] = `"DFHDPLOY command completed, but status cannot be determined."`;
 
-exports[`BundleDeployer01 should complain of SYSTSPRT not found 1`] = `"SYSTSPRT output from DFHDPLOY not found."`;
+exports[`BundleDeployer01 should complain of SYSTSPRT not found 1`] = `"SYSTSPRT output from DFHDPLOY not found. Most recent status update: ''."`;
 
 exports[`BundleDeployer01 should complain with missing zOSMF profile for deploy 1`] = `"Expect Error: Required parameter 'hostname' must be defined"`;
 
@@ -220,7 +220,7 @@ UNDEPLOY BUNDLE(12345678)
 "
 `;
 
-exports[`BundleDeployer01 should handle failure during submitjobs processing 1`] = `"Failure occurred submitting DFHDPLOY JCL: Cannot read property 'hostname' of undefined"`;
+exports[`BundleDeployer01 should handle failure during submitjobs processing 1`] = `"Failure occurred submitting DFHDPLOY JCL: 'Cannot read property 'hostname' of undefined'. Most recent status update: ''."`;
 
 exports[`BundleDeployer01 should support long bundledir 1`] = `"DFHRL2037I"`;
 
@@ -250,7 +250,7 @@ DEPLOY BUNDLE(12345678)
 
 exports[`BundleDeployer01 should tolerate empty output from DFHDPLOY 1`] = `"undefined"`;
 
-exports[`BundleDeployer01 should tolerate empty output from DFHDPLOY 2`] = `"DFHDPLOY did not generate any output."`;
+exports[`BundleDeployer01 should tolerate empty output from DFHDPLOY 2`] = `"DFHDPLOY did not generate any output. Most recent status update: ''."`;
 
 exports[`BundleDeployer01 should undeploy successfully 1`] = `"DFHRL2037I"`;
 

__tests__/cli/deploy/bundle/DeployBundle.handler.test.ts

@@ -374,6 +374,9 @@ describe("bundle Handler", () => {
     it("should complain if jobcard omits JOB ", async () => {
         await testJobcardError("//wibble boj", "--jobcard parameter does not have JOB keyword after the jobname. Expected 'JOB' but found 'boj'");
     });
+    it("should complain if jobcard omits JOB 2", async () => {
+        await testJobcardError("//wibble", "--jobcard parameter does not have JOB keyword after the jobname.");
+    });
     it("should complain if zosmf profile not found", async () => {
 
         const params = Object.assign({}, ...[DEFAULT_PARAMETERS]);

src/api/BundleDeploy/BundleDeployer.ts

@@ -11,7 +11,7 @@
 
 "use strict";
 
-import { IHandlerParameters, Logger, ImperativeError, Session } from "@brightside/imperative";
+import { IHandlerParameters, Logger, ImperativeError, Session, ITaskWithStatus, TaskStage } from "@brightside/imperative";
 import { ZosmfSession, SubmitJobs, List } from "@brightside/core";
 import { ParmValidator } from "./ParmValidator";
 
@@ -205,12 +205,17 @@ export class BundleDeployer {
 
   private async submitJCL(jcl: string, session: Session): Promise<string> {
     let spoolOutput: any;
+    const status: ITaskWithStatus = { percentComplete: 0, statusMessage: "", stageName: TaskStage.NOT_STARTED };
     try {
-      spoolOutput = await SubmitJobs.submitJclString(session, jcl,
-                           { jclSource: "", viewAllSpoolContent: true });
+      spoolOutput = await SubmitJobs.submitJclString(session, jcl, {
+                             jclSource: "",
+                             task: status,
+                             viewAllSpoolContent: true
+                           });
     }
     catch (error) {
-      throw new Error("Failure occurred submitting DFHDPLOY JCL: " + error.message);
+      throw new Error("Failure occurred submitting DFHDPLOY JCL: '" + error.message +
+                      "'. Most recent status update: '" + status.statusMessage + "'.");
     }
 
     // Find the output
@@ -224,7 +229,7 @@ export class BundleDeployer {
         logger.debug(file.data);
 
         if (file.data === undefined || file.data.length === 0) {
-          throw new Error("DFHDPLOY did not generate any output.");
+          throw new Error("DFHDPLOY did not generate any output. Most recent status update: '" + status.statusMessage + "'.");
         }
 
         // Did DFHDPLOY fail?
@@ -245,6 +250,6 @@ export class BundleDeployer {
       }
     }
 
-    throw new Error("SYSTSPRT output from DFHDPLOY not found.");
+    throw new Error("SYSTSPRT output from DFHDPLOY not found. Most recent status update: '" + status.statusMessage + "'.");
   }
 }

src/api/BundleDeploy/ParmValidator.ts

@@ -302,6 +302,11 @@ export class ParmValidator {
       throw new Error("--jobcard parameter does not start with a suitable jobname: '" + jobname + " '");
     }
 
+    // Check that there is a second word
+    if (firstPartParts.length < 2) {
+      throw new Error("--jobcard parameter does not have JOB keyword after the jobname.");
+    }
+
     // check the second word is 'JOB'
     const jobkeyword = firstPartParts[1].trim();
     if (jobkeyword !== "JOB") {