Merge pull request #1684 from contentstack/fix/staging

fixed semgrep issues
contentstack · Nov 19, 2024 · 4c74be1 · 4c74be1
2 parents 89d753f + 66ac668
commit 4c74be1
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 81 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-audit/package.json b/packages/contentstack-audit/package.json
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@contentstack/cli-dev-dependencies": "^1.2.4",
-    "@oclif/test": "^4.1.0",
+    "@oclif/test": "^4.1.2",
     "@types/chai": "^4.3.20",
     "@types/fs-extra": "^11.0.4",
     "@types/mocha": "^10.0.9",

diff --git a/packages/contentstack-migration/src/utils/modules.js b/packages/contentstack-migration/src/utils/modules.js
@@ -61,24 +61,18 @@ function installDependencies(dependencies, directory) {
     if (!internalModules.has(dep)) {
       const pkg = dep.startsWith('@') ? dep : dep.split('/')[0];
       if (!installedDependencies.has(pkg)) {
-        executeShellCommand(`npm i ${pkg}`, directory);
+        executeShellCommand(pkg, directory);
         installedDependencies.add(pkg);
       }
     }
   });
 }
 
-function executeShellCommand(command, directory = '') {
+function executeShellCommand(pkg, directory = '') {
   try {
-    if (command.startsWith('npm i')) {
-      const [cmd, ...args] = command.split(' ');
-      const result = spawnSync(cmd, args, { stdio: 'inherit', cwd: directory, shell: true });
-
-      if (result?.error) throw result.error;
-      console.log(`Command executed successfully: ${command}`);
-    } else {
-      console.log(`Command should only be 'npm i <package-name>'`);
-    }
+    const result = spawnSync(`npm`, ['i', pkg], { stdio: 'inherit', cwd: directory, shell: false });
+    if (result?.error) throw result.error;
+    console.log(`Command executed successfully: ${command}`);
   } catch (error) {
     console.error(`Command execution failed. Error: ${error?.message}`);
   }

diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
@@ -43,7 +43,7 @@
     "@oclif/core": "^3.27.0",
     "@oclif/plugin-help": "^5",
     "@oclif/plugin-not-found": "^2.4.3",
-    "@oclif/plugin-plugins": "^5.4.15",
+    "@oclif/plugin-plugins": "^5.4.17",
     "chalk": "^4.1.2",
     "debug": "^4.3.7",
     "figlet": "^1.8.0",
@@ -55,7 +55,7 @@
     "winston": "^3.17.0"
   },
   "devDependencies": {
-    "@oclif/test": "^4.1.0",
+    "@oclif/test": "^4.1.2",
     "@types/chai": "^4.3.20",
     "@types/inquirer": "^9.0.7",
     "@types/mkdirp": "^1.0.2",