Merge pull request #220 from deploystackio/fix/run-cmd-split

feat: add test for Portkey Gateway port and image verification; update RunCommandParser logic

Author: Lasim

src/sources/run/index.ts

@@ -37,7 +37,9 @@ export class RunCommandParser implements SourceParser {
     while (i < parts.length) {
       const arg = parts[i];
 
-      if (arg.startsWith('-')) {
+      // If we haven't found the image yet and the argument starts with a dash,
+      // it's an option
+      if (!imageFound && arg.startsWith('-')) {
         switch (arg) {
           case '-p':
           case '--publish':
@@ -66,9 +68,12 @@ export class RunCommandParser implements SourceParser {
             break;
 
           default:
-            // Skip other options
-            if (arg.startsWith('--')) {
-              i++; // Skip the value of the option if it exists
+            // Some flags take arguments, some don't
+            if (arg === '--rm' || arg === '-d' || arg === '--detach') {
+              // These are standalone flags - don't skip anything
+            } else if (i + 1 < parts.length && !parts[i + 1].startsWith('-')) {
+              // This option likely has a value - skip it
+              i++;
             }
         }
       } else if (!imageFound) {
@@ -153,12 +158,15 @@ export class RunCommandParser implements SourceParser {
     const parts: string[] = [];
     let current = '';
     let inQuotes = false;
+    let quoteChar = '';
 
     for (let i = 0; i < command.length; i++) {
       const char = command[i];
 
-      if (char === '\'' || char === '"') {
+      if ((char === '\'' || char === '"') && (inQuotes === false || quoteChar === char)) {
         inQuotes = !inQuotes;
+        if (inQuotes) quoteChar = char;
+        else quoteChar = '';
         continue;
       }
 

test/e2e/docker-compose-files/test5.yml

@@ -0,0 +1,6 @@
+version: '3'
+services:
+  portkey:
+    image: portkeyai/gateway:latest
+    ports:
+      - "8787:8787"

test/e2e/docker-run-files/test5.txt

@@ -0,0 +1 @@
+docker run --rm -p 8787:8787 portkeyai/gateway:latest

test/e2e/index.ts

@@ -4,6 +4,7 @@ import { runTest1 } from './test1';
 import { runTest2 } from './test2';
 import { runTest3 } from './test3';
 import { runTest4 } from './test4';
+import { runTest5 } from './test5';
 
 // Constants for directories
 const OUTPUT_DIR = join(__dirname, 'output');
@@ -39,10 +40,14 @@ async function runAllTests() {
   const test3Passed = await runTest3();
   testResults.push({ testName: 'Test 3: Environment Variable Substitution', passed: test3Passed });
 
-  // Run Test 4: Render Translation Only (Schema validation removed)
+  // Run Test 4: Render Translation Only (Schema validation)
   const test4Passed = await runTest4();
   testResults.push({ testName: 'Test 4: Render Translation Only', passed: test4Passed });
 
+  // Run Test 5: Portkey Gateway Port and Image Verification
+  const test5Passed = await runTest5();
+  testResults.push({ testName: 'Test 5: Portkey Gateway Port and Image Verification', passed: test5Passed });
+
   // Print summary
   console.log('\n=== Test Summary ===');
   const passedTests = testResults.filter(r => r.passed);