Fix local lint and SSH Docker test harness

833353a→main·

Soph·2mo ago·4 files·+61 added/-63 removed

Sessions

9736a82de6e6View transcript

[?
can you update to v6.0.0-alpha.3Codex·GPT-5.4·9 steps](/content/gh/entireio/git-sync/session/019e27f2-b7de-71c3-a0f9-70d6539231ba#timeline-9736a82de6e6/index.html)

Changes

4

• internal/syncer

• Mssh_docker_test.go+36/-59

• Msyncer.go+1/-1

• mise-tasks/lint

• Mgo+20/-3

• Mgomod+4

2 unmodified lines

3
4
5
6
7
8
9
43 unmodified lines

53
54
55
55
56
57
58
59
4 unmodified lines

64
65
66
66
67
68
68
69
70
71
72
73
71
74
75
76
77
78
79
80
78
81
82
83
84
85
81
82
83
86
87
88
89
85
90
91
92
93
54 unmodified lines

148
149
150
146
151
152
153
154
49 unmodified lines

204
205
206
202
203
204
205
206
207
208
209
207
208
209
210
3 unmodified lines

214
215
216
219
220
217
218
219
222
223
220
221
222
223
227
228
224
225
226
227
228
232
229
230
231
232
233
237
234
235
236
1 unmodified line

238
239
240
245
241
242
243
244
245
250
246
247
253
254
248
249
250
251
252
253
254
260
261
255
256
257
263
258
259
260
1 unmodified line

262
263
264
271
272
265
266
267
274
275
268
269
270
271
272
273
274
275
276
277
282
278
279
280
281
2 unmodified lines

284
285
286
291
287
288
289
290
295
291
292
293
294
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317

2 unmodified lines

import (
    "context"
    "encoding/base64"
    "errors"
    "fmt"
    "math/rand"
    "os"
43 unmodified lines

runGit(t, worktree, "push", "origin", "HEAD:refs/heads/"+testBranch)

keyPath := filepath.Join(root, "id_ed25519")
    runCommand(t, root, nil, "ssh-keygen", "-t", "ed25519", "-N", "", "-f", keyPath)
    runCommand(t, root, "ssh-keygen", "-t", "ed25519", "-N", "", "-f", keyPath)
    pubKey, err := os.ReadFile(keyPath + ".pub")
    if err != nil {
        t.Fatalf("read public key: %v", err)
    }
4 unmodified lines

writeSSHServerDockerContext(t, imageCtx)

imageTag := fmt.Sprintf("git-sync-ssh-e2e:%d", rand.New(rand.NewSource(time.Now().UnixNano())).Int63())
    runCommand(t, imageCtx, nil, "docker", "build", "-t", imageTag, ".")
    runCommand(t, imageCtx, "docker", "build", "-t", imageTag, ".")
    t.Cleanup(func() {
        _ = runCommandBestEffort(root, nil, "docker", "image", "rm", "-f", imageTag)
        if err := runCommandBestEffort(t.Context(), root, "docker", "image", "rm", "-f", imageTag); err != nil {
            t.Logf("cleanup docker image: %v", err)
        }
    })

containerID := strings.TrimSpace(runCommand(t, root, nil,
    containerID := strings.TrimSpace(runCommand(t, root,
        "docker", "run", "-d",
        "-e", "AUTHORIZED_KEY_B64="+pubKeyB64,
        "-P",
        imageTag,
    ))
    t.Cleanup(func() {
        _ = runCommandBestEffort(root, nil, "docker", "rm", "-f", containerID)
        if err := runCommandBestEffort(t.Context(), root, "docker", "rm", "-f", containerID); err != nil {
            t.Logf("cleanup docker container: %v", err)
        }
    })

runCommand(t, root, nil, "docker", "cp", sourceBare, containerID+":/srv/git/source.git")
    runCommand(t, root, nil, "docker", "cp", targetBare, containerID+":"/srv/git/target.git")
    runCommand(t, root, nil, "docker", "exec", containerID, "chown", "-R", "git:git", "/srv/git")
    runCommand(t, root, "docker", "cp", sourceBare, containerID+":"/srv/git/source.git")
    runCommand(t, root, "docker", "cp", targetBare, containerID+":"/srv/git/target.git")
    runCommand(t, root, "docker", "exec", containerID, "chown", "-R", "git:git", "/srv/git")

portOutput := strings.TrimSpace(runCommandWithDiagnostics(t, root, nil, containerID,
    portOutput := strings.TrimSpace(runCommandWithDiagnostics(t, root, containerID,
        "docker", "port", containerID, "22/tcp",
    ))
    port, err := parseDockerPort(portOutput)
54 unmodified lines

}

syncedTargetBare := filepath.Join(root, "synced-target.git")
    runCommand(t, root, nil, "docker", "cp", containerID+":/srv/git/target.git", syncedTargetBare)
    runCommand(t, root, "docker", "cp", containerID+":/srv/git/target.git", syncedTargetBare)
    assertGitRefEqual(t, sourceBare, syncedTargetBare, plumbing.NewBranchReferenceName(testBranch))
}

49 unmodified lines

func dockerBindMountTempDir(t *testing.T) string {
t.Helper()

if root, err := os.MkdirTemp("/private/tmp", "gitsync-ssh-docker-*" ); err == nil {
        t.Cleanup(func() { _ = os.RemoveAll(root) })
        return root
    }

root := t.TempDir()
    return root
    return t.TempDir()
}

func waitForSSHReady(t *testing.T, sshPath string, containerID string) {
3 unmodified lines

var lastErr error
    for time.Now().Before(deadline) {
        cmd := exec.CommandContext(t.Context(), sshPath, "gitsync-ssh-docker", "true")
        if output, err := cmd.CombinedOutput(); err == nil {
            _ = output
        output, err := cmd.CombinedOutput()
        if err == nil {
            return
        } else {
            lastErr = fmt.Errorf("%w: %s", err, strings.TrimSpace(string(output)))
        }
        lastErr = fmt.Errorf("%w: %s", err, strings.TrimSpace(string(output)))
        time.Sleep(200 * time.Millisecond)
    }
    state := strings.TrimSpace(runCommandBestEffortOutput("", nil, "docker", "ps", "-a", "--filter", "id="+containerID, "--format", "{{.Status}}"))
    logs := strings.TrimSpace(runCommandBestEffortOutput("", nil, "docker", "logs", containerID))
    state := strings.TrimSpace(dockerCommandBestEffortOutput(t.Context(), "", "ps", "-a", "--filter", "id="+containerID, "--format", "{{.Status}}"))
    logs := strings.TrimSpace(dockerCommandBestEffortOutput(t.Context(), "", "logs", containerID))
    t.Fatalf("ssh server did not become ready: %v\ncontainer-status: %s\ncontainer-logs:\n%s", lastErr, state, logs)
}

func runCommand(t *testing.T, dir string, env map[string]string, name string, args ...string) string {
func runCommand(t *testing.T, dir string, name string, args ...string) string {
t.Helper()

cmd := exec.CommandContext(t.Context(), name, args...)
    cmd.Dir = dir
    cmd.Env = commandEnv(env)
    output, err := cmd.CombinedOutput()
    if err != nil {
        t.Fatalf("%s %s failed: %v\n%s", name, strings.Join(args, " "), err, output)
1 unmodified line

return string(output)
}

func runCommandWithDiagnostics(t *testing.T, dir string, env map[string]string, containerID string, name string, args ...string) string {
func runCommandWithDiagnostics(t *testing.T, dir string, containerID string, name string, args ...string) string {
t.Helper()

cmd := exec.CommandContext(t.Context(), name, args...)
    cmd.Dir = dir
    cmd.Env = commandEnv(env)
    output, err := cmd.CombinedOutput()
    if err != nil {
        state := strings.TrimSpace(runCommandBestEffortOutput(dir, env, "docker", "ps", "-a", "--filter", "id="+containerID, "--format", "{{.Status}}"))
        logs := strings.TrimSpace(runCommandBestEffortOutput(dir, env, "docker", "logs", containerID))
        state := strings.TrimSpace(dockerCommandBestEffortOutput(t.Context(), dir, "ps", "-a", "--filter", "id="+containerID, "--format", "{{.Status}}"))
        logs := strings.TrimSpace(dockerCommandBestEffortOutput(t.Context(), dir, "logs", containerID))
        t.Fatalf("%s %s failed: %v\n%s\ncontainer-status: %s\ncontainer-logs:\n%s", name, strings.Join(args, " "), err, output, state, logs)
    }
    return string(output)
}

func runCommandBestEffort(dir string, env map[string]string, name string, args ...string) error {
    cmd := exec.Command(name, args...)
func runCommandBestEffort(ctx context.Context, dir string, name string, args ...string) error {
    cmd := exec.CommandContext(ctx, name, args...)
    cmd.Dir = dir
    cmd.Env = commandEnv(env)
    output, err := cmd.CombinedOutput()
    if err != nil {
        return fmt.Errorf("%s %s failed: %w\n%s", name, strings.Join(args, " "), err, output)
1 unmodified line

return nil
}

func runCommandBestEffortOutput(dir string, env map[string]string, name string, args ...string) string {
    cmd := exec.Command(name, args...)
func dockerCommandBestEffortOutput(ctx context.Context, dir string, args ...string) string {
    cmd := exec.CommandContext(ctx, "docker", args...)
    cmd.Dir = dir
    cmd.Env = commandEnv(env)
    output, _ := cmd.CombinedOutput()
    output, err := cmd.CombinedOutput()
    if err != nil {
        return string(output)
    }
    return string(output)
}

func parseDockerPort(s string) (string, error) {
    s = strings.TrimSpace(s)
    if s == "" {
        return "", fmt.Errorf("empty port mapping")
        return "", errors.New("empty port mapping")
    }

if newline := strings.IndexByte(s, '\n'); newline >= 0 {
2 unmodified lines

idx := strings.LastIndexByte(s, ':')
    if idx < 0 {
        return "", fmt.Errorf("missing host port separator")
        return "", errors.New("missing host port separator")
    }
    port := strings.TrimSpace(s[idx+1:])
    if port == "" {
        return "", fmt.Errorf("empty host port")
        return "", errors.New("empty host port")
    }
    return port, nil
}

func commandEnv(overrides map[string]string) []string {
    env := append([]string(nil), os.Environ()...)
    for key, value := range overrides {
        prefix := key + "="
        replaced := false
        for i, entry := range env {
            if strings.HasPrefix(entry, prefix) {
                env[i] = prefix + value
                replaced = true
                break
            }
        }
        if !replaced {
            env = append(env, prefix+value)
        }
    }
    return env
}