Skip to content

Commit

Permalink
Fix very oudated workflows refering to an stc ZWESVSTC that does not …
Browse files Browse the repository at this point in the history
…exist anymore, and stop treating ZWELNCH as an optional component. This hasnt been true since zowe 2.0 in 2022. (#3881)

Signed-off-by: 1000TurquoisePogs <[email protected]>
  • Loading branch information
1000TurquoisePogs authored Jul 2, 2024
1 parent c0d6768 commit 3bca6a6
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 53 deletions.
2 changes: 1 addition & 1 deletion workflows/files/ZWECONF.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1356,7 +1356,7 @@ How we want to verify SSL certificates of services. Valid values are:
<!--template-->
</step>
<step name="caching_service_vars" optional="false">
<title>Chaching Service variables</title>
<title>Caching Service variables</title>
<description>Specify the variables for the Caching Service</description>
<step name="caching_service_variables" optional="false">
<title>Main variables for Caching Service</title>
Expand Down
10 changes: 1 addition & 9 deletions workflows/templates/ZWESECUR.properties
Original file line number Diff line number Diff line change
Expand Up @@ -177,15 +177,7 @@ ZISUSER: '#ZWESIUSR'
# Category: General Security
# Description:
# Zowe started task name
ZOWESTC: '#ZWESVSTC'

# ZLNCHSTC
# Label: ZLNCHSTC
# Abstract: Zowe started task name for HA
# Category: General Security
# Description:
# Zowe started task name for HA
ZLNCHSTC: '#ZWESLSTC'
ZOWESTC: '#ZWESLSTC'

# ZISSTC
# Label: ZISSTC
Expand Down
42 changes: 9 additions & 33 deletions workflows/templates/ZWESECUR.vtl
Original file line number Diff line number Diff line change
Expand Up @@ -53,30 +53,26 @@
//* 7) Update the SET ZOWESTC= statement to match the desired
//* Zowe started task name.
//*
//* 8) Update the SET ZLNCHSTC= statement to match the desired
//* Zowe launcher started task name. It is applicable if you
//* run Zowe for high availability.
//*
//* 9) Update the SET ZISSTC= statement to match the desired
//* 8) Update the SET ZISSTC= statement to match the desired
//* ZIS started task name.
//*
//* 10) Update the SET AUXSTC= statement to match the desired
//* 9) Update the SET AUXSTC= statement to match the desired
//* ZIS Auxiliary started task name.
//*
//* 11) Update the SET HLQ= statement to match the desired
//* 10) Update the SET HLQ= statement to match the desired
//* Zowe data set high level qualifier.
//*
//* 12) Update the SET SYSPROG= statement to match the existing
//* 11) Update the SET SYSPROG= statement to match the existing
//* user ID or group used by z/OS system programmers.
//*
//* 13) When not using AUTOUID and AUTOGID to assign z/OS UNIX UID
//* 12) When not using AUTOUID and AUTOGID to assign z/OS UNIX UID
//* and GID values, update the SET *ID= statements to match the
//* desired UID and GID values.
//*
//* 14) When using Top Secret, update the Top Secret specific SET
//* 13) When using Top Secret, update the Top Secret specific SET
//* statements.
//*
//* 15) Customize the commands in the DD statement that matches your
//* 14) Customize the commands in the DD statement that matches your
//* security product so that they meet your system requirements.
//*
//* Note(s):
Expand Down Expand Up @@ -152,7 +148,6 @@
// SET ZOWEUSER=${ZOWEUSER} * userid for Zowe started task
// SET ZISUSER=${ZISUSER} * userid for ZIS started task
// SET ZOWESTC=${ZOWESTC} * Zowe started task name
// SET ZLNCHSTC=${ZLNCHSTC} * Zowe started task name for HA
// SET ZISSTC=${ZISSTC} * ZIS started task name
// SET AUXSTC=${AUXSTC} * ZIS AUX started task name
// SET HLQ=${HLQ} * data set high level qualifier
Expand Down Expand Up @@ -283,12 +278,6 @@
STDATA(USER(&ZOWEUSER.) GROUP(&STCGRP.) TRUSTED(NO)) -
DATA('ZOWE MAIN SERVER')

/* started task for ZOWE Launcher in high availability */
RLIST STARTED &ZLNCHSTC..* ALL STDATA
RDEFINE STARTED &ZLNCHSTC..* -
STDATA(USER(&ZOWEUSER.) GROUP(&STCGRP.) TRUSTED(NO)) -
DATA('ZOWE LAUNCHER SERVER')

/* started task for ZIS cross memory server */
RLIST STARTED &ZISSTC..* ALL STDATA
RDEFINE STARTED &ZISSTC..* -
Expand All @@ -308,7 +297,6 @@
LISTUSER &ZOWEUSER. OMVS
LISTUSER &ZISUSER. OMVS
RLIST STARTED &ZOWESTC..* ALL STDATA
RLIST STARTED &ZLNCHSTC..* ALL STDATA
RLIST STARTED &ZISSTC..* ALL STDATA
RLIST STARTED &AUXSTC..* ALL STDATA

Expand Down Expand Up @@ -408,7 +396,8 @@

/* general data set protection */
LISTDSD PREFIX(&HLQ.) ALL
ADDSD '&HLQ..*.**' UACC(READ) DATA('Zowe')
ADDSD '&HLQ..*.**' UACC(READ) -
DATA('Zowe')
PERMIT '&HLQ..*.**' CLASS(DATASET) ACCESS(ALTER) ID(&SYSPROG.)

SETROPTS GENERIC(DATASET) REFRESH
Expand Down Expand Up @@ -520,14 +509,6 @@ GROUP(&STCGRP.) +
STCID(&ZOWESTC.)
F ACF2,REFRESH(STC)
*
* started task for ZOWE Launcher in high availability
*
SET CONTROL(GSO)
INSERT STC.&ZLNCHSTC. LOGONID(&ZOWEUSER.) +
GROUP(&STCGRP.) +
STCID(&ZLNCHSTC.)
F ACF2,REFRESH(STC)
*
* started task for ZIS cross memory server
*
SET CONTROL(GSO)
Expand Down Expand Up @@ -721,11 +702,6 @@ $$
TSS ADD(STC) PROCNAME(&ZOWESTC.) ACID(&ZOWEUSER.)
TSS ADD(&ZOWEUSER.) FAC(STC)

/* started task for ZOWE Launcher in high availability */
TSS LIST(STC) PROCNAME(&ZLNCHSTC.) PREFIX
TSS ADD(STC) PROCNAME(&ZLNCHSTC.) ACID(&ZOWEUSER.)
TSS ADD(&ZOWEUSER.) FAC(STC)

/* started task for ZIS cross memory server */
TSS LIST(STC) PROCNAME(&ZISSTC.) PREFIX
TSS ADD(STC) PROCNAME(&ZISSTC.) ACID(&ZISUSER.)
Expand Down
10 changes: 0 additions & 10 deletions workflows/templates/ZWESECUR.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,15 +122,6 @@
<abstract>Zowe started task name</abstract>
<description>Zowe started task name</description>
<category>General Security</category>
<string multiLine="false" valueMustBeChoice="false">
<default>#ZWESVSTC</default>
</string>
</variable>
<variable name="ZLNCHSTC" scope="instance" visibility="public">
<label>ZLNCHSTC</label>
<abstract>Zowe started task name for HA</abstract>
<description>Zowe started task name for HA</description>
<category>General Security</category>
<string multiLine="false" valueMustBeChoice="false">
<default>#ZWESLSTC</default>
</string>
Expand Down Expand Up @@ -265,7 +256,6 @@
<variableValue name="STCGDEP" noPromptIfSet="false" required="false" scope="instance"/>
<variableValue name="STCUDEP" noPromptIfSet="false" required="false" scope="instance"/>
<variableValue name="FACACID" noPromptIfSet="false" required="false" scope="instance"/>
<variableValue name="ZLNCHSTC" noPromptIfSet="false" required="false" scope="instance"/>
<instructions substitution="false">Run this step to initialize variable values.&lt;br/&gt;
Note(s):&lt;br/&gt;
1. THE USER ID THAT RUNS THIS JOB MUST HAVE SUFFICIENT AUTHORITY &lt;br/&gt;
Expand Down

0 comments on commit 3bca6a6

Please sign in to comment.