display JESMSGLG if SYSTSPRT not found

Author: pcoop

__tests__/api/BundleDeploy/BundleDeployer.test.ts

@@ -133,6 +133,19 @@ describe("BundleDeployer01", () => {
         expect(listSpy).toHaveBeenCalledTimes(2);
         expect(submitSpy).toHaveBeenCalledTimes(1);
     });
+    it("should failover to JESMSGLG if SYSTSPRT not found", async () => {
+
+        const createSpy = jest.spyOn(ZosmfSession, "createBasicZosmfSession").mockImplementationOnce(() => ({}));
+        const listSpy = jest.spyOn(List, "allMembers").mockImplementationOnce(() => ( { val: "DFHDPLOY" }))
+                                                      .mockImplementationOnce(() => ( { val: "EYU9ABSI" }));
+        const submitSpy = jest.spyOn(SubmitJobs, "submitJclString").mockImplementationOnce(() =>
+                                                   [{ddName: "JESMSGLG", stepName: "DFHDPLOY"}] );
+        await runDeployTestWithError();
+
+        expect(createSpy).toHaveBeenCalledTimes(1);
+        expect(listSpy).toHaveBeenCalledTimes(2);
+        expect(submitSpy).toHaveBeenCalledTimes(1);
+    });
     it("should tolerate empty output from DFHDPLOY", async () => {
 
         const createSpy = jest.spyOn(ZosmfSession, "createBasicZosmfSession").mockImplementationOnce(() => ({}));

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

@@ -4,7 +4,7 @@ exports[`BundleDeployer01 should complain if DFHDPLOY ends with an error 1`] = `
 
 exports[`BundleDeployer01 should complain if DFHDPLOY ends with an error 2`] = `"DFHDPLOY stopped processing due to an error."`;
 
-exports[`BundleDeployer01 should complain if SYSTSPRT not found 1`] = `"SYSTSPRT output from DFHDPLOY not found. Most recent status update: 'Submitting DFHDPLOY JCL for the DEPLOY action'."`;
+exports[`BundleDeployer01 should complain if SYSTSPRT not found 1`] = `"SYSTSPRT and JESMSGLG output from DFHDPLOY not found. Most recent status update: 'Submitting DFHDPLOY JCL for the DEPLOY action'."`;
 
 exports[`BundleDeployer01 should complain if cicshlq not found 1`] = `"Validation of --cicshlq dataset failed: Injected CICSHLQ error"`;
 
@@ -30,6 +30,10 @@ exports[`BundleDeployer01 should deploy successfully 1`] = `"Bundle deployment s
 
 exports[`BundleDeployer01 should fail with overlong jobcard 1`] = `"--jobcard parameter section cannot be split into 72 character lines: '//         73CHARS=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1'."`;
 
+exports[`BundleDeployer01 should failover to JESMSGLG if SYSTSPRT not found 1`] = `"undefined"`;
+
+exports[`BundleDeployer01 should failover to JESMSGLG if SYSTSPRT not found 2`] = `"DFHDPLOY command completed in error without generating SYSTSPRT output."`;
+
 exports[`BundleDeployer01 should generate deploy JCL for AVAILABLE 1`] = `
 "//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT
 //DFHDPLOY EXEC PGM=DFHDPLOY,REGION=100M

__tests__/api/BundlePush/BundlePusher.test.ts

@@ -48,8 +48,7 @@ const DEFAULT_PARAMTERS: IHandlerParameters = {
         progress: {
             startBar: jest.fn((parms) => undefined),
             endBar: jest.fn(() => undefined)
-        },
-        consoleText: ""
+        }
     } as any,
     definition: PushBundleDefinition.PushBundleDefinition,
     fullDefinition: PushBundleDefinition.PushBundleDefinition,

src/api/BundleDeploy/BundleDeployer.ts

@@ -343,7 +343,17 @@ export class BundleDeployer {
       }
     }
 
+    // If we haven't found SYSTSPRT then echo JESMSGLG instead
+    for (const file of spoolOutput) {
+      if (file.ddName === "JESMSGLG") {
+        status.stageName = TaskStage.FAILED;
+        // log the error output to the console
+        this.params.response.console.log(file.data);
+        throw new Error("DFHDPLOY command completed in error without generating SYSTSPRT output.");
+      }
+    }
+
     status.stageName = TaskStage.FAILED;
-    throw new Error("SYSTSPRT output from DFHDPLOY not found. Most recent status update: '" + status.statusMessage + "'.");
+    throw new Error("SYSTSPRT and JESMSGLG output from DFHDPLOY not found. Most recent status update: '" + status.statusMessage + "'.");
   }
 }