refactor(config): move the detached-head ConfigLoader fix to its own PR

Review feedback on #1532: the cached git-source recovery isn't part of
the postgres sink. The change and its tests now live on
fix/configloader-detached-head unchanged.

Author: dcoric

src/config/ConfigLoader.ts

@@ -293,24 +293,22 @@ export class ConfigLoader extends EventEmitter {
 
     console.log(`Using repository directory: ${repoDir}`);
 
-    const gitEnv = {
-      // dont wait for credentials; the command should be sufficiently authed
-      // https://git-scm.com/docs/git#Documentation/git.txt-codeGITTERMINALPROMPTcode
-      GIT_TERMINAL_PROMPT: 'false',
-      ...process.env,
-      ...(source.auth?.type === 'ssh'
-        ? {
-            GIT_SSH_COMMAND: `ssh -i ${source.auth.privateKeyPath}`,
-          }
-        : {}),
-    };
-
     // Clone or pull repository
     if (!fs.existsSync(repoDir)) {
       console.log(`Cloning repository ${source.repository} to ${repoDir}`);
       const execOptions = {
         cwd: process.cwd(),
-        env: gitEnv,
+        env: {
+          // dont wait for credentials; the command should be sufficiently authed
+          // https://git-scm.com/docs/git#Documentation/git.txt-codeGITTERMINALPROMPTcode
+          GIT_TERMINAL_PROMPT: 'false',
+          ...process.env,
+          ...(source.auth?.type === 'ssh'
+            ? {
+                GIT_SSH_COMMAND: `ssh -i ${source.auth.privateKeyPath}`,
+              }
+            : {}),
+        },
       };
 
       try {
@@ -320,20 +318,12 @@ export class ConfigLoader extends EventEmitter {
         handleErrorAndThrow(error, 'Failed to clone repository');
       }
     } else {
-      console.log(`Fetching latest changes from ${source.repository}`);
+      console.log(`Pulling latest changes from ${source.repository}`);
       try {
-        if (source.branch) {
-          await execFileAsync('git', ['fetch', '--all', '--prune'], { cwd: repoDir, env: gitEnv });
-          console.log('Repository fetched successfully');
-        } else {
-          await execFileAsync('git', ['pull'], { cwd: repoDir, env: gitEnv });
-          console.log('Repository pulled successfully');
-        }
+        await execFileAsync('git', ['pull'], { cwd: repoDir });
+        console.log('Repository pulled successfully');
       } catch (error: unknown) {
-        handleErrorAndThrow(
-          error,
-          source.branch ? 'Failed to fetch repository' : 'Failed to pull repository',
-        );
+        handleErrorAndThrow(error, 'Failed to pull repository');
       }
     }
 
@@ -346,17 +336,6 @@ export class ConfigLoader extends EventEmitter {
       } catch (error: unknown) {
         handleErrorAndThrow(error, `Failed to checkout branch ${source.branch}`);
       }
-
-      console.log(`Pulling latest changes from ${source.branch}`);
-      try {
-        await execFileAsync('git', ['pull', '--ff-only', 'origin', source.branch], {
-          cwd: repoDir,
-          env: gitEnv,
-        });
-        console.log('Repository pulled successfully');
-      } catch (error: unknown) {
-        handleErrorAndThrow(error, 'Failed to pull repository');
-      }
     }
 
     // Read and parse config file

test/ConfigLoader.test.ts

@@ -17,8 +17,6 @@
 import { describe, it, beforeEach, afterEach, afterAll, expect, vi } from 'vitest';
 import fs from 'fs';
 import path from 'path';
-import { execFile } from 'child_process';
-import { promisify } from 'util';
 import { getConfigFile } from '../src/config/file';
 import {
   ConfigLoader,
@@ -35,8 +33,6 @@ import {
 } from '../src/config/types';
 import axios from 'axios';
 
-const execFileAsync = promisify(execFile);
-
 describe('ConfigLoader', () => {
   let configLoader: ConfigLoader;
   let tempDir: string;
@@ -475,64 +471,6 @@ describe('ConfigLoader', () => {
       expect(config).toHaveProperty('cookieSecret');
     }, 10000);
 
-    it('should recover a cached git repository that is on a detached HEAD', async () => {
-      const source: GitSource = {
-        type: 'git',
-        repository: 'https://example.com/git-proxy-config-test.git',
-        path: 'proxy.config.json',
-        branch: 'main',
-        enabled: true,
-      };
-      const remoteDir = path.resolve(tempDir, 'remote.git');
-      const workDir = path.resolve(tempDir, 'work');
-      const envPaths = (await import('env-paths')).default;
-      const paths = envPaths('git-proxy', { suffix: '' });
-      const repoDirName = Buffer.from(source.repository)
-        .toString('base64')
-        .replace(/[^a-zA-Z0-9]/g, '_');
-      const repoDir = path.join(paths.cache, 'git-config-cache', repoDirName);
-
-      if (fs.existsSync(repoDir)) {
-        fs.rmSync(repoDir, { recursive: true });
-      }
-
-      await execFileAsync('git', ['init', '--bare', remoteDir]);
-      await execFileAsync('git', ['init', '--initial-branch=main', workDir]);
-      fs.writeFileSync(
-        path.join(workDir, source.path),
-        JSON.stringify({ proxyUrl: 'https://test.com', cookieSecret: 'from-cache' }),
-      );
-      await execFileAsync('git', ['add', source.path], { cwd: workDir });
-      await execFileAsync(
-        'git',
-        [
-          '-c',
-          'user.email=test@example.com',
-          '-c',
-          'user.name=git-proxy test',
-          'commit',
-          '-m',
-          'add config',
-        ],
-        { cwd: workDir },
-      );
-      await execFileAsync('git', ['remote', 'add', 'origin', remoteDir], { cwd: workDir });
-      await execFileAsync('git', ['push', '-u', 'origin', 'main'], { cwd: workDir });
-      await execFileAsync('git', ['clone', remoteDir, repoDir]);
-      // The clone's default branch follows the host's `init.defaultBranch`, which
-      // may differ from the pushed `main` (e.g. `master` on CI), leaving local
-      // HEAD unborn. Detach at the pushed commit by SHA so HEAD is reliably
-      // detached and the working tree is populated on every git version.
-      const { stdout: headSha } = await execFileAsync('git', ['rev-parse', 'origin/main'], {
-        cwd: repoDir,
-      });
-      await execFileAsync('git', ['checkout', headSha.trim()], { cwd: repoDir });
-
-      const config = await configLoader.loadFromSource(source);
-
-      expect(config.cookieSecret).toBe('from-cache');
-    });
-
     it('should throw error for invalid configuration file path (git)', async () => {
       const source: GitSource = {
         type: 'git',