Migrate 'zwe init' actions to templated JCL

bin/commands/init/certificate/.parameters

@@ -1,3 +1,4 @@
 allow-overwrite,allow-overwritten||boolean|||||Allow overwritten existing MVS data set.
 update-config||boolean|||||Whether to update YAML configuration file with initialization result.
 ignore-security-failures||boolean|||||Whether to ignore security setup job failures.
+security-dry-run,dry-run||boolean|||||Generates and prints JCL but does not execute

bin/commands/init/certificate/index.sh

@@ -23,9 +23,28 @@ if [ -z "${prefix}" ]; then
 fi
 # read JCL library and validate
 jcllib=$(read_yaml "${ZWE_CLI_PARAMETER_CONFIG}" ".zowe.setup.dataset.jcllib")
-if [ -z "${jcllib}" ]; then
-  print_error_and_exit "Error ZWEL0157E: Zowe custom JCL library (zowe.setup.dataset.jcllib) is not defined in Zowe YAML configuration file." "" 157
+does_jcl_exist=$(is_data_set_exists "${jcllib}")
+if [ -z "${does_jcl_exist}" ]; then
+  zwecli_inline_execute_command init generate
 fi
+
+# should be created, but may take time to discover.
+if [ -z "${does_jcl_exist}" ]; then
+does_jcl_exist=
+for secs in 1 5 10 ; do
+  does_jcl_exist=$(is_data_set_exists "${jcllib}")
+  if [ -z "${does_jcl_exist}" ]; then
+    sleep ${secs}
+  else
+    break
+  fi
+done
+
+if [ -z "${does_jcl_exist}" ]; then
+  print_error_and_exit "Error ZWEL0999E: ${jcllib} does not exist, cannot run. Run 'zwe init', 'zwe init generate', or submit JCL ${prefix}.SZWESAMP(ZWEGENER) before running this command." "" 999
+fi
+fi
+
 security_product=$(read_yaml "${ZWE_CLI_PARAMETER_CONFIG}" ".zowe.setup.security.product")
 security_users_zowe=$(read_yaml "${ZWE_CLI_PARAMETER_CONFIG}" ".zowe.setup.security.users.zowe")
 security_groups_admin=$(read_yaml "${ZWE_CLI_PARAMETER_CONFIG}" ".zowe.setup.security.groups.admin")

bin/commands/init/generate/.parameters

@@ -0,0 +1 @@
+dry-run||boolean|||||Prints out existing JCL templates but does not generate resolved JCL.

bin/commands/init/generate/cli.ts

@@ -0,0 +1,18 @@
+/*
+  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.
+*/
+
+import * as std from 'cm_std';
+import * as index from './index';
+import * as configmgr from '../../../libs/configmgr';
+
+index.execute(!!std.getenv('ZWE_CLI_PARAMETER_DRY_RUN'));
+
+configmgr.cleanupTempDir();

bin/commands/init/generate/index.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+#######################################################################
+# 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.
+#######################################################################
+
+USE_CONFIGMGR=$(check_configmgr_enabled)
+if [ "${USE_CONFIGMGR}" = "true" ]; then
+  if [ -z "${ZWE_PRIVATE_TMP_MERGED_YAML_DIR}" ]; then
+    # user-facing command, use tmpdir to not mess up workspace permissions
+    export ZWE_PRIVATE_TMP_MERGED_YAML_DIR=1
+  fi
+  _CEE_RUNOPTS="XPLINK(ON),HEAPPOOLS(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/init/generate/cli.js"
+else
+  echo "This command is only available when zowe.useConfigmgr=true"
+fi

bin/commands/init/generate/index.ts

@@ -0,0 +1,59 @@
+/*
+// 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.
+*/
+
+import * as std from 'cm_std';
+import * as os from "cm_os";
+import * as xplatform from "xplatform";
+import * as fs from '../../../libs/fs';
+import * as config from '../../../libs/config';
+import * as common from '../../../libs/common';
+import * as zosFs from '../../../libs/zos-fs';
+import * as zosJes from '../../../libs/zos-jes';
+
+export function execute(dryRun?: boolean) {
+  common.requireZoweYaml();
+  const ZOWE_CONFIG=config.getZoweConfig();
+  const tempFile = fs.createTmpFile();
+  zosFs.copyMvsToUss(ZOWE_CONFIG.zowe.setup.dataset.prefix + '.SZWESAMP(ZWEGENER)', tempFile);
+  let jclContents = xplatform.loadFileUTF8(tempFile, xplatform.AUTO_DETECT);
+
+  jclContents = jclContents.replace(/\{zowe\.setup\.dataset\.prefix\}/gi, ZOWE_CONFIG.zowe.setup.dataset.prefix);
+  jclContents = jclContents.replace(/\{zowe\.runtimeDirectory\}/gi, ZOWE_CONFIG.zowe.runtimeDirectory);
+  let absConfig = fs.convertToAbsolutePath(std.getenv('ZWE_PRIVATE_CONFIG_ORIG'));
+  jclContents = jclContents.replace('FILE <full path to zowe.yaml file>', 'FILE '+absConfig);
+
+  xplatform.storeFileUTF8(tempFile, xplatform.AUTO_DETECT, jclContents);
+
+  common.printMessage(`Template JCL: ${ZOWE_CONFIG.zowe.setup.dataset.prefix + '.SZWESAMP(ZWEGENER)'}`);
+  common.printMessage('--- JCL content ---');
+  common.printMessage(jclContents);
+  common.printMessage('--- End of JCL ---');
+
+  if (dryRun) {
+    common.printMessage('JCL not submitted, command run with dry run flag.');
+    common.printMessage('To perform command, re-run command without dry run flag, or submit the JCL directly.');
+    os.remove(tempFile);
+
+  } else { //TODO can we generate just for one step, or no reason?    
+    common.printMessage('Submitting Job ZWEGENER');
+    const jobid = zosJes.submitJob(tempFile);
+    const result = zosJes.waitForJob(jobid);
+    os.remove(tempFile);
+
+    common.printMessage(`Job completed with RC=${result.rc}`);
+    if (result.rc == 0) {
+      common.printMessage("Zowe JCL generated successfully");
+    } else {
+      common.printMessage(`Zowe JCL generated with errors, check job log. Job completion code=${result.jobcccode}, Job completion text=${result.jobcctext}`);
+    }
+    // print if succesful
+  }
+}

bin/commands/init/index.sh

@@ -87,6 +87,7 @@ else
 fi
 
 ###############################
+zwecli_inline_execute_command init generate
 zwecli_inline_execute_command init mvs
 zwecli_inline_execute_command init vsam
 if [ "${ZWE_CLI_PARAMETER_SKIP_SECURITY_SETUP}" != "true" ]; then

bin/commands/init/mvs/.errors

@@ -2,3 +2,6 @@ ZWEL0157E|157|%s (%s) is not defined in Zowe YAML configuration file.
 ZWEL0300W||%s already exists. This data set member will be overwritten during configuration.
 ZWEL0301W||%s already exists and will not be overwritten. For upgrades, you must use --allow-overwrite.
 ZWEL0158E|158|%s already exists.
+ZWEL0161E|161|Failed to run JCL %s.
+ZWEL0162E|162|Failed to find job %s result.
+ZWEL0163E|163|Job %s ends with code %s.

bin/commands/init/mvs/.parameters

@@ -1 +1,2 @@
 allow-overwrite,allow-overwritten||boolean|||||Allow overwritten existing MVS data set.
+dry-run||boolean|||||Generates and prints JCL but does not execute

bin/commands/init/mvs/index.sh

@@ -1,5 +1,4 @@
 #!/bin/sh
-
 #######################################################################
 # This program and the accompanying materials are made available
 # under the terms of the Eclipse Public License v2.0 which
@@ -15,10 +14,10 @@ print_level1_message "Initialize Zowe custom data sets"
 
 ###############################
 # constants
-cust_ds_list="parmlib|Zowe parameter library|dsntype(library) dsorg(po) recfm(f b) lrecl(80) unit(sysallda) space(15,15) tracks
-jcllib|Zowe JCL library|dsntype(library) dsorg(po) recfm(f b) lrecl(80) unit(sysallda) space(15,15) tracks
-authLoadlib|Zowe authorized load library|dsntype(library) dsorg(po) recfm(u) lrecl(0) blksize(32760) unit(sysallda) space(30,15) tracks
-authPluginLib|Zowe authorized plugin library|dsntype(library) dsorg(po) recfm(u) lrecl(0) blksize(32760) unit(sysallda) space(30,15) tracks"
+cust_ds_list="parmlib|Zowe parameter library
+jcllib|Zowe JCL library
+authLoadlib|Zowe authorized load library
+authPluginLib|Zowe authorized plugin library"
 
 ###############################
 # validation
@@ -30,13 +29,36 @@ if [ -z "${prefix}" ]; then
   print_error_and_exit "Error ZWEL0157E: Zowe dataset prefix (zowe.setup.dataset.prefix) is not defined in Zowe YAML configuration file." "" 157
 fi
 
+jcllib_location=$(read_yaml "${ZWE_CLI_PARAMETER_CONFIG}" ".zowe.setup.dataset.jcllib")
+does_jcl_exist=$(is_data_set_exists "${jcllib_location}(ZWEIMVS)")
+if [ -z "${does_jcl_exist}" ]; then
+  zwecli_inline_execute_command init generate
+fi
+
+# should be created, but may take time to discover.
+if [ -z "${does_jcl_exist}" ]; then
+does_jcl_exist=
+for secs in 1 5 10 ; do
+  does_jcl_exist=$(is_data_set_exists "${jcllib_location}(ZWEIMVS)")
+  if [ -z "${does_jcl_exist}" ]; then
+    sleep ${secs}
+  else
+    break
+  fi
+done
+
+if [ -z "${does_jcl_exist}" ]; then
+  print_error_and_exit "Error ZWEL0999E: ${jcllib_location}(ZWEIMVS) does not exist, cannot run. Run 'zwe init', 'zwe init generate', or submit JCL ${prefix}.SZWESAMP(ZWEGENER) before running this command." "" 999
+fi
+fi
+
+
 ###############################
 # create data sets if they do not exist
 print_message "Create data sets if they do not exist"
 while read -r line; do
   key=$(echo "${line}" | awk -F"|" '{print $1}')
   name=$(echo "${line}" | awk -F"|" '{print $2}')
-  spec=$(echo "${line}" | awk -F"|" '{print $3}')
 
   # read def and validate
   ds=$(read_yaml "${ZWE_CLI_PARAMETER_CONFIG}" ".zowe.setup.dataset.${key}")
@@ -59,56 +81,53 @@ while read -r line; do
       # warning
       print_message "Warning ZWEL0301W: ${ds} already exists and will not be overwritten. For upgrades, you must use --allow-overwrite."
     fi
-  else
-    print_message "Creating ${ds}"
-    create_data_set "${ds}" "${spec}"
-    if [ $? -ne 0 ]; then
-      print_error_and_exit "Error ZWEL0111E: Command aborts with error." "" 111
-    fi
   fi
 done <<EOF
 $(echo "${cust_ds_list}")
 EOF
+
 print_message
 
 if [ "${ds_existence}" = "true" ] &&  [ "${ZWE_CLI_PARAMETER_ALLOW_OVERWRITE}" != "true" ]; then
   print_message "Skipped writing to ${ds}. To write, you must use --allow-overwrite."
+  print_level2_message "Zowe custom data sets initialized with errors."
 else
-  ###############################
-  # copy sample lib members
-  parmlib=$(read_yaml "${ZWE_CLI_PARAMETER_CONFIG}" ".zowe.setup.dataset.parmlib")
-  for ds in ZWESIP00; do
-    print_message "Copy ${prefix}.${ZWE_PRIVATE_DS_SZWESAMP}(${ds}) to ${parmlib}(${ds})"
-    data_set_copy_to_data_set "${prefix}" "${prefix}.${ZWE_PRIVATE_DS_SZWESAMP}(${ds})" "${parmlib}(${ds})" "${ZWE_CLI_PARAMETER_ALLOW_OVERWRITE}"
-    if [ $? -ne 0 ]; then
-      print_error_and_exit "Error ZWEL0111E: Command aborts with error." "" 111
+
+  jcl_contents=$(cat "//'${jcllib_location}(ZWEIMVS)'")
+
+  print_message "Template JCL: ${prefix}.SZWESAMP(ZWEIMVS) , Executable JCL: ${jcllib_location}(ZWEIMVS)"
+  print_message "--- JCL Content ---"
+  print_message "$jcl_contents"
+  print_message "--- End of JCL ---"
+
+  if [ -z "${ZWE_CLI_PARAMETER_DRY_RUN}" ]; then
+    print_message "Submitting Job ZWEIMVS"
+    jobid=$(submit_job "//'${jcllib_location}(ZWEIMVS)'")
+    code=$?
+    if [ ${code} -ne 0 ]; then
+      print_error_and_exit "Error ZWEL0161E: Failed to run JCL ${jcllib_location}(ZWEIMVS)." "" 161
+    fi
+    print_debug "- job id ${jobid}"
+
+    jobstate=$(wait_for_job "${jobid}")
+    code=$?
+    if [ ${code} -eq 1 ]; then
+        print_error_and_exit "Error ZWEL0162E: Failed to find job ${jobid} result." "" 162
     fi
-  done
-
-  ###############################
-  # copy auth lib members
-  # FIXME: data_set_copy_to_data_set cannot be used to copy program?
-  authLoadlib=$(read_yaml "${ZWE_CLI_PARAMETER_CONFIG}" ".zowe.setup.dataset.authLoadlib")
-  if [ -n "${authLoadlib}" ]; then
-    for ds in ZWESIS01 ZWESAUX ZWESISDL; do
-      print_message "Copy components/zss/LOADLIB/${ds} to ${authLoadlib}(${ds})"
-      # data_set_copy_to_data_set "${prefix}" "${prefix}.${ZWE_PRIVATE_DS_SZWEAUTH}(${ds})" "${authLoadlib}(${ds})" "${ZWE_CLI_PARAMETER_ALLOW_OVERWRITE}"
-      copy_to_data_set "${ZWE_zowe_runtimeDirectory}/components/zss/LOADLIB/${ds}" "${authLoadlib}(${ds})" "-X" "${ZWE_CLI_PARAMETER_ALLOW_OVERWRITE}"
-      if [ $? -ne 0 ]; then
-        print_error_and_exit "Error ZWEL0111E: Command aborts with error." "" 111
-      fi
-    done
-    for ds in ZWELNCH; do
-      print_message "Copy components/launcher/bin/zowe_launcher to ${authLoadlib}(${ds})"
-      # data_set_copy_to_data_set "${prefix}" "${prefix}.${ZWE_PRIVATE_DS_SZWEAUTH}(${ds})" "${authLoadlib}(${ds})" "${ZWE_CLI_PARAMETER_ALLOW_OVERWRITE}"
-      copy_to_data_set "${ZWE_zowe_runtimeDirectory}/components/launcher/bin/zowe_launcher" "${authLoadlib}(${ds})" "-X" "${ZWE_CLI_PARAMETER_ALLOW_OVERWRITE}"
-      if [ $? -ne 0 ]; then
-        print_error_and_exit "Error ZWEL0111E: Command aborts with error." "" 111
-      fi
-    done
+    jobname=$(echo "${jobstate}" | awk -F, '{print $2}')
+    jobcctext=$(echo "${jobstate}" | awk -F, '{print $3}')
+    jobcccode=$(echo "${jobstate}" | awk -F, '{print $4}')
+
+    if [ "${code}" -eq 0 ]; then
+      print_level2_message "Zowe custom data sets are initialized successfully."
+    else
+      print_level2_message "Zowe custom data sets initialized with errors."
+    fi
+  else
+    print_message "JCL not submitted, command run with dry run flag."
+    print_message "To perform command, re-run command without dry run flag, or submit the JCL directly"
+    print_level2_message "Command run successfully."
   fi
 fi
 
-###############################
-# exit message
-print_level2_message "Zowe custom data sets are initialized successfully."
+

bin/commands/init/security/.parameters

@@ -1,2 +1,2 @@
-security-dry-run||boolean|||||Whether to dry run security related setup.
+security-dry-run,dry-run||boolean|||||Generates and prints JCL but does not execute
 ignore-security-failures||boolean|||||Whether to ignore security setup job failures.