Merge pull request #290 from pcoop/branch1

Tolerate single slash for jobcard

Author: matthewpwilson

__tests__/api/BundleDeploy/BundleDeployer.test.ts

@@ -391,6 +391,14 @@ describe("BundleDeployer01", () => {
         parms.arguments.jobcard = "'//DFHDPLOY JOB DFHDPLOY,'some text',CLASS=A,MSGCLASS=X,TIME=NOLIMIT'";
         await testDeployJCL(parms);
     });
+    it("should tolerate a single leading slash for jobcard", async () => {
+
+        let parms: IHandlerParameters;
+        parms = DEFAULT_PARAMTERS;
+        setCommonParmsForDeployTests(parms);
+        parms.arguments.jobcard = "/DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT";
+        await testDeployJCL(parms);
+    });
     it("should support long bundledir", async () => {
         let parms: IHandlerParameters;
         parms = DEFAULT_PARAMTERS;

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

@@ -578,6 +578,24 @@ UNDEPLOY BUNDLE(12345678)
 "
 `;
 
+exports[`BundleDeployer01 should tolerate a single leading slash for jobcard 1`] = `
+"//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT
+//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);
+*
+DEPLOY BUNDLE(12345678)
+       BUNDLEDIR(1234567890)
+       SCOPE(12345678)
+       STATE(ENABLED)
+/*
+"
+`;
+
 exports[`BundleDeployer01 should tolerate bundledir with extra slasshes 1`] = `
 "//DFHDPLOY JOB DFHDPLOY,CLASS=A,MSGCLASS=X,TIME=NOLIMIT
 //DFHDPLOY EXEC PGM=DFHDPLOY,REGION=100M

src/api/BundleDeploy/ParmValidator.ts

@@ -309,11 +309,19 @@ export class ParmValidator {
 
     // split the jobcard into a comma separated list
     const jobcardParts = params.arguments.jobcard.split(",");
-    const firstPart = jobcardParts[0].trim();
+    let firstPart = jobcardParts[0].trim();
 
     // check that it starts with '//'
     if (firstPart.indexOf("//") !== 0) {
-      throw new Error("--jobcard parameter does not start with //");
+
+      // gitbash can swallow a '/' character. If we only have one then add another.
+      if (firstPart.startsWith("/")) {
+        params.arguments.jobcard = "/" + params.arguments.jobcard;
+        firstPart = "/" + firstPart;
+      }
+      else {
+        throw new Error("--jobcard parameter does not start with //");
+      }
     }
 
     // split the first section of the jobcard into chunks