getlocalci · kienstra · Oct 17, 2022 · Oct 15, 2022 · Oct 17, 2022 · Oct 17, 2022
diff --git a/src/common/AppIoc.ts b/src/common/AppIoc.ts
@@ -2,6 +2,7 @@ import 'reflect-metadata';
 import BaseIoc from 'common/BaseIoc';
 import ChildProcessGateway from 'gateway/ChildProcessGateway';
 import EditorGateway from 'gateway/EditorGateway';
+import EnvVar from 'process/EnvVar';
 import FsGateway from 'gateway/FsGateway';
 import HttpGateway from 'gateway/HttpGateway';
 import OsGateway from 'gateway/OsGateway';
@@ -16,6 +17,7 @@ iocContainer
   .to(ChildProcessGateway)
   .inSingletonScope();
 iocContainer.bind(Types.IEditorGateway).to(EditorGateway).inSingletonScope();
+iocContainer.bind(Types.IEnvVar).to(EnvVar).inSingletonScope();
 iocContainer.bind(Types.IFsGateway).to(FsGateway).inSingletonScope();
 iocContainer.bind(Types.IHttpGateway).to(HttpGateway).inSingletonScope();
 iocContainer.bind(Types.IOsGateway).to(OsGateway).inSingletonScope();

diff --git a/src/common/Types.ts b/src/common/Types.ts
@@ -1,6 +1,7 @@
 export default {
   IChildProcessGateway: Symbol.for('IChildProcessGateway'),
   IEditorGateway: Symbol.for('IEditorGateway'),
+  IEnvVar: Symbol.for('IEnvVar'),
   IFsGateway: Symbol.for('IFsGateway'),
   IHttpGateway: Symbol.for('IHttpGateway'),
   IOsGateway: Symbol.for('IOsGateway'),

diff --git a/src/config/Config.ts b/src/config/Config.ts
@@ -8,6 +8,7 @@ import getDynamicConfigParametersPath from './getDynamicConfigParametersPath';
 import getDynamicConfigPath from './getDynamicConfigPath';
 import getProcessedConfig from './getProcessedConfig';
 import getProcessFilePath from 'process/getProcessFilePath';
+import getRepoPath from 'common/getRepoPath';
 import ProcessFile from 'process/ProcessFile';
 import ReporterGateway from 'gateway/ReporterGateway';
 import Spawn from 'common/Spawn';
@@ -55,7 +56,11 @@ export default class Config {
         this.childProcessGateway.cp,
         this.spawn.getOptions()
       );
-      this.processFile.write(processedConfig, processFilePath);
+      this.processFile.write(
+        processedConfig,
+        processFilePath,
+        getRepoPath(configFilePath)
+      );
 
       const dynamicConfigFilePath = getDynamicConfigPath(configFilePath);
       if (this.fsGateway.fs.existsSync(dynamicConfigFilePath)) {
@@ -70,7 +75,8 @@ export default class Config {
             this.childProcessGateway.cp,
             this.spawn.getOptions()
           ),
-          dynamicConfigFilePath
+          dynamicConfigFilePath,
+          getRepoPath(configFilePath)
         );
       }
     } catch (e) {

diff --git a/src/job/Children.ts b/src/job/Children.ts
@@ -89,7 +89,7 @@ export default class Children {
     return [
       ...this.getLogTreeItems(
         logs,
-        'getJobName' in parentElement ? parentElement.getJobName() : ''
+        'getJobName' in parentElement ? parentElement?.getJobName() : ''
       ),
       ...this.getJobTreeItems(children, logs, runningJob, jobDependencies),
     ];

diff --git a/src/job/JobRunner.ts b/src/job/JobRunner.ts
@@ -17,6 +17,7 @@ import getImageFromJob from 'containerization/getImageFromJob';
 import getLogFilePath from 'log/getLogFilePath';
 import getLocalVolumePath from 'containerization/getLocalVolumePath';
 import getProcessFilePath from 'process/getProcessFilePath';
+import getRepoPath from 'common/getRepoPath';
 import getTerminalName from 'terminal/getTerminalName';
 import JobFactory from 'job/JobFactory';
 import JobListener from './JobListener';
@@ -87,7 +88,7 @@ export default class JobRunner {
     }
 
     const configFilePath = await this.configFile.getPath(context);
-    const repoPath = path.dirname(path.dirname(configFilePath));
+    const repoPath = getRepoPath(configFilePath);
     const terminal = this.editorGateway.editor.window.createTerminal({
       name: getTerminalName(jobName),
       message: `Running the CircleCI® job ${jobName}…`,

diff --git a/src/process/EnvVar.ts b/src/process/EnvVar.ts
@@ -0,0 +1,39 @@
+import { injectable, inject } from 'inversify';
+import Types from 'common/Types';
+import { addEnvVars } from 'script';
+import ChildProcessGateway from 'gateway/ChildProcessGateway';
+import Spawn from 'common/Spawn';
+
+@injectable()
+export default class EnvVar {
+  @inject(Types.IChildProcessGateway)
+  childProcessGateway!: ChildProcessGateway;
+
+  @inject(Spawn)
+  spawn!: Spawn;
+
+  getStep(repoPath: string) {
+    let command;
+    try {
+      const exportVars = this.childProcessGateway.cp
+        .execSync(addEnvVars, {
+          ...this.spawn.getOptions(repoPath),
+          timeout: 2000,
+        })
+        .toString();
+
+      command = `echo '${exportVars}' >> $BASH_ENV`;
+    } catch (error) {
+      command = `echo "There was an error setting the variables: ${
+        (error as ErrorWithMessage).message
+      }"`;
+    }
+
+    return {
+      run: {
+        name: 'Set more environment variables command',
+        command,
+      },
+    };
+  }
+}
diff --git a/src/process/FakeEnvVar.ts b/src/process/FakeEnvVar.ts
@@ -0,0 +1,16 @@
+import { injectable } from 'inversify';
+
+@injectable()
+export default class FakeEnvVar {
+  getStep() {
+    return {
+      run: {
+        name: 'Set more environment variables',
+        command: `echo 'echo "export CIRCLE_SHA1=037f2d35d59080dc313608c565b55f37d2f42c7e"
+        echo "export CIRCLE_BRANCH=develop"
+        echo "export CIRCLE_PROJECT_REPONAME=local-ci"
+        echo "export CIRCLE_REPOSITORY_URL=git@github.com:getlocalci/local-ci.git"' >> $BASH_ENV`,
+      },
+    };
+  }
+}
diff --git a/src/process/ProcessFile.ts b/src/process/ProcessFile.ts
@@ -14,10 +14,13 @@ import {
   DYNAMIC_CONFIG_PARAMETERS_FILE_NAME,
   DYNAMIC_CONFIG_PATH_IN_CONTAINER,
 } from 'constant';
-import { addEnvVars } from 'script';
+import EnvVar from './EnvVar';
 
 @injectable()
 export default class ProcessFile {
+  @inject(Types.IEnvVar)
+  envVar!: EnvVar;
+
   @inject(Types.IFsGateway)
   fsGateway!: FsGateway;
 
@@ -28,9 +31,9 @@ export default class ProcessFile {
    * this copies the files inside the container to the volume shared with the local machine.
    * This way, they can persist between jobs.
    * Likewise, on attach_workspace, it copies from the volume.
-   * The processedConfig was already compiled by the CircleCI® CLI binary.
+   * The processedConfig was already compiled by the CircleCI CLI binary.
    */
-  write(processedConfig: string, processFilePath: string) {
+  write(processedConfig: string, processFilePath: string, repoPath: string) {
     const config = getConfig(processedConfig);
 
     if (!config) {
@@ -134,21 +137,13 @@ export default class ProcessFile {
             return step;
           });
 
-          // If a 'checkout' step exists, insert env vars right after it.
-          if (newSteps?.includes('checkout')) {
-            newSteps?.splice(
-              newSteps?.indexOf('checkout') + 1,
-              0,
-              this.getEnvVarStep()
-            );
-          }
-
           return {
             ...accumulator,
             [jobName]: {
               ...configJobs[jobName],
               steps: [
                 this.getEnsureVolumeIsWritableStep(),
+                this.envVar.getStep(repoPath),
                 ...(newSteps ?? []),
               ],
             },
@@ -224,13 +219,4 @@ export default class ProcessFile {
       },
     };
   }
-
-  private getEnvVarStep() {
-    return {
-      run: {
-        name: 'Set more environment variables',
-        command: addEnvVars,
-      },
-    };
-  }
 }
diff --git a/src/process/test/ProcessFile.spec.ts b/src/process/test/ProcessFile.spec.ts
@@ -21,7 +21,7 @@ describe('ProcessFile', () => {
     const processFile = testHarness.container.get(ProcessFile);
     const writeFileSpy = jest.fn();
     fsGateway.fs.writeFileSync = writeFileSpy;
-    processFile.write(withCacheFixture, '/foo/baz/');
+    processFile.write(withCacheFixture, '/foo/baz/', '/your/repo/');
 
     expect(writeFileSpy).toHaveBeenCalledTimes(1);
     expect(normalize(writeFileSpy.mock.lastCall[1])).toEqual(
@@ -33,7 +33,7 @@ describe('ProcessFile', () => {
     const processFile = testHarness.container.get(ProcessFile);
     const writeFileSpy = jest.fn();
     fsGateway.fs.writeFileSync = writeFileSpy;
-    processFile.write(dyanamicConfigFixture, '/foo/baz/');
+    processFile.write(dyanamicConfigFixture, '/foo/baz/', '/your/repo/');
 
     expect(writeFileSpy).toHaveBeenCalledTimes(1);
     expect(normalize(writeFileSpy.mock.lastCall[1])).toEqual(

diff --git a/src/script/addEnvVars.sh b/src/script/addEnvVars.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 
 # shellcheck disable=SC2016
-{
-echo 'export CIRCLE_SHA1=$(git rev-parse HEAD)'
-echo 'export CIRCLE_BRANCH=$(git rev-parse --abbrev-ref HEAD)'
-echo 'export CIRCLE_PROJECT_REPONAME=$(basename $(git remote get-url origin))'
-} >> "$BASH_ENV"
+echo "export CIRCLE_SHA1=$(git rev-parse HEAD)"
+echo "export CIRCLE_BRANCH=$(git rev-parse --abbrev-ref HEAD)"
+echo "export CIRCLE_PROJECT_REPONAME=$(basename "$(git remote get-url origin)")"
+echo "export CIRCLE_REPOSITORY_URL=$(git remote get-url origin)"
diff --git a/src/test-tool/expected/dynamic-config.yml b/src/test-tool/expected/dynamic-config.yml
@@ -11,15 +11,14 @@ jobs:
               then
               sudo chown $(whoami) /tmp/local-ci
             fi
-      - checkout
       - run:
           name: Set more environment variables
-          command: >
-            {
-            echo 'export CIRCLE_SHA1=$(git rev-parse HEAD)'
-            echo 'export CIRCLE_BRANCH=$(git rev-parse --abbrev-ref HEAD)'
-            echo 'export CIRCLE_PROJECT_REPONAME=$(basename $(git remote get-url origin))'
-            } >> "$BASH_ENV"
+          command: >-
+            echo 'echo "export CIRCLE_SHA1=037f2d35d59080dc313608c565b55f37d2f42c7e"
+            echo "export CIRCLE_BRANCH=develop"
+            echo "export CIRCLE_PROJECT_REPONAME=local-ci"
+            echo "export CIRCLE_REPOSITORY_URL=git@github.com:getlocalci/local-ci.git"' >> $BASH_ENV
+      - checkout
       - run:
           name: Create config
           command: echo "Creating the dynamic config here"

diff --git a/src/test-tool/expected/with-cache.yml b/src/test-tool/expected/with-cache.yml
@@ -14,15 +14,14 @@ jobs:
               then
               sudo chown $(whoami) /tmp/local-ci
             fi
-      - checkout
       - run:
           name: Set more environment variables
-          command: >
-            {
-            echo 'export CIRCLE_SHA1=$(git rev-parse HEAD)'
-            echo 'export CIRCLE_BRANCH=$(git rev-parse --abbrev-ref HEAD)'
-            echo 'export CIRCLE_PROJECT_REPONAME=$(basename $(git remote get-url origin))'
-            } >> "$BASH_ENV"
+          command: >-
+            echo 'echo "export CIRCLE_SHA1=037f2d35d59080dc313608c565b55f37d2f42c7e"
+            echo "export CIRCLE_BRANCH=develop"
+            echo "export CIRCLE_PROJECT_REPONAME=local-ci"
+            echo "export CIRCLE_REPOSITORY_URL=git@github.com:getlocalci/local-ci.git"' >> $BASH_ENV
+      - checkout
       - run:
           name: Restore cache
           command: >
@@ -91,6 +90,13 @@ jobs:
               then
               sudo chown $(whoami) /tmp/local-ci
             fi
+      - run:
+          name: Set more environment variables
+          command: >-
+            echo 'echo "export CIRCLE_SHA1=037f2d35d59080dc313608c565b55f37d2f42c7e"
+            echo "export CIRCLE_BRANCH=develop"
+            echo "export CIRCLE_PROJECT_REPONAME=local-ci"
+            echo "export CIRCLE_REPOSITORY_URL=git@github.com:getlocalci/local-ci.git"' >> $BASH_ENV
       - run:
           name: Attach workspace
           command: |-
@@ -130,6 +136,13 @@ jobs:
               then
               sudo chown $(whoami) /tmp/local-ci
             fi
+      - run:
+          name: Set more environment variables
+          command: >-
+            echo 'echo "export CIRCLE_SHA1=037f2d35d59080dc313608c565b55f37d2f42c7e"
+            echo "export CIRCLE_BRANCH=develop"
+            echo "export CIRCLE_PROJECT_REPONAME=local-ci"
+            echo "export CIRCLE_REPOSITORY_URL=git@github.com:getlocalci/local-ci.git"' >> $BASH_ENV
       - run:
           name: Attach workspace
           command: |-
@@ -155,6 +168,13 @@ jobs:
               then
               sudo chown $(whoami) /tmp/local-ci
             fi
+      - run:
+          name: Set more environment variables
+          command: >-
+            echo 'echo "export CIRCLE_SHA1=037f2d35d59080dc313608c565b55f37d2f42c7e"
+            echo "export CIRCLE_BRANCH=develop"
+            echo "export CIRCLE_PROJECT_REPONAME=local-ci"
+            echo "export CIRCLE_REPOSITORY_URL=git@github.com:getlocalci/local-ci.git"' >> $BASH_ENV
       - run:
           name: Attach workspace
           command: |-
@@ -180,6 +200,13 @@ jobs:
               then
               sudo chown $(whoami) /tmp/local-ci
             fi
+      - run:
+          name: Set more environment variables
+          command: >-
+            echo 'echo "export CIRCLE_SHA1=037f2d35d59080dc313608c565b55f37d2f42c7e"
+            echo "export CIRCLE_BRANCH=develop"
+            echo "export CIRCLE_PROJECT_REPONAME=local-ci"
+            echo "export CIRCLE_REPOSITORY_URL=git@github.com:getlocalci/local-ci.git"' >> $BASH_ENV
       - run:
           name: Attach workspace
           command: |-
@@ -232,6 +259,13 @@ jobs:
               then
               sudo chown $(whoami) /tmp/local-ci
             fi
+      - run:
+          name: Set more environment variables
+          command: >-
+            echo 'echo "export CIRCLE_SHA1=037f2d35d59080dc313608c565b55f37d2f42c7e"
+            echo "export CIRCLE_BRANCH=develop"
+            echo "export CIRCLE_PROJECT_REPONAME=local-ci"
+            echo "export CIRCLE_REPOSITORY_URL=git@github.com:getlocalci/local-ci.git"' >> $BASH_ENV
       - run:
           name: Attach workspace
           command: |-
@@ -260,6 +294,13 @@ jobs:
               then
               sudo chown $(whoami) /tmp/local-ci
             fi
+      - run:
+          name: Set more environment variables
+          command: >-
+            echo 'echo "export CIRCLE_SHA1=037f2d35d59080dc313608c565b55f37d2f42c7e"
+            echo "export CIRCLE_BRANCH=develop"
+            echo "export CIRCLE_PROJECT_REPONAME=local-ci"
+            echo "export CIRCLE_REPOSITORY_URL=git@github.com:getlocalci/local-ci.git"' >> $BASH_ENV
       - run:
           name: Attach workspace
           command: |-
@@ -285,6 +326,13 @@ jobs:
               then
               sudo chown $(whoami) /tmp/local-ci
             fi
+      - run:
+          name: Set more environment variables
+          command: >-
+            echo 'echo "export CIRCLE_SHA1=037f2d35d59080dc313608c565b55f37d2f42c7e"
+            echo "export CIRCLE_BRANCH=develop"
+            echo "export CIRCLE_PROJECT_REPONAME=local-ci"
+            echo "export CIRCLE_REPOSITORY_URL=git@github.com:getlocalci/local-ci.git"' >> $BASH_ENV
       - run:
           name: Attach workspace
           command: |-

diff --git a/src/test-tool/helper/AppTestHarness.ts b/src/test-tool/helper/AppTestHarness.ts
@@ -8,6 +8,7 @@ import FakeHttpGateway from 'gateway/FakeHttpGateway';
 import FakeOsGateway from 'gateway/FakeOsGateway';
 import FakeProcessGateway from 'gateway/FakeProcessGateway';
 import FakeReporterGateway from 'gateway/FakeReporterGateway';
+import FakeEnvVar from 'process/FakeEnvVar';
 
 export default class AppTestHarness {
   container!: Container;
@@ -25,6 +26,7 @@ export default class AppTestHarness {
       .bind(Types.IChildProcessGateway)
       .to(FakeChildProcessGateway)
       .inSingletonScope();
+    this.container.bind(Types.IEnvVar).to(FakeEnvVar).inSingletonScope();
     this.container
       .bind(Types.IEditorGateway)
       .to(FakeEditorGateway)