@harperfast/harper 5.0.0-beta.5 → 5.0.0-beta.7

package/utility/logging/readLog.js

@@ -2,11 +2,11 @@
 
 const hdbTerms = require('../hdbTerms.ts');
 const hdbLogger = require('./harper_logger.js');
-const envMangr = require('../environment/environmentManager.js');
 const validator = require('../../validation/readLogValidator.js');
 const path = require('path');
 const fs = require('fs-extra');
 const { once } = require('events');
+const { getConfigPath } = require('../../config/configUtils.js');
 const { handleHDBError, hdbErrors } = require('../errors/hdbError.js');
 const { PACKAGE_ROOT } = require('../../utility/packageUtils.js');
 const { server } = require('../../server/Server.ts');
@@ -39,7 +39,7 @@ async function readLog(request) {
 	// start pulling logs from the other nodes now so it can be done in parallel
 	let whenReplicatedResponse = server.replication.replicateOperation(request);
 
-	const logPath = envMangr.get(hdbTerms.HDB_SETTINGS_NAMES.LOG_PATH_KEY);
+	const logPath = getConfigPath(hdbTerms.HDB_SETTINGS_NAMES.LOG_PATH_KEY);
 	const logName = request.log_name === undefined ? hdbTerms.LOG_NAMES.HDB : request.log_name;
 	const readLogPath =
 		logName === hdbTerms.LOG_NAMES.INSTALL

package/utility/npmUtilities.js

@@ -14,7 +14,7 @@ module.exports = {
 };
 
 const { CONFIG_PARAMS } = require('./hdbTerms.ts');
-const { getConfigValue } = require('../config/configUtils.js');
+const { getConfigPath } = require('../config/configUtils.js');
 const { nonInteractiveSpawn } = require('../components/Application.ts');
 
 /**
@@ -34,7 +34,7 @@ async function installModules(req) {
 
 	let { projects, dryRun } = req;
 
-	const componentsRootDirPath = getConfigValue(CONFIG_PARAMS.COMPONENTSROOT);
+	const componentsRootDirPath = getConfigPath(CONFIG_PARAMS.COMPONENTSROOT);
 
 	const responseObject = {};
 

package/validation/configValidator.js

@@ -226,9 +226,17 @@ function doesPathExist(pathToCheck) {
 }
 
 function validatePath(value, helpers) {
-	Joi.assert(value, string.pattern(/^[\\/]$|([\\/a-zA-Z_0-9:-]+)+$/, 'directory path'));
+	Joi.assert(value, string.pattern(/^[\\/~]$|([\\/~a-zA-Z_0-9:-]+)+$/, 'directory path'));
 
-	const doesExistMsg = doesPathExist(value);
+	let resolvedValue;
+	if (value.startsWith('~/')) {
+		resolvedValue = path.join(os.homedir(), value.slice(1));
+	} else if (path.isAbsolute(value)) {
+		resolvedValue = value;
+	} else {
+		resolvedValue = path.join(hdbRoot, value);
+	}
+	const doesExistMsg = doesPathExist(resolvedValue);
 	if (doesExistMsg) {
 		return helpers.message(doesExistMsg);
 	}
@@ -302,17 +310,17 @@ function setDefaultRoot(parent, helpers) {
 
 	switch (configParam) {
 		case 'componentsRoot':
-			return path.join(hdbRoot, DEFAULT_COMPONENTS_FOLDER);
+			return DEFAULT_COMPONENTS_FOLDER;
 		case 'logging.root':
-			return path.join(hdbRoot, DEFAULT_LOG_FOLDER);
+			return DEFAULT_LOG_FOLDER;
 		case 'storage.path':
 			const legacyStoragePath = path.join(hdbRoot, hdbTerms.LEGACY_DATABASES_DIR_NAME);
-			if (fs.existsSync(legacyStoragePath)) return legacyStoragePath;
-			return path.join(hdbRoot, hdbTerms.DATABASES_DIR_NAME);
+			if (fs.existsSync(legacyStoragePath)) return hdbTerms.LEGACY_DATABASES_DIR_NAME;
+			return hdbTerms.DATABASES_DIR_NAME;
 		case 'logging.rotation.path':
-			return path.join(hdbRoot, DEFAULT_LOG_FOLDER);
+			return DEFAULT_LOG_FOLDER;
 		case 'operationsApi.network.domainSocket':
-			return configParam == null ? null : path.join(hdbRoot, 'operations-server');
+			return configParam == null ? null : 'operations-server';
 		default:
 			throw new Error(`Error setting default root for config parameter: ${configParam}. Unrecognized config parameter`);
 	}

package/validation/readLogValidator.js

@@ -1,12 +1,12 @@
 'use strict';
 
-const envMangr = require('../utility/environment/environmentManager.js');
 const Joi = require('joi');
 const validator = require('./validationWrapper.js');
 const moment = require('moment');
 const fs = require('fs-extra');
 const path = require('path');
 const _ = require('lodash');
+const { getConfigPath } = require('../config/configUtils.js');
 const hdbTerms = require('../utility/hdbTerms.ts');
 const { LOG_LEVELS } = require('../utility/hdbTerms.ts');
 
@@ -49,7 +49,7 @@ function validateReadLogPath(value, helpers) {
 		return helpers.message(`'log_name' '${value}' is invalid.`);
 	}
 
-	const logPath = envMangr.get(hdbTerms.HDB_SETTINGS_NAMES.LOG_PATH_KEY);
+	const logPath = getConfigPath(hdbTerms.HDB_SETTINGS_NAMES.LOG_PATH_KEY);
 	const logName = value === undefined ? hdbTerms.LOG_NAMES.HDB : value;
 	const readLogPath =
 		logName === hdbTerms.LOG_NAMES.INSTALL