Merge pull request #43 from pcoop/branch1

line-wrap for jobcard

Author: matthewpwilson

__tests__/api/BundleDeploy/BundleDeployer.test.ts

@@ -200,6 +200,44 @@ describe("BundleDeployer01", () => {
                                   "//         MSGCLASS=X,TIME=NOLIMIT";
         await testDeployJCL(parms);
     });
+    it("should support long line jobcard", async () => {
+
+        let parms: IHandlerParameters;
+        parms = DEFAULT_PARAMTERS;
+        setCommonParmsForDeployTests(parms);
+        parms.arguments.resgroup = "12345678";
+        parms.arguments.jobcard = "//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT,NOEL=ABCDEFGHIJKMNOPQRSTUVWXYZ";
+        await testDeployJCL(parms);
+    });
+    it("should support really long line jobcard", async () => {
+
+        let parms: IHandlerParameters;
+        parms = DEFAULT_PARAMTERS;
+        setCommonParmsForDeployTests(parms);
+        parms.arguments.resgroup = "12345678";
+        parms.arguments.jobcard = "//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT,NOEL=ABCDEFGHIJKMNOPQRSTUVWXYZ," +
+                                  "72CHARS=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz," +
+                                  "ALPHABETIC=ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        await testDeployJCL(parms);
+    });
+    it("should fail with overlong jobcard", async () => {
+
+        let parms: IHandlerParameters;
+        parms = DEFAULT_PARAMTERS;
+        setCommonParmsForDeployTests(parms);
+        parms.arguments.resgroup = "12345678";
+        parms.arguments.jobcard = "//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT,NOEL=ABCDEFGHIJKMNOPQRSTUVWXYZ," +
+                                  "ALPHABETIC=ABCDEFGHIJKLMNOPQRSTUVWXYZ," +
+                                  "73CHARS=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1";
+        let err: Error;
+        try {
+          await testDeployJCL(parms);
+        } catch (e) {
+          err = e;
+        }
+        expect(err).toBeDefined();
+        expect(err.message).toMatchSnapshot();
+    });
     it("should support long bundledir", async () => {
 
         let parms: IHandlerParameters;

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

@@ -30,6 +30,8 @@ exports[`BundleDeployer01 should deploy successfully 1`] = `"DFHRL2012I"`;
 
 exports[`BundleDeployer01 should deploy successfully 2`] = `"DFHDPLOY DEPLOY command successful."`;
 
+exports[`BundleDeployer01 should fail with overlong jobcard 1`] = `"--jobcard parameter section cannot be split into 72 character lines: '//         73CHARS=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1'."`;
+
 exports[`BundleDeployer01 should generate deploy JCL for csdgroup 1`] = `"DFHRL2037I"`;
 
 exports[`BundleDeployer01 should generate deploy JCL for csdgroup 2`] = `
@@ -248,6 +250,33 @@ DEPLOY BUNDLE(12345678)
 "
 `;
 
+exports[`BundleDeployer01 should support long line jobcard 1`] = `"DFHRL2037I"`;
+
+exports[`BundleDeployer01 should support long line jobcard 2`] = `
+"//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT,
+//         NOEL=ABCDEFGHIJKMNOPQRSTUVWXYZ
+//DFHDPLOY EXEC PGM=DFHDPLOY,REGION=100M
+//STEPLIB  DD DISP=SHR,DSN=12345678901234567890123456789012345.SDFHLOAD
+//         DD DISP=SHR,DSN=abcde12345abcde12345abcde12345abcde.SEYUAUTH
+//SYSTSPRT DD SYSOUT=*
+//SYSIN    DD *
+*
+SET CICSPLEX(12345678);
+*
+UNDEPLOY BUNDLE(12345678)
+       SCOPE(12345678)
+       STATE(DISCARDED)
+       RESGROUP(12345678);
+*
+DEPLOY BUNDLE(12345678)
+       BUNDLEDIR(1234567890)
+       SCOPE(12345678)
+       STATE(AVAILABLE)
+       RESGROUP(12345678);
+/*
+"
+`;
+
 exports[`BundleDeployer01 should support multi-line jobcard 1`] = `"DFHRL2037I"`;
 
 exports[`BundleDeployer01 should support multi-line jobcard 2`] = `
@@ -275,6 +304,35 @@ DEPLOY BUNDLE(12345678)
 "
 `;
 
+exports[`BundleDeployer01 should support really long line jobcard 1`] = `"DFHRL2037I"`;
+
+exports[`BundleDeployer01 should support really long line jobcard 2`] = `
+"//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT,
+//         NOEL=ABCDEFGHIJKMNOPQRSTUVWXYZ,
+//         72CHARS=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz,
+//         ALPHABETIC=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+//DFHDPLOY EXEC PGM=DFHDPLOY,REGION=100M
+//STEPLIB  DD DISP=SHR,DSN=12345678901234567890123456789012345.SDFHLOAD
+//         DD DISP=SHR,DSN=abcde12345abcde12345abcde12345abcde.SEYUAUTH
+//SYSTSPRT DD SYSOUT=*
+//SYSIN    DD *
+*
+SET CICSPLEX(12345678);
+*
+UNDEPLOY BUNDLE(12345678)
+       SCOPE(12345678)
+       STATE(DISCARDED)
+       RESGROUP(12345678);
+*
+DEPLOY BUNDLE(12345678)
+       BUNDLEDIR(1234567890)
+       SCOPE(12345678)
+       STATE(AVAILABLE)
+       RESGROUP(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. Most recent status update: 'Submitting DFHDPLOY JCL'."`;

src/api/BundleDeploy/ParmValidator.ts

@@ -281,8 +281,32 @@ export class ParmValidator {
       throw new Error("--jobcard parameter is empty");
     }
 
-    // resolve any new line escape sequences embedded in the jobcard
-    params.arguments.jobcard = params.arguments.jobcard.replace("\\n", "\n");
+    // handle long jobcards
+    if (params.arguments.jobcard.indexOf("\\n") === -1) {
+      // if the user hasn't embedded new-line characters into the jobcard
+      // then we'll have to do that ourselves if the value is too long
+      let jobcardLocal = params.arguments.jobcard;
+      let jobcardNew = "";
+      const MAX_JCL_LINE = 71;
+      while (jobcardLocal.length > MAX_JCL_LINE) {
+        const indexOflastComma = jobcardLocal.lastIndexOf(",", MAX_JCL_LINE);
+
+        if (indexOflastComma === -1) {
+          throw new Error("--jobcard parameter section cannot be split into 72 character lines: '" + jobcardLocal + "'.");
+        }
+
+        jobcardNew = jobcardNew + jobcardLocal.substring(0, indexOflastComma + 1) + "\n";
+        jobcardLocal = "//         " + jobcardLocal.substring(indexOflastComma + 1);
+      }
+      jobcardNew = jobcardNew + jobcardLocal;
+      params.arguments.jobcard = jobcardNew;
+    }
+    else {
+      // if the user has embedded new-line characters within the jobcard
+      // then resolve them, the user has taken responsibility for ensuring
+      // line breaks are in suitable places.
+      params.arguments.jobcard = params.arguments.jobcard.replace("\\n", "\n");
+    }
 
     // split the jobcard into a comma separated list
     const jobcardParts = params.arguments.jobcard.split(",");