Fix zwekring reference and vsam breaking rexx

Signed-off-by: 1000TurquoisePogs <[email protected]>
zowe · Jan 30, 2024 · ebb9f72 · ebb9f72
1 parent e861049
commit ebb9f72
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 deletions.
diff --git a/example-zowe.yaml b/example-zowe.yaml
@@ -40,6 +40,10 @@ zowe:
     dataset:
       # **COMMONLY_CUSTOMIZED**
       # where Zowe MVS data sets will be installed
+      # This prefix is used for the Zowe runtime datasets
+      # Including:
+      #  Auth Load Lib: SZWEAUTH
+      #  Load Lib: SZWELOAD
       prefix: IBMUSER.ZWEV2
       # **COMMONLY_CUSTOMIZED**
       # PROCLIB where Zowe STCs will be copied over
@@ -176,7 +180,6 @@ zowe:
     # certificate:
     #   # Type of certificate storage. Valid values are: JCEKS, JCECCAKS, JCERACFKS, JCECCARACFKS, or JCEHYBRIDRACFKS
     #   type: JCERACFKS
-    #   createZosmfTrust: true
     #   keyring:
     #     # **COMMONLY_CUSTOMIZED**
     #     # keyring name
@@ -254,6 +257,7 @@ zowe:
 
     # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     # VSAM configurations if you are using VSAM as Caching Service storage
+    # This is used in the optional "zwe init vsam" command.
     vsam:
       # VSAM data set with Record-Level-Sharing enabled or not
       # Valid values could be: NONRLS or RLS.
@@ -262,6 +266,8 @@ zowe:
       volume: ""
       # Storage class name if you are using VSAM in RLS mode
       storageClass: ""
+      # Data set name. Must match components.caching-service.storage.vsam.name
+      name: ""
 
   # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
   # **COMMONLY_CUSTOMIZED**

diff --git a/files/SZWESAMP/ZWECSVSM b/files/SZWESAMP/ZWECSVSM
@@ -38,16 +38,16 @@
 //SYSPRINT DD SYSOUT=*                                                          
 //SYSIN    DD *                                                                 
   DEFINE CLUSTER -                                                              
-   (NAME({components.caching-service.storage.vsam.name}) -                      
+   (NAME({zowe.setup.vsam.name}) -                      
 //         DD DDNAME={zowe.setup.vsam.mode}                                     
 //         DD *                                                                 
     REC(80 20) -                                                                
     INDEXED) -                                                                  
-   DATA(NAME({components.caching-service.storage.vsam.name}.DATA) -             
+   DATA(NAME({zowe.setup.vsam.name}.DATA) -             
     RECSZ(4096 4096) -                                                          
     UNIQUE -                                                                    
     KEYS(128 0)) -                                                              
-   INDEX(NAME({components.caching-service.storage.vsam.name}.INDEX) -           
+   INDEX(NAME({zowe.setup.vsam.name}.INDEX) -           
     UNIQUE)                                                                     
 //RLS      DD *                                                                 
     STORCLAS({zowe.setup.vsam.storageClass}) -                                  

diff --git a/files/SZWESAMP/ZWEGENER b/files/SZWESAMP/ZWEGENER
@@ -27,16 +27,14 @@
 //   SPACE=(3120,(20,5,10))
 //*
 //* Replace {zowe.setup.dataset.prefix} with the
-//* HLQ where SMP/E installed data sets are located.
+//* Value as seen in zowe.yaml
 //*
 //SYSPROC  DD   DSN={zowe.setup.dataset.prefix}.SZWEEXEC,DISP=SHR
 //*
-//* Replace {zowe.setup.dataset.loadlib} with the data set
-//* that contains Zowe executables. This data set will have
-//* the suffix 'SZWELOAD'.
-//*
+//* Replace {zowe.setup.dataset.prefix} with the
+//* Value as seen in zowe.yaml
 //*
-//STEPLIB  DD   DSN={zowe.setup.dataset.loadlib},DISP=SHR
+//STEPLIB  DD   DSN={zowe.setup.dataset.prefix}.SZWELOAD,DISP=SHR
 //ISPPLIB  DD   DSN=ISP.SISPPENU,DISP=SHR
 //ISPMLIB  DD   DSN=ISP.SISPMENU,DISP=SHR
 //ISPTLIB  DD   DSN=ISP.SISPTENU,DISP=SHR
@@ -48,7 +46,7 @@
 //* server-common.json
 //*
 //* Replace {zowe.runtimeDirectory} with where your Zowe run time
-//* directory is.
+//* directory is, as seen in zowe.yaml
 //*
 //MYSCHEMA DD   *,DLM=$$
 FILE {zowe.runtimeDirectory}/schemas/zowe-yaml-schema.json

diff --git a/files/SZWESAMP/ZWEKRING b/files/SZWESAMP/ZWEKRING
@@ -179,7 +179,7 @@ $$
             WITHLABEL('{zowe.setup.certificate.keyring.label}.') +
             KEYUSAGE(HANDSHAKE) +
             ALTNAME(IP(&IPADDRES) +
-                DOMAIN('{zowe.externalDomains[0]}')) +
+                DOMAIN('{zowe.externalDomains.0}')) +
             SIGNWITH(CERTAUTH +
                 LABEL('{zowe.setup.certificate.keyring.caLabel}'))
 
@@ -413,7 +413,7 @@ ACF
            EXPIRE(05/01/30) -
            LABEL({zowe.setup.certificate.keyring.label}.) -
            KEYUSAGE(HANDSHAKE) -
-           ALTNAME(IP=&IPADDRES DOMAIN={zowe.externalDomains[0]}) -
+           ALTNAME(IP=&IPADDRES DOMAIN={zowe.externalDomains.0}) -
            SIGNWITH(CERTAUTH.ZOWECA)
 *
 * Connect a Zowe's certificate with the keyring ................... */
@@ -590,7 +590,7 @@ $$
        NADATE(05/01/30) +
        LABLCERT({zowe.setup.certificate.keyring.label}.) +
        KEYUSAGE('HANDSHAKE') +
-       ALTNAME('DOMAIN={zowe.externalDomains[0]}') +
+       ALTNAME('DOMAIN={zowe.externalDomains.0}') +
        SIGNWITH(CERTAUTH,ZOWECA)
 
 /* Connect a Zowe's certificate with the keyring ................... */

diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json
@@ -382,6 +382,10 @@
                 "storageClass": {
                   "type": "string",
                   "description": "Storage class name if you are using VSAM in RLS mode"
+                },
+                "name": {
+                  "type": "string",
+                  "description": "Data set name. Must match components.caching-service.storage.vsam.name"
                 }
               }
             }