Merge branch 'v2.x/staging' into chore/v2/attls-https-zss

zowe · Jun 18, 2024 · f8df0ab · f8df0ab
2 parents 8a74629 + 3e77948
commit f8df0ab
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 144 deletions.
diff --git a/lib/initInstance.js b/lib/initInstance.js
@@ -16,9 +16,7 @@ const yamlConfig = require('../../zlux-server-framework/utils/yamlConfig');
 const initUtils = require('./initUtils');
 //const upgradeInstance = require('./upgradeInstance');
 const os = require('os');
-const ncp = require('ncp').ncp;
 const { execSync } = require('child_process');
-const mkdirp = require('mkdirp');
 
 
 const haInstanceId = yamlConfig.getCurrentHaInstanceId();
@@ -44,43 +42,43 @@ const versionLocation = path.join(destination, 'component.json');
 config.productDir = path.join(__dirname, '..', 'defaults');
 
 //Begin generate any missing folders
-mkdirp.sync(destination, {mode: initUtils.FOLDER_MODE});
+fs.mkdirSync(destination, {mode: initUtils.FOLDER_MODE, recursive: true});
 
 if (!config.siteDir) {
   config.siteDir = path.join(destination, 'site');
 }
 const sitePluginStorage = path.join(config.siteDir, 'ZLUX', 'pluginStorage');
-mkdirp.sync(sitePluginStorage, {mode: initUtils.FOLDER_MODE});
+fs.mkdirSync(sitePluginStorage, {mode: initUtils.FOLDER_MODE, recursive: true});
 
 if (!config.instanceDir) {
   config.instanceDir = destination;
 }
 const instancePluginStorage = path.join(config.instanceDir, 'ZLUX', 'pluginStorage');
-mkdirp.sync(instancePluginStorage, {mode: initUtils.FOLDER_MODE});
+fs.mkdirSync(instancePluginStorage, {mode: initUtils.FOLDER_MODE, recursive: true});
 const recognizersPluginStorage = path.join(config.instanceDir, 'ZLUX/pluginStorage', 'org.zowe.zlux.ng2desktop/recognizers');
-mkdirp.sync(recognizersPluginStorage, {mode: initUtils.FOLDER_MODE});
+fs.mkdirSync(recognizersPluginStorage, {mode: initUtils.FOLDER_MODE, recursive: true});
 const actionsPluginStorage = path.join(config.instanceDir, 'ZLUX/pluginStorage/org.zowe.zlux.ng2desktop', 'actions');
-mkdirp.sync(actionsPluginStorage, {mode: initUtils.FOLDER_MODE});
+fs.mkdirSync(actionsPluginStorage, {mode: initUtils.FOLDER_MODE, recursive: true});
 
 const instanceConfig = path.join(config.instanceDir, 'serverConfig');
 //750 specifically, to keep server config secure
-mkdirp.sync(instanceConfig, {mode: 0o0750});
+fs.mkdirSync(instanceConfig, {mode: 0o0750});
 
 if (!config.groupsDir) {
   config.groupsDir = path.join(config.instanceDir, 'groups');
 }
-mkdirp.sync(config.groupsDir, {mode: initUtils.FOLDER_MODE});
+fs.mkdirSync(config.groupsDir, {mode: initUtils.FOLDER_MODE, recursive: true});
 
 if (!config.usersDir) {
   config.usersDir = path.join(config.instanceDir, 'users');
 }
-mkdirp.sync(config.usersDir, {mode: initUtils.FOLDER_MODE});
+fs.mkdirSync(config.usersDir, {mode: initUtils.FOLDER_MODE, recursive: true});
 
 if (!config.pluginsDir) {
   config.pluginsDir = path.join(destination, 'plugins');
 }
 
-mkdirp.sync(config.pluginsDir, {mode: initUtils.FOLDER_MODE});
+fs.mkdirSync(config.pluginsDir, {mode: initUtils.FOLDER_MODE, recursive: true});
 
 function generateComponentJson() {
   let componentJsonContent;
@@ -144,7 +142,7 @@ try {
 if (siteStorage.length == 0 && instanceStorage.length == 0) {
   console.log("ZWED5012I - Copying default plugin preferences into instance");
   if (os.platform() == 'win32') {
-    ncp(path.join(config.productDir, 'ZLUX', 'pluginStorage'), instancePluginStorage, function(err){
+    fs.cp(path.join(config.productDir, 'ZLUX', 'pluginStorage'), instancePluginStorage, {recursive: true, force: true}, function(err){
       if (err) {
         console.warn('ZWED5005W - Warning: error while copying plugin preferences into instance',err);
         process.exit(1);

diff --git a/lib/initUtils.js b/lib/initUtils.js
@@ -10,7 +10,6 @@
 
 const fs = require('fs');
 const path = require('path');
-const mkdirp = require('mkdirp');
 
 const ZLUX_ROOT_DIR = path.join(__dirname, '..');
 const DEFAULT_PLUGINS_DIR = path.join(ZLUX_ROOT_DIR, 'defaults', 'plugins');
@@ -78,7 +77,7 @@ module.exports.registerBundledPlugin = registerBundledPlugin;
 module.exports.setTerminalDefaults = function(configDestination, instanceItems) {
   if (instanceItems.indexOf('org.zowe.terminal.vt.json') != -1) {
     let defaultConfigDir = path.join(configDestination,'org.zowe.terminal.vt','sessions');
-    mkdirp.sync(defaultConfigDir);
+    fs.mkdirSync(defaultConfigDir, {recursive: true});
     try {
       fs.writeFileSync(path.join(defaultConfigDir,'_defaultVT.json'),
                        JSON.stringify({host:process.env['ZWED_SSH_HOST'] ? process.env['ZWED_SSH_HOST'] : "",
@@ -94,7 +93,7 @@ module.exports.setTerminalDefaults = function(configDestination, instanceItems)
       security = process.env['ZWED_TN3270_SECURITY'];
     }
     let defaultConfigDir = path.join(configDestination,'org.zowe.terminal.tn3270','sessions');
-    mkdirp.sync(defaultConfigDir);
+    fs.mkdirSync(defaultConfigDir, {recursive: true});
     try {
       let tn3270Json = {host:process.env['ZWED_TN3270_HOST'] ? process.env['ZWED_TN3270_HOST'] : "",
                         port: process.env['ZWED_TN3270_PORT'] ? process.env['ZWED_TN3270_PORT'] : 23,

diff --git a/lib/zluxArgs.js b/lib/zluxArgs.js
@@ -16,7 +16,6 @@ const argParser = require('zlux-server-framework/utils/argumentParser');
 const jsonUtils = require('zlux-server-framework/lib/jsonUtils');
 const mergeUtils = require('zlux-server-framework/utils/mergeUtils');
 const yamlConfig = require('zlux-server-framework/utils/yamlConfig');
-const mkdirp = require('mkdirp');
 const cluster = require('cluster');
 
 const MVD_ARGS = [

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,7 +10,6 @@
     "test": "echo \"Warning: no test specified\" && exit 0"
   },
   "dependencies": {
-    "zlux-server-framework": "file:../zlux-server-framework",
-    "mkdirp": "~0.5.1"
+    "zlux-server-framework": "file:../zlux-server-framework"
   }
 }