Merge pull request #1146 from contentstack/revert-1126-fix/CS-42005

Revert "fix: added pathValidator utility method"
contentstack · Nov 6, 2023 · 4c9e87f · 4c9e87f
2 parents 7d12114 + 4aba84d
commit 4c9e87f
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 29 deletions.
diff --git a/packages/contentstack-bootstrap/src/bootstrap/interactive.ts b/packages/contentstack-bootstrap/src/bootstrap/interactive.ts
@@ -3,7 +3,6 @@ const inquirer = require('inquirer');
 import { cliux } from '@contentstack/cli-utilities';
 
 import messageHandler from '../messages';
-import { pathValidator } from '@contentstack/cli-utilities';
 
 /**
  * @description Inquire starter app
@@ -59,8 +58,7 @@ export async function inquireCloneDirectory(): Promise<string> {
       message: messageHandler.parse('CLI_BOOTSTRAP_APP_COPY_SOURCE_CODE_DESTINATION_ENQUIRY'),
     },
   ]);
-  pathValidator.validatePath(selectedCustomPath.path);
-  selectedCustomPath = path.normalize(selectedCustomPath.path);
+  selectedCustomPath = path.resolve(selectedCustomPath.path);
   return selectedCustomPath;
 }
 

diff --git a/packages/contentstack-bootstrap/src/bootstrap/utils.ts b/packages/contentstack-bootstrap/src/bootstrap/utils.ts
@@ -130,7 +130,6 @@ const envFileHandler = async (
     customHost = region.cma && region.cma.substring('8');
   }
   const production = environmentVariables.environment === 'production' ? true : false;
-  // Note: clonedDirectory is already sanitised.
   switch (appConfigKey) {
     case 'reactjs':
     case 'reactjs-starter':

diff --git a/packages/contentstack-bulk-publish/src/util/store.js b/packages/contentstack-bulk-publish/src/util/store.js
@@ -2,7 +2,6 @@ const fs = require('fs');
 const path = require('path');
 const config = require('../config/index.js');
 const chalk = require('chalk');
-const { pathValidator } = require('@contentstack/cli-utilities');
 
 function save(key, data) {
   let bulkPublish = config ? config : {};
@@ -50,7 +49,6 @@ function get(key, filePath) {
 
 function updateMissing(key, flags) {
   let savedConfig;
-  pathValidator.validatePath(flags.config);
   savedConfig = get(key, path.resolve(flags.config));
   Object.keys(savedConfig).forEach((element) => {
     if (flags[element] === undefined) {

diff --git a/packages/contentstack-clone/src/lib/util/log.js b/packages/contentstack-clone/src/lib/util/log.js
@@ -8,7 +8,6 @@ var winston = require('winston');
 var path = require('path');
 var mkdirp = require('mkdirp');
 var slice = Array.prototype.slice;
-const { pathValidator } = require('@contentstack/cli-utilities');
 
 function returnString(args) {
   var returnStr = '';
@@ -42,7 +41,6 @@ var myCustomLevels = {
 };
 
 function init(_logPath, logfileName) {
-  pathValidator.validatePath(logfileName);
   var logsDir = path.resolve(_logPath, 'logs', 'import');
   // Create dir if doesn't already exist
   mkdirp.sync(logsDir);

diff --git a/packages/contentstack-migrate-rte/src/lib/util/index.js b/packages/contentstack-migrate-rte/src/lib/util/index.js
@@ -15,7 +15,6 @@ const {
   isPlainObject,
 } = require('lodash');
 const Validator = require('jsonschema').Validator;
-const { pathValidator } = require('@contentstack/cli-utilities');
 const configSchema = require('./config_schema.json');
 const { JSDOM } = require('jsdom');
 const collapseWithSpace = require('collapse-whitespace');
@@ -89,7 +88,6 @@ async function getConfig(flags) {
     let config;
     if (flags['config-path']) {
       const configPath = flags['config-path'];
-      pathValidator.validatePath(configPath);
       config = require(nodePath.resolve(configPath));
     } else {
       config = {

diff --git a/packages/contentstack-migration/src/commands/cm/stacks/migration.js b/packages/contentstack-migration/src/commands/cm/stacks/migration.js
@@ -8,7 +8,6 @@ const Listr = require('listr');
 const { resolve, extname } = require('path');
 const { Command } = require('@contentstack/cli-command');
 const { waterfall } = require('async');
-const { pathValidator } = require('@contentstack/cli-utilities');
 const { Parser } = require('../../../modules');
 const { ActionList } = require('../../../actions');
 const fs = require('fs');
@@ -130,14 +129,14 @@ class MigrationCommand extends Command {
   }
 
   async execSingleFile(filePath, mapInstance) {
-    try {
-      pathValidator.validatePath(filePath);
-      // Resolved absolute path
-      const resolvedMigrationPath = resolve(filePath);
-      // User provided migration function
-      const migrationFunc = require(resolvedMigrationPath);
+    // Resolved absolute path
+    const resolvedMigrationPath = resolve(filePath);
+    // User provided migration function
+    const migrationFunc = require(resolvedMigrationPath);
 
-      const parser = new Parser();
+    const parser = new Parser();
+
+    try {
       const migrationParser = await parser.getMigrationParser(migrationFunc);
       if (migrationParser.hasErrors) {
         errorHelper(migrationParser.hasErrors);

diff --git a/packages/contentstack-utilities/src/index.ts b/packages/contentstack-utilities/src/index.ts
@@ -5,7 +5,6 @@ export { default as CLIError } from './cli-error';
 export { default as messageHandler } from './message-handler';
 export { default as authHandler } from './auth-handler';
 export { default as configHandler } from './config-handler';
-export { default as pathValidator } from './path-validator';
 export {
   default as managementSDKClient,
   managementSDKInitiator,

diff --git a/packages/contentstack-utilities/src/path-validator.ts b/packages/contentstack-utilities/src/path-validator.ts