test(lib): cover DNS repair templates

Author: skulidropek

packages/lib/tests/core/templates.test.ts

@@ -0,0 +1,81 @@
+import { describe, expect, it } from "@effect/vitest"
+
+import { defaultTemplateConfig, type TemplateConfig } from "../../src/core/domain.js"
+import { renderDockerCompose } from "../../src/core/templates/docker-compose.js"
+import { renderEntrypoint } from "../../src/core/templates-entrypoint.js"
+import { renderEntrypointDnsRepair } from "../../src/core/templates-entrypoint/dns-repair.js"
+
+const makeTemplateConfig = (overrides: Partial<TemplateConfig> = {}): TemplateConfig => ({
+  ...defaultTemplateConfig,
+  repoUrl: "https://github.com/org/repo.git",
+  containerName: "dg-test",
+  serviceName: "dg-test",
+  sshUser: "dev",
+  targetDir: "/home/dev/org/repo",
+  volumeName: "dg-test-home",
+  dockerGitPath: "/workspace/.docker-git",
+  authorizedKeysPath: "/workspace/authorized_keys",
+  envGlobalPath: "/workspace/.orch/env/global.env",
+  envProjectPath: "/workspace/.orch/env/project.env",
+  codexAuthPath: "/workspace/.orch/auth/codex",
+  codexSharedAuthPath: "/workspace/.orch/auth/codex-shared",
+  geminiAuthPath: "/workspace/.orch/auth/gemini",
+  ...overrides
+})
+
+describe("renderEntrypointDnsRepair", () => {
+  it("renders the fallback nameserver repair block", () => {
+    const dnsRepair = renderEntrypointDnsRepair()
+
+    expect(dnsRepair).toContain('local test_domain="github.com"')
+    expect(dnsRepair).toContain('local fallback_dns="8.8.8.8 8.8.4.4 1.1.1.1"')
+    expect(dnsRepair).toContain('printf "nameserver %s\\n" "$ns" >> "$resolv"')
+    expect(dnsRepair).toContain('echo "[dns-repair] WARNING: DNS resolution still failing after repair attempt"')
+    expect(dnsRepair).toContain("docker_git_repair_dns || true")
+  })
+
+  it("injects DNS repair before the package cache setup in the full entrypoint", () => {
+    const entrypoint = renderEntrypoint(makeTemplateConfig())
+    const dnsRepair = renderEntrypointDnsRepair()
+    const dnsRepairIndex = entrypoint.indexOf(dnsRepair)
+    const packageCacheIndex = entrypoint.indexOf(
+      "# Share package manager caches across all docker-git containers"
+    )
+
+    expect(dnsRepairIndex).toBeGreaterThanOrEqual(0)
+    expect(packageCacheIndex).toBeGreaterThan(dnsRepairIndex)
+  })
+})
+
+describe("renderDockerCompose", () => {
+  it("renders fallback DNS servers for the main container even without Playwright", () => {
+    const compose = renderDockerCompose(makeTemplateConfig())
+
+    expect(compose).toContain("container_name: dg-test")
+    expect(compose).toContain("    dns:\n      - 8.8.8.8\n      - 8.8.4.4\n      - 1.1.1.1\n    networks:")
+    expect(compose).not.toContain("dg-test-browser")
+    expect((compose.match(/\n    dns:\n/g) ?? []).length).toBe(1)
+  })
+
+  it("renders fallback DNS servers for the browser sidecar when Playwright is enabled", () => {
+    const compose = renderDockerCompose(
+      makeTemplateConfig({
+        enableMcpPlaywright: true
+      }),
+      {
+        cpuLimit: 1.5,
+        ramLimit: "2g"
+      }
+    )
+    const browserServiceIndex = compose.indexOf("\n  dg-test-browser:\n")
+    const browserDnsIndex = compose.indexOf(
+      '    dns:\n      - 8.8.8.8\n      - 8.8.4.4\n      - 1.1.1.1\n    volumes:\n      - dg-test-home-browser:/data\n',
+      browserServiceIndex
+    )
+
+    expect(compose).toContain('MCP_PLAYWRIGHT_CDP_ENDPOINT: "http://dg-test-browser:9223"')
+    expect(browserServiceIndex).toBeGreaterThanOrEqual(0)
+    expect(browserDnsIndex).toBeGreaterThan(browserServiceIndex)
+    expect((compose.match(/\n    dns:\n/g) ?? []).length).toBe(2)
+  })
+})

packages/lib/tests/usecases/prepare-files.test.ts

@@ -125,6 +125,9 @@ const readEnableMcpPlaywrightFlag = (value: unknown): boolean | undefined => {
   return typeof flag === "boolean" ? flag : undefined
 }
 
+const countOccurrences = (source: string, fragment: string): number =>
+  source.split(fragment).length - 1
+
 describe("prepareProjectFiles", () => {
   it.effect("force-env refresh rewrites managed templates", () =>
     withTempDir((root) =>
@@ -147,6 +150,7 @@ describe("prepareProjectFiles", () => {
         const entrypointPath = path.join(outDir, "entrypoint.sh")
         const entrypoint = yield* _(fs.readFileString(entrypointPath))
         const composeBefore = yield* _(fs.readFileString(path.join(outDir, "docker-compose.yml")))
+        const dnsBlock = "    dns:\n      - 8.8.8.8\n      - 8.8.4.4\n      - 1.1.1.1"
         const entrypointSyntaxExitCode = yield* _(
           runCommandExitCode({
             cwd: outDir,
@@ -171,6 +175,11 @@ describe("prepareProjectFiles", () => {
         expect(entrypoint).toContain('. /etc/profile 2>/dev/null || true;')
         expect(entrypoint).toContain("codex exec")
         expect(entrypoint).not.toContain("codex --approval-mode full-auto")
+        expect(entrypoint).toContain("docker_git_repair_dns() {")
+        expect(entrypoint).toContain('local test_domain="github.com"')
+        expect(entrypoint).toContain('local fallback_dns="8.8.8.8 8.8.4.4 1.1.1.1"')
+        expect(entrypoint).toContain('printf "nameserver %s\\n" "$ns" >> "$resolv"')
+        expect(entrypoint).toContain("docker_git_repair_dns || true")
         expect(entrypoint).toContain('"plugin": ["oh-my-opencode"]')
         expect(entrypoint).toContain("branch '$REPO_REF' missing; retrying without --branch")
         expect(entrypoint).not.toContain("git ls-remote --symref")
@@ -185,6 +194,7 @@ describe("prepareProjectFiles", () => {
         expect(composeBefore).not.toContain("dg-test-browser")
         expect(composeBefore).toContain("docker-git-shared")
         expect(composeBefore).toContain("external: true")
+        expect(countOccurrences(composeBefore, dnsBlock)).toBe(1)
 
         yield* _(
           prepareProjectFiles(outDir, root, globalConfig, withMcp, {
@@ -208,6 +218,7 @@ describe("prepareProjectFiles", () => {
         expect(composeAfter).toContain("container_name: dg-test-browser\n    restart: unless-stopped")
         expect(composeAfter).toContain("docker-git-shared")
         expect(composeAfter).toContain("external: true")
+        expect(countOccurrences(composeAfter, dnsBlock)).toBe(2)
         expect(readEnableMcpPlaywrightFlag(configAfter)).toBe(true)
         expect(configAfterText).toContain('"cpuLimit": "30%"')
         expect(configAfterText).toContain('"ramLimit": "30%"')