Merge branch 'feature/v3/jcl' into user/markackert/zwe-tests

Signed-off-by: MarkAckert <[email protected]>
zowe · Jun 4, 2024 · 7679de3 · 7679de3
2 parents 8e016a7 + bc5de91
commit 7679de3
Show file tree

Hide file tree

Showing 20 changed files with 204 additions and 197 deletions.
diff --git a/bin/commands/init/apfauth/index.ts b/bin/commands/init/apfauth/index.ts
@@ -59,13 +59,17 @@ export function execute() {
       common.printTrace(`  * Output:`);
       common.printTrace(stringlib.paddingLeft(jclContent.out, "    "));
 
-      if (!result1.smsManaged) {
+      if (result1.rc === 0 && !result1.smsManaged) {
         let result3 = zosDs.getDatasetVolume(ZOWE_CONFIG.zowe.setup.dataset.authLoadlib);
-        jclContent.out = jclContent.out.replace("export LOADLOC=SMS", `export LOADLOC="VOLUME=${result3.volume}"`);
+        if (result3.volume) {
+          jclContent.out = jclContent.out.replace("export LOADLOC=SMS", `export LOADLOC="VOLUME=${result3.volume}"`);
+        }
       }
-      if (!result2.smsManaged) {
+      if (result2.rc === 0 && !result2.smsManaged) {
         let result4 = zosDs.getDatasetVolume(ZOWE_CONFIG.zowe.setup.dataset.authPluginLib);
-        jclContent.out = jclContent.out.replace("export PLUGLOC=SMS", `export PLUGLOC="VOLUME=${result4.volume}"`);
+        if (result4.volume) {
+          jclContent.out = jclContent.out.replace("export PLUGLOC=SMS", `export PLUGLOC="VOLUME=${result4.volume}"`);
+        }
       }
 
       xplatform.storeFileUTF8(tmpfile, xplatform.AUTO_DETECT, jclContent.out);

diff --git a/bin/libs/configmgr.ts b/bin/libs/configmgr.ts
@@ -400,6 +400,7 @@ function getMemberNameFromConfigPath(configPath: string): string|undefined {
       const memberEnd = configPath.indexOf('))', memberStart+1);
       if (memberEnd == -1) {
         console.log(`Error: malformed PARMLIB syntax for ${configPath}. Must use syntax PARMLIB(dataset.name(member))`);
+        return undefined;
       }
       const thisMember = configPath.substring(memberStart+1, memberEnd);
       if (!member) {

diff --git a/files/SZWEEXEC/ZWEGEN00 b/files/SZWEEXEC/ZWEGEN00
@@ -23,7 +23,7 @@
 ================================================================================
 */
 
-parse arg operation verbosity 
+parse arg operation verbosity
 
 !verbose = COMPARE(verbosity, 'noverbose')
 
@@ -157,7 +157,7 @@ CVTRAC_VAL = STORAGE(CVTRAC_ADDR, 4)
 
 ringType = 0
 
-/* attempt to handle getting only 1 keyring jcl 
+/* attempt to handle getting only 1 keyring jcl
 if WORDINDEX(CFG.zowe.setup.certificate.type, 'JCE') > 0 then do
   if LENGTH(CFG.zowe.setup.certificate.keyring.connect) > 0 then do
     say 'connect exists, it is 'CFG.zowe.setup.certificate.keyring.connect'.'
@@ -172,9 +172,9 @@ if WORDINDEX(CFG.zowe.setup.certificate.type, 'JCE') > 0 then do
     ringType = 1
   end
 else do
-  say 'pkcs12 to be used'  
+  say 'pkcs12 to be used'
 end
-*/  
+*/
 
 if COMPARE('RCVT', CVTRAC_VAL) = 0 then do
   x = DeleteDataSet(jclCopy'(ZWEIKRA1)')
@@ -210,7 +210,7 @@ if COMPARE('ACF2', CVTRAC_VAL) = 0 then do
   x = DeleteDataSet(jclCopy'(ZWEIKRT3)')
   x = DeleteDataSet(jclCopy'(ZWEIKRR1)')
   x = DeleteDataSet(jclCopy'(ZWEIKRR2)')
-  x = DeleteDataSet(jclCopy'(ZWEIKRR3)')      
+  x = DeleteDataSet(jclCopy'(ZWEIKRR3)')
   x = DeleteDataSet(jclCopy'(ZWEIRAC)')
   x = DeleteDataSet(jclCopy'(ZWEIRACZ)')
   x = DeleteDataSet(jclCopy'(ZWEITSS)')
@@ -275,19 +275,21 @@ do i = 1 to members.0
       len = lastChar - firstChar + 1
       if len > 0 then do
         sub = SUBSTR(!contentToRead.j, firstChar, len)
-        call Print 'Substitution found for' sub'.'
-        isFound = 0
-        do n = 1 to members.i.substitutions.0
-          if COMPARE(members.i.substitutions.n, sub) = 0 then do
-            call Print 'Substitution 'sub' already noted. Skipping.'
-            isFound = 1
-            leave
+        if len = length(strip(sub)) then do
+          call Print 'Substitution found for' sub'.'
+          isFound = 0
+          do n = 1 to members.i.substitutions.0
+            if COMPARE(members.i.substitutions.n, sub) = 0 then do
+              call Print 'Substitution 'sub' already noted. Skipping.'
+              isFound = 1
+              leave
+            end
+          end
+          if isFound <> 1 then do
+            k = members.i.substitutions.0 + 1
+            members.i.substitutions.k = sub
+            members.i.substitutions.0 = k
           end
-        end
-        if isFound <> 1 then do
-          k = members.i.substitutions.0 + 1
-          members.i.substitutions.k = sub
-          members.i.substitutions.0 = k
         end
       end
       if lastChar < 0 then do

diff --git a/files/SZWESAMP/ZWECSRVS b/files/SZWESAMP/ZWECSRVS
@@ -1,30 +1,30 @@
-//ZWECSRVS JOB                                                                  
-//*                                                                             
-//* This program and the accompanying materials are made available              
-//* under the terms of the Eclipse Public License v2.0 which                    
-//* accompanies this distribution, and is available at                          
-//* https://www.eclipse.org/legal/epl-v20.html                                  
-//*                                                                             
-//* SPDX-License-Identifier: EPL-2.0                                            
-//*                                                                             
-//* Copyright Contributors to the Zowe Project. 2020, 2020                      
-//*                                                                             
-//*********************************************************************         
-//*                                                                             
-//* This JCL removes the VSAM data set for the Caching Service.                 
-//*                                                                             
-//*                                                                             
-//* CAUTION: This is neither a JCL procedure nor a complete job.                
-//* Before using this JCL, you will have to make the following                  
-//* modifications:                                                              
-//*                                                                             
-//* 1) Add job name and job parameters to the JOB statement, to                 
-//*    meet your system requirements.                                           
-//*                                                                             
-//********************************************************************          
-//RMVSAM   EXEC PGM=IKJEFT01                       
-//SYSTSPRT DD SYSOUT=A                            
-//SYSTSIN  DD *                                    
+//ZWECSRVS JOB
+//*
+//* This program and the accompanying materials are made available
+//* under the terms of the Eclipse Public License v2.0 which
+//* accompanies this distribution, and is available at
+//* https://www.eclipse.org/legal/epl-v20.html
+//*
+//* SPDX-License-Identifier: EPL-2.0
+//*
+//* Copyright Contributors to the Zowe Project. 2020, 2020
+//*
+//*********************************************************************
+//*
+//* This JCL removes the VSAM data set for the Caching Service.
+//*
+//*
+//* CAUTION: This is neither a JCL procedure nor a complete job.
+//* Before using this JCL, you will have to make the following
+//* modifications:
+//*
+//* 1) Add job name and job parameters to the JOB statement, to
+//*    meet your system requirements.
+//*
+//********************************************************************
+//RMVSAM   EXEC PGM=IKJEFT01
+//SYSTSPRT DD SYSOUT=A
+//SYSTSIN  DD *
 DELETE '{zowe.setup.vsam.name}' +
        CLUSTER
-//*                                                                             
+//*
diff --git a/files/SZWESAMP/ZWEIAPF b/files/SZWESAMP/ZWEIAPF
@@ -1,14 +1,14 @@
 //ZWEIAPF JOB
-//*                                                                    
-//* This program and the accompanying materials are made available     
-//* under the terms of the Eclipse Public License v2.0 which          
-//* accompanies this distribution, and is available at                 
-//* https://www.eclipse.org/legal/epl-v20.html                         
-//*                                                                    
-//* SPDX-License-Identifier: EPL-2.0                                   
-//*                                                                    
-//* Copyright Contributors to the Zowe Project. 2020, 2020             
-//*                                                                    
+//*
+//* This program and the accompanying materials are made available
+//* under the terms of the Eclipse Public License v2.0 which
+//* accompanies this distribution, and is available at
+//* https://www.eclipse.org/legal/epl-v20.html
+//*
+//* SPDX-License-Identifier: EPL-2.0
+//*
+//* Copyright Contributors to the Zowe Project. 2020, 2020
+//*
 //*********************************************************************
 //*
 //*  This JCL is used to set APF for the two datasets of Zowe
@@ -29,7 +29,7 @@
 //         SET PLUGLIB='{zowe.setup.dataset.authPluginLib}'
 //         SET PLUGLOC='SMS'
 //*
-//APFLOAD  COMMAND 'SETPROG APF,ADD,DSN=&LOADLIB.,&LOADLOC.' 
-//*   
+//APFLOAD  COMMAND 'SETPROG APF,ADD,DSN=&LOADLIB.,&LOADLOC.'
+//*
 //APFLIB   COMMAND 'SETPROG APF,ADD,DSN=&PLUGLIB.,&PLUGLOC.'
-//*  
+//*
diff --git a/files/SZWESAMP/ZWEIKRA1 b/files/SZWESAMP/ZWEIKRA1
@@ -42,7 +42,7 @@
 //*     signed by a recognized certificate authority (CA).
 //*
 //* 6) If you set zowe.verifyCertificates to
-//*     STRICT or NONSTRICT, then set IFROZFCA to 1 
+//*     STRICT or NONSTRICT, then set IFROZFCA to 1
 //*     to connect z/OSMF certificate authority to Zowe keyring.
 //*
 //* 7) Customize the commands in the DD statement that matches your

diff --git a/files/SZWESAMP/ZWEIKRA2 b/files/SZWESAMP/ZWEIKRA2
@@ -41,7 +41,7 @@
 //*     signed by a recognized certificate authority (CA).
 //*
 //* 6) If you set zowe.verifyCertificates to
-//*     STRICT or NONSTRICT, then set IFROZFCA to 1 
+//*     STRICT or NONSTRICT, then set IFROZFCA to 1
 //*     to connect z/OSMF certificate authority to Zowe keyring.
 //*
 //* 7) Customize the commands in the DD statement that matches your

diff --git a/files/SZWESAMP/ZWEIKRA3 b/files/SZWESAMP/ZWEIKRA3
@@ -41,7 +41,7 @@
 //*     signed by a recognized certificate authority (CA).
 //*
 //* 6) If you set zowe.verifyCertificates to
-//*     STRICT or NONSTRICT, then set IFROZFCA to 1 
+//*     STRICT or NONSTRICT, then set IFROZFCA to 1
 //*     to connect z/OSMF certificate authority to Zowe keyring.
 //*
 //* 7) Customize the commands in the DD statement that matches your

diff --git a/files/SZWESAMP/ZWEIKRR1 b/files/SZWESAMP/ZWEIKRR1
@@ -42,7 +42,7 @@
 //*     signed by a recognized certificate authority (CA).
 //*
 //* 6) If you set zowe.verifyCertificates to
-//*     STRICT or NONSTRICT, then set IFROZFCA to 1 
+//*     STRICT or NONSTRICT, then set IFROZFCA to 1
 //*     to connect z/OSMF certificate authority to Zowe keyring.
 //*
 //* 7) Customize the commands in the DD statement that matches your
@@ -218,7 +218,7 @@ $$
    PERMIT +
    &USERNAME..{zowe.setup.certificate.keyring.name}.LST +
    CLASS(RDATALIB) ID({zowe.setup.security.users.zowe}) +
-   ACCESS(CONTROL) 
+   ACCESS(CONTROL)
 
 /* Uncomment this command to allow other user to access key ring ... */
 /* PERMIT &USERNAME..{zowe.setup.certificate.keyring.name}.LST +    */

diff --git a/files/SZWESAMP/ZWEIKRR2 b/files/SZWESAMP/ZWEIKRR2
@@ -41,7 +41,7 @@
 //*     signed by a recognized certificate authority (CA).
 //*
 //* 6) If you set zowe.verifyCertificates to
-//*     STRICT or NONSTRICT, then set IFROZFCA to 1 
+//*     STRICT or NONSTRICT, then set IFROZFCA to 1
 //*     to connect z/OSMF certificate authority to Zowe keyring.
 //*
 //* 7) Customize the commands in the DD statement that matches your
@@ -185,7 +185,7 @@ $$
    PERMIT +
    &USERNAME..{zowe.setup.certificate.keyring.name}.LST +
    CLASS(RDATALIB) ID({zowe.setup.security.users.zowe}) +
-   ACCESS(CONTROL) 
+   ACCESS(CONTROL)
 
 /* Uncomment this command to allow other user to access key ring ... */
 /* PERMIT &USERNAME..{zowe.setup.certificate.keyring.name}.LST +    */

diff --git a/files/SZWESAMP/ZWEIKRR3 b/files/SZWESAMP/ZWEIKRR3
@@ -42,7 +42,7 @@
 //*     signed by a recognized certificate authority (CA).
 //*
 //* 6) If you set zowe.verifyCertificates to
-//*     STRICT or NONSTRICT, then set IFROZFCA to 1 
+//*     STRICT or NONSTRICT, then set IFROZFCA to 1
 //*     to connect z/OSMF certificate authority to Zowe keyring.
 //*
 //* 7) Customize the commands in the DD statement that matches your
@@ -192,7 +192,7 @@ $$
    PERMIT +
    &USERNAME..{zowe.setup.certificate.keyring.name}.LST +
    CLASS(RDATALIB) ID({zowe.setup.security.users.zowe}) +
-   ACCESS(CONTROL) 
+   ACCESS(CONTROL)
 
 /* Uncomment this command to allow other user to access key ring ... */
 /* PERMIT &USERNAME..{zowe.setup.certificate.keyring.name}.LST +    */

diff --git a/files/SZWESAMP/ZWEIKRT1 b/files/SZWESAMP/ZWEIKRT1
@@ -42,7 +42,7 @@
 //*     signed by a recognized certificate authority (CA).
 //*
 //* 6) If you set zowe.verifyCertificates to
-//*     STRICT or NONSTRICT, then set IFROZFCA to 1 
+//*     STRICT or NONSTRICT, then set IFROZFCA to 1
 //*     to connect z/OSMF certificate authority to Zowe keyring.
 //*
 //* 7) Customize the commands in the DD statement that matches your

diff --git a/files/SZWESAMP/ZWEIKRT2 b/files/SZWESAMP/ZWEIKRT2
@@ -41,7 +41,7 @@
 //*     signed by a recognized certificate authority (CA).
 //*
 //* 6) If you set zowe.verifyCertificates to
-//*     STRICT or NONSTRICT, then set IFROZFCA to 1 
+//*     STRICT or NONSTRICT, then set IFROZFCA to 1
 //*     to connect z/OSMF certificate authority to Zowe keyring.
 //*
 //* 7) Customize the commands in the DD statement that matches your

diff --git a/files/SZWESAMP/ZWEIKRT3 b/files/SZWESAMP/ZWEIKRT3
@@ -41,7 +41,7 @@
 //*     signed by a recognized certificate authority (CA).
 //*
 //* 6) If you set zowe.verifyCertificates to
-//*     STRICT or NONSTRICT, then set IFROZFCA to 1 
+//*     STRICT or NONSTRICT, then set IFROZFCA to 1
 //*     to connect z/OSMF certificate authority to Zowe keyring.
 //*
 //* 7) Customize the commands in the DD statement that matches your

diff --git a/files/SZWESAMP/ZWEIMVS b/files/SZWESAMP/ZWEIMVS
@@ -1,15 +1,15 @@
-//ZWEIMVS JOB                                     
-//*                                                                    
-//* This program and the accompanying materials are made available     
-//* under the terms of the Eclipse Public License v2.0 which          
-//* accompanies this distribution, and is available at                 
-//* https://www.eclipse.org/legal/epl-v20.html                         
-//*                                                                    
-//* SPDX-License-Identifier: EPL-2.0                                   
-//*                                                                    
-//* Copyright Contributors to the Zowe Project. 2020, 2020             
-//*                                                                    
-//********************************************************************* 
+//ZWEIMVS JOB
+//*
+//* This program and the accompanying materials are made available
+//* under the terms of the Eclipse Public License v2.0 which
+//* accompanies this distribution, and is available at
+//* https://www.eclipse.org/legal/epl-v20.html
+//*
+//* SPDX-License-Identifier: EPL-2.0
+//*
+//* Copyright Contributors to the Zowe Project. 2020, 2020
+//*
+//*********************************************************************
 //*
 //* This job is used to create datasets used by a Zowe "instance"
 //* Instances represent a configuration of Zowe, different from the
@@ -19,23 +19,23 @@
 //* Equal to 'zowe.setup.prefix' + 'SZWELOAD',
 //* Then you must also run "ZWEIMVS2".
 //*
-//********************************************************************* 
-//MKPDSE EXEC PGM=IKJEFT01                       
-//SYSTSPRT DD SYSOUT=A                            
-//SYSTSIN DD *                                    
-ALLOC NEW DA('{zowe.setup.dataset.parmlib}') +       
-dsntype(library) dsorg(po) recfm(f b) lrecl(80) + 
-unit(sysallda) space(15,15) tracks                
-  
-ALLOC NEW DA('{zowe.setup.dataset.authPluginLib}') +      
-dsntype(library) dsorg(po) recfm(u) lrecl(0) +    
-blksize(32760) unit(sysallda) space(30,15) tracks 
-//*                                               
-//MEMBCPY EXEC PGM=IEBCOPY                         
-//SYSPRINT DD SYSOUT=A                            
-//SYSUT1 DD DSN={zowe.setup.dataset.prefix}.SZWESAMP,DISP=SHR  
+//*********************************************************************
+//MKPDSE EXEC PGM=IKJEFT01
+//SYSTSPRT DD SYSOUT=A
+//SYSTSIN DD *
+ALLOC NEW DA('{zowe.setup.dataset.parmlib}') +
+dsntype(library) dsorg(po) recfm(f b) lrecl(80) +
+unit(sysallda) space(15,15) tracks
+
+ALLOC NEW DA('{zowe.setup.dataset.authPluginLib}') +
+dsntype(library) dsorg(po) recfm(u) lrecl(0) +
+blksize(32760) unit(sysallda) space(30,15) tracks
+//*
+//MEMBCPY EXEC PGM=IEBCOPY
+//SYSPRINT DD SYSOUT=A
+//SYSUT1 DD DSN={zowe.setup.dataset.prefix}.SZWESAMP,DISP=SHR
 //SYSUT2 DD DSN={zowe.setup.dataset.parmlib},DISP=OLD
-//SYSIN DD *                                      
-  COPY OUTDD=SYSUT2,INDD=SYSUT1                                  
-  SELECT MEMBER=((ZWESIP00,,R))                          
-//*                                               
+//SYSIN DD *
+  COPY OUTDD=SYSUT2,INDD=SYSUT1
+  SELECT MEMBER=((ZWESIP00,,R))
+//*