Support runing gener if zweimvs is not found, such as in pre-existing…

… jcllib (like smpe case) Signed-off-by: 1000TurquoisePogs <[email protected]>
zowe · May 14, 2024 · bb10e99 · bb10e99
1 parent 319bacb
commit bb10e99
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 71 deletions.
diff --git a/bin/commands/init/apfauth/index.sh b/bin/commands/init/apfauth/index.sh
@@ -11,14 +11,9 @@
 # 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),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/init/apfauth/cli.js"
-else
-  print_error_and_exit "Error ZWEL0316E: Command requires zowe.useConfigmgr=true to use." "" 316
+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),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/init/apfauth/cli.js"
+
diff --git a/bin/commands/init/generate/index.sh b/bin/commands/init/generate/index.sh
@@ -11,13 +11,9 @@
 # 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),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/init/generate/cli.js"
-else
-  print_error_and_exit "Error ZWEL0316E: Command requires zowe.useConfigmgr=true to use." "" 316
+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),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/init/generate/cli.js"
+
diff --git a/bin/commands/init/index.sh b/bin/commands/init/index.sh
@@ -13,14 +13,8 @@
 
 init_missing_yaml_properties
 
-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),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/init/cli.js"
-else
-  print_error_and_exit "Error ZWEL0316E: Command requires zowe.useConfigmgr=true to use." "" 316
+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),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/init/cli.js"
diff --git a/bin/commands/init/mvs/index.sh b/bin/commands/init/mvs/index.sh
@@ -12,14 +12,9 @@
 
 init_missing_yaml_properties
 
-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),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/init/mvs/cli.js"
-else
-  print_error_and_exit "Error ZWEL0316E: Command requires zowe.useConfigmgr=true to use." "" 316
+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),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/init/mvs/cli.js"
+
diff --git a/bin/commands/init/security/index.sh b/bin/commands/init/security/index.sh
@@ -11,14 +11,8 @@
 # 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),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/init/security/cli.js"
-else
-  print_error_and_exit "Error ZWEL0316E: Command requires zowe.useConfigmgr=true to use." "" 316
+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),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/init/security/cli.js"
diff --git a/bin/commands/init/stc/index.sh b/bin/commands/init/stc/index.sh
@@ -11,14 +11,8 @@
 # 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),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/init/stc/cli.js"
-else
-  print_error_and_exit "Error ZWEL0316E: Command requires zowe.useConfigmgr=true to use." "" 316
+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),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/init/stc/cli.js"
diff --git a/bin/commands/init/vsam/index.sh b/bin/commands/init/vsam/index.sh
@@ -11,13 +11,8 @@
 # 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),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/init/vsam/cli.js"
-else
-  print_error_and_exit "Error ZWEL0316E: Command requires zowe.useConfigmgr=true to use." "" 316
+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),HEAPPOOLS64(OFF)" ${ZWE_zowe_runtimeDirectory}/bin/utils/configmgr -script "${ZWE_zowe_runtimeDirectory}/bin/commands/init/vsam/cli.js"
diff --git a/bin/libs/zos.ts b/bin/libs/zos.ts
@@ -72,8 +72,9 @@ export function verifyGeneratedJcl(config:any): string {
   if (!jcllib) {
     return undefined;
   }
-  // read JCL library and validate
-  let doesJclExist: boolean = zosDataset.isDatasetExists(jcllib);
+  const expectedMember = jcllib+'(ZWEIMVS)';
+  // read JCL library and validate using expected member ZWEIMVS (init mvs command)
+  let doesJclExist: boolean = zosDataset.isDatasetExists(expectedMember);
   if (!doesJclExist) {
     initGenerate.execute();
   }
@@ -83,7 +84,7 @@ export function verifyGeneratedJcl(config:any): string {
     const interval = [1,5,10,30];
     for (let i = 0; i < interval.length; i++) {
       let secs = interval[i];
-      doesJclExist=zosDataset.isDatasetExists(jcllib);
+      doesJclExist=zosDataset.isDatasetExists(expectedMember);
       if (!doesJclExist) {
         os.sleep(secs*1000);
       } else {