Special handle variable option from .env file to mimic merge like behavior (#1509)

* Fix issue 1508 by special handling variable option from .env file

* Fix

* Bump to node-version 22

* Let's see

* Fix it up

* Will this work

* Try without variable

* Do not run concurrent shell-executor

Author: firecow

.github/workflows/build.yml

@@ -46,6 +46,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
+          node-version: '22'
           cache: 'npm'
       - run: npm ci
       - run: npm run lint
@@ -56,6 +57,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
+          node-version: '22'
           cache: 'npm'
       - run: npm ci
       - run: npx depcheck --ignores depcheck
@@ -68,6 +70,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v4.2.0
         with:
+          node-version: '22'
           cache: 'npm'
       - run: npm ci
       - name: Run Tests

src/argv.ts

@@ -81,7 +81,21 @@ export class Argv {
             const config = dotenv.parse(fs.readFileSync(potentialDotenvFilepath));
             for (const [key, value] of Object.entries(config)) {
                 const argKey = camelCase(key);
-                if (argv[argKey] == null) {
+
+                // Special handle KEY=VALUE variable keys
+                if (argKey === "variable") {
+                    let currentVal = argv[argKey];
+                    if (currentVal == null) {
+                        currentVal = [];
+                        this.map.set(argKey, currentVal);
+                    }
+                    if (!Array.isArray(currentVal)) {
+                        continue;
+                    }
+                    for (const pair of value.split(" ")) {
+                        currentVal.unshift(pair);
+                    }
+                } else if (argv[argKey] == null) {
                     // Work around `dotenv.parse` limitation https://github.com/motdotla/dotenv/issues/51#issuecomment-552559070
                     if (value === "true") this.map.set(argKey, true);
                     else if (value === "false") this.map.set(argKey, false);

tests/test-cases/project-variables-file/.gitlab-ci-local-env

@@ -0,0 +1 @@
+VARIABLE=KUBE_CONTEXT=minikube KUBECONFIG=/root/.kube/config XDEBUG_MODE=develop

tests/test-cases/project-variables-file/.gitlab-ci.yml

@@ -12,3 +12,9 @@ test-job:
     - echo "$FUNNY3"
   environment:
     name: $ENV
+
+issue-1508:
+  script:
+    - echo $KUBE_CONTEXT
+    - echo $KUBECONFIG
+    - echo $XDEBUG_MODE

tests/test-cases/project-variables-file/integration.test.ts

@@ -17,7 +17,7 @@ afterAll(() => {
     fs.removeSync(path.join(cwd, emptyFileVariable));
 });
 
-test.concurrent("project-variables-file <test-job>", async () => {
+test("project-variables-file <test-job>", async () => {
     const writeStreams = new WriteStreamsMock();
     await handler({
         cwd: cwd,
@@ -31,6 +31,22 @@ test.concurrent("project-variables-file <test-job>", async () => {
     expect(writeStreams.stdoutLines).toEqual(expect.arrayContaining(expected));
 });
 
+test("project-variables-file <issue-1508>", async () => {
+    const writeStreams = new WriteStreamsMock();
+    await handler({
+        cwd: cwd,
+        job: ["issue-1508"],
+        variable: ["XDEBUG_MODE=debug,develop"],
+    }, writeStreams);
+
+    const expected = [
+        chalk`{blueBright issue-1508} {greenBright >} minikube`,
+        chalk`{blueBright issue-1508} {greenBright >} /root/.kube/config`,
+        chalk`{blueBright issue-1508} {greenBright >} debug,develop`,
+    ];
+    expect(writeStreams.stdoutLines).toEqual(expect.arrayContaining(expected));
+});
+
 test.concurrent("project-variables-file <issue-1333>", async () => {
     const writeStreams = new WriteStreamsMock();
     await handler({