fix noisy logs when authPluginLib empty, schema allows empty authPlug…

…inLib, regex multiline Signed-off-by: MarkAckert <[email protected]>
zowe · Feb 10, 2025 · 9addee4 · 9addee4
1 parent 3c0d6c2
commit 9addee4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/bin/commands/init/apfauth/index.ts b/bin/commands/init/apfauth/index.ts
@@ -59,7 +59,11 @@ export function execute() {
   }
 
   let result1 = zosDs.isDatasetSmsManaged(ZOWE_CONFIG.zowe.setup.dataset.authLoadlib);
-  let result2 = zosDs.isDatasetSmsManaged(ZOWE_CONFIG.zowe.setup.dataset.authPluginLib);
+
+  let result2: {rc: number, smsManaged?: boolean | null } = {rc: 1, smsManaged: null}; // default used when shouldAuthPlugin=false
+  if (shouldAuthPluginLib) {
+    result2 = zosDs.isDatasetSmsManaged(ZOWE_CONFIG.zowe.setup.dataset.authPluginLib);
+  } 
 
   if (result1.rc != 0) {
     common.printErrorAndExit(`Error ZWEL0320E: The dataset specified in 'zowe.setup.dataset.authLoadlib' does not exist.`, undefined, 320);
@@ -94,8 +98,8 @@ export function execute() {
 
       if (!shouldAuthPluginLib) {
         // replace 2 export lines (33 and 34 in IAPF2 at time of writing)
-        jclContent.out = jclContent.out.replace(/\nexport PLUGLIB=.*\nexport PLUGLOC=SMS.*$/g, '');
-        jclContent.out = jclContent.out.replace(/\n\.\/opercmd\.rex.*?PLUGLOC.*$/g, '');
+        jclContent.out = jclContent.out.replace(/\nexport PLUGLIB=.*\nexport PLUGLOC=SMS.*$/gm, '');
+        jclContent.out = jclContent.out.replace(/\n\.\/opercmd\.rex.*?PLUGLOC.*$/gm, '');
       }
 
       xplatform.storeFileUTF8(tmpfile, xplatform.AUTO_DETECT, jclContent.out);

diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json
@@ -58,8 +58,16 @@
                   "default": "<hlq>.SZWEAUTH"
                 },
                 "authPluginLib": {
-                  "$ref": "/schemas/v2/server-common#zoweDataset",
-                  "description": "APF authorized LOADLIB for Zowe ZIS Plugins"
+                  "oneOf": [{
+                      "$ref": "/schemas/v2/server-common#zoweDataset",
+                      "description": "APF authorized LOADLIB for Zowe ZIS Plugins"
+                    }, {
+                      "type": "string",
+                      "minLength": 0,
+                      "maxLength": 0,
+                      "required": "false"
+                    }
+                  ]
                 }
               }
             },