Add --extra-host arguments to services (#1086)

firecow · Feb 15, 2024 · a00b79f · a00b79f
1 parent 538214b
commit a00b79f
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/src/job.ts b/src/job.ts
@@ -1036,6 +1036,10 @@ export class Job {
             dockerCmd += `--volume ${volume} `;
         }
 
+        for (const extraHost of this.argv.extraHost) {
+            dockerCmd += `--add-host=${extraHost} `;
+        }
+
         const serviceAlias = service.alias;
         const serviceName = service.name;
         const serviceNameWithoutVersion = serviceName.replace(/(.*)(:.*)/, "$1");

diff --git a/tests/test-cases/extra-host/.gitlab-ci.yml b/tests/test-cases/extra-host/.gitlab-ci.yml
@@ -3,3 +3,12 @@ test-job:
   image: docker.io/curlimages/curl:7.69.1
   script:
     - curl -I http://fake-google.com
+
+service-job:
+  image: docker.io/curlimages/curl:7.69.1
+  services:
+    - name: docker.io/alpine:latest
+      entrypoint: ["/bin/sh", "-c"]
+      command: ["getent hosts fake-google.com"]
+  script:
+    - "true"
diff --git a/tests/test-cases/extra-host/integration.extra-host.test.ts b/tests/test-cases/extra-host/integration.extra-host.test.ts
@@ -3,6 +3,7 @@ import {handler} from "../../../src/handler";
 import chalk from "chalk";
 import {initSpawnSpy} from "../../mocks/utils.mock";
 import {WhenStatics} from "../../mocks/when-statics";
+import fs from "fs-extra";
 
 beforeAll(() => {
     initSpawnSpy(WhenStatics.all);
@@ -17,7 +18,22 @@ test("add-host <test-job>", async () => {
     }, writeStreams);
 
     const expected = [
-        chalk`{blueBright test-job} {greenBright >} HTTP/1.1 404 Not Found`,
+        chalk`{blueBright test-job   } {greenBright >} HTTP/1.1 404 Not Found`,
     ];
     expect(writeStreams.stdoutLines).toEqual(expect.arrayContaining(expected));
 });
+
+test("add-host <service-job>", async () => {
+    await fs.promises.rm("tests/test-cases/extra-host/.gitlab-ci-local/services-output/service-job/docker.io/alpine:latest-0.log", {force: true});
+
+    const writeStreams = new WriteStreamsMock();
+    await handler({
+        cwd: "tests/test-cases/extra-host",
+        job: ["service-job"],
+        extraHost: ["fake-google.com:142.250.185.206"],
+    }, writeStreams);
+
+    expect(writeStreams.stderrLines.length).toEqual(2);
+    expect(await fs.pathExists("tests/test-cases/extra-host/.gitlab-ci-local/services-output/service-job/docker.io/alpine:latest-0.log")).toEqual(true);
+    expect(await fs.readFile("tests/test-cases/extra-host/.gitlab-ci-local/services-output/service-job/docker.io/alpine:latest-0.log", "utf-8")).toMatch(/142.250.185.206/);
+});