Merged
fix(release): release-API faalde op git tag -a zonder identiteit
timfa
wants to merge
1 commit
from
cursor/tag-identity
into
stage
Overview Commits 1 Pipelines 1 Changes 3
De bluegit-serviceaccount heeft geen user.name/email. gitrepo.Tag (de release-API) draaide git tag -a zonder tagger en faalde daardoor altijd met 400.
Nu krijgt de tag een tagger mee: de releasende gebruiker, of bij een job-token de actor van de pipeline, met fallback BlueGit <noreply@git.timfalken.com>. Daarbij een eigen HOME en geen globale config.
Een bestaande tag geeft nu 409 met een duidelijke JSON-fout. Overige git-fouten komen als tag: <git stderr> in de JSON.
Andere server-side commits (merge, editor, suggesties, UI-tags) gaven al een identiteit mee.
Test: internal/gitrepo/tag_identity_test.go reproduceert het met user.useConfigOnly (zonder identiteit faalt git) en controleert tagger en fallback.
Activity
- timfa Pipeline #194 is Passed 24 October 2026
- timfa opened this merge request 24 October 2026
- timfa merged this merge request 24 October 2026
Commits
Pipelines
- #194 Passed
Changes
@@ -776,11 +776,28 @@ func Merge(ctx context.Context, gitBin, bare, work, source, target, author, emai
}
// Tag zet een annotated tag op sha.
func Tag(ctx context.Context, gitBin, dir, tag, sha, message string) error {
_, err := run(ctx, gitBin, nil, "-C", dir, "tag", "-a", tag, sha, "-m", message)
// Tag maakt een geannoteerde tag. Een annotated tag heeft een tagger
// nodig; de serviceaccount heeft geen git-identiteit, dus die komt mee.
// Leeg valt terug op BlueGit <noreply@git.timfalken.com>.
func Tag(ctx context.Context, gitBin, dir, tag, sha, message, author, email string) error {
if strings.TrimSpace(author) == "" || strings.TrimSpace(email) == "" {
author, email = FallbackName, FallbackEmail
}
home, err := os.MkdirTemp("", "bluegit-tag-")
if err != nil {
return err
}
defer os.RemoveAll(home)
_, err = run(ctx, gitBin, CommandEnv(author, email, home, home), "-C", dir, "tag", "-a", tag, sha, "-m", message)
return err
}
// FallbackName en FallbackEmail zijn de identiteit van BlueGit zelf.
const (
FallbackName = "BlueGit"
FallbackEmail = "noreply@git.timfalken.com"
)
// DiffStat is een korte vergelijking tussen twee branches.
func DiffStat(ctx context.Context, gitBin, dir, target, source string) (string, error) {
out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--oneline", target+".."+source)
@@ -776,11 +776,28 @@ func Merge(ctx context.Context, gitBin, bare, work, source, target, author, emai}}// Tag zet een annotated tag op sha.// Tag zet een annotated tag op sha.func Tag(ctx context.Context, gitBin, dir, tag, sha, message string) error {// Tag maakt een geannoteerde tag. Een annotated tag heeft een tagger _, err := run(ctx, gitBin, nil, "-C", dir, "tag", "-a", tag, sha, "-m", message)// nodig; de serviceaccount heeft geen git-identiteit, dus die komt mee.// Leeg valt terug op BlueGit <noreply@git.timfalken.com>.func Tag(ctx context.Context, gitBin, dir, tag, sha, message, author, email string) error { if strings.TrimSpace(author) == "" || strings.TrimSpace(email) == "" { author, email = FallbackName, FallbackEmail } home, err := os.MkdirTemp("", "bluegit-tag-") if err != nil { return err } defer os.RemoveAll(home) _, err = run(ctx, gitBin, CommandEnv(author, email, home, home), "-C", dir, "tag", "-a", tag, sha, "-m", message) return err return err}}// FallbackName en FallbackEmail zijn de identiteit van BlueGit zelf.const ( FallbackName = "BlueGit" FallbackEmail = "noreply@git.timfalken.com")// DiffStat is een korte vergelijking tussen twee branches.// DiffStat is een korte vergelijking tussen twee branches.func DiffStat(ctx context.Context, gitBin, dir, target, source string) (string, error) {func DiffStat(ctx context.Context, gitBin, dir, target, source string) (string, error) { out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--oneline", target+".."+source) out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--oneline", target+".."+source)@@ -0,0 +1,55 @@
package gitrepo
import (
"context"
"os"
"os/exec"
"path/filepath"
"strings"
"testing"
)
// De serviceaccount op de server heeft geen user.name/email. useConfigOnly
// bootst dat na: zonder meegegeven identiteit faalt `git tag -a`.
func TestTagWithoutServerIdentity(t *testing.T) {
if _, err := exec.LookPath("git"); err != nil {
t.Skip("git ontbreekt")
}
work := t.TempDir()
gitc := func(dir string, env []string, args ...string) (string, error) {
cmd := exec.Command("git", append([]string{"-C", dir}, args...)...)
cmd.Env = env
out, err := cmd.CombinedOutput()
return string(out), err
}
ident := append(os.Environ(), "GIT_AUTHOR_NAME=t", "GIT_AUTHOR_EMAIL=t@t", "GIT_COMMITTER_NAME=t", "GIT_COMMITTER_EMAIL=t@t")
for _, a := range [][]string{{"init", "-q", "-b", "master"}, {"commit", "-q", "--allow-empty", "-m", "x"}} {
if out, err := gitc(work, ident, a...); err != nil {
t.Fatal(out)
}
}
bare := filepath.Join(t.TempDir(), "r.git")
if out, err := exec.Command("git", "clone", "-q", "--bare", work, bare).CombinedOutput(); err != nil {
t.Fatal(string(out))
}
_, _ = gitc(bare, os.Environ(), "config", "user.useConfigOnly", "true")
sha, _ := gitc(bare, os.Environ(), "rev-parse", "HEAD")
sha = strings.TrimSpace(sha)
bareEnv := []string{"PATH=" + os.Getenv("PATH"), "HOME=" + t.TempDir(), "GIT_CONFIG_GLOBAL=/dev/null", "GIT_CONFIG_SYSTEM=/dev/null"}
if out, err := gitc(bare, bareEnv, "tag", "-a", "oud", sha, "-m", "oud"); err == nil {
t.Skipf("git raadt hier toch een identiteit: %s", out)
}
t.Setenv("HOME", t.TempDir())
t.Setenv("GIT_CONFIG_GLOBAL", "/dev/null")
if err := Tag(context.Background(), "git", bare, "v1.0.0", sha, "Release", "tim", "tim@users.git.timfalken.com"); err != nil {
t.Fatalf("tag met identiteit: %v", err)
}
if err := Tag(context.Background(), "git", bare, "v1.0.1", sha, "Release", "", ""); err != nil {
t.Fatalf("tag met fallback: %v", err)
}
out, _ := gitc(bare, os.Environ(), "for-each-ref", "--format=%(taggername) %(taggeremail)", "refs/tags/")
if !strings.Contains(out, "tim <tim@users.git.timfalken.com>") || !strings.Contains(out, "BlueGit <noreply@git.timfalken.com>") {
t.Fatalf("tagger: %s", out)
}
}
@@ -0,0 +1,55 @@package gitrepoimport ( "context" "os" "os/exec" "path/filepath" "strings" "testing")// De serviceaccount op de server heeft geen user.name/email. useConfigOnly// bootst dat na: zonder meegegeven identiteit faalt `git tag -a`.func TestTagWithoutServerIdentity(t *testing.T) { if _, err := exec.LookPath("git"); err != nil { t.Skip("git ontbreekt") } work := t.TempDir() gitc := func(dir string, env []string, args ...string) (string, error) { cmd := exec.Command("git", append([]string{"-C", dir}, args...)...) cmd.Env = env out, err := cmd.CombinedOutput() return string(out), err } ident := append(os.Environ(), "GIT_AUTHOR_NAME=t", "GIT_AUTHOR_EMAIL=t@t", "GIT_COMMITTER_NAME=t", "GIT_COMMITTER_EMAIL=t@t") for _, a := range [][]string{{"init", "-q", "-b", "master"}, {"commit", "-q", "--allow-empty", "-m", "x"}} { if out, err := gitc(work, ident, a...); err != nil { t.Fatal(out) } } bare := filepath.Join(t.TempDir(), "r.git") if out, err := exec.Command("git", "clone", "-q", "--bare", work, bare).CombinedOutput(); err != nil { t.Fatal(string(out)) } _, _ = gitc(bare, os.Environ(), "config", "user.useConfigOnly", "true") sha, _ := gitc(bare, os.Environ(), "rev-parse", "HEAD") sha = strings.TrimSpace(sha) bareEnv := []string{"PATH=" + os.Getenv("PATH"), "HOME=" + t.TempDir(), "GIT_CONFIG_GLOBAL=/dev/null", "GIT_CONFIG_SYSTEM=/dev/null"} if out, err := gitc(bare, bareEnv, "tag", "-a", "oud", sha, "-m", "oud"); err == nil { t.Skipf("git raadt hier toch een identiteit: %s", out) } t.Setenv("HOME", t.TempDir()) t.Setenv("GIT_CONFIG_GLOBAL", "/dev/null") if err := Tag(context.Background(), "git", bare, "v1.0.0", sha, "Release", "tim", "tim@users.git.timfalken.com"); err != nil { t.Fatalf("tag met identiteit: %v", err) } if err := Tag(context.Background(), "git", bare, "v1.0.1", sha, "Release", "", ""); err != nil { t.Fatalf("tag met fallback: %v", err) } out, _ := gitc(bare, os.Environ(), "for-each-ref", "--format=%(taggername) %(taggeremail)", "refs/tags/") if !strings.Contains(out, "tim <tim@users.git.timfalken.com>") || !strings.Contains(out, "BlueGit <noreply@git.timfalken.com>") { t.Fatalf("tagger: %s", out) }}@@ -238,6 +238,9 @@ func (s *Server) opPublishRelease(ctx context.Context, repo store.Repo, author s
if !gitrepo.HasCommit(ctx, s.Git, dir, req.Commit) {
return 0, fail(400, i18n.E("err.commitMissing"))
}
if gitrepo.HasTag(ctx, s.Git, dir, req.Tag) {
return 0, fail(409, i18n.E("err.tagExists", req.Tag))
}
if req.Name == "" {
req.Name = req.Tag
}
@@ -267,7 +270,15 @@ func (s *Server) opPublishRelease(ctx context.Context, repo store.Repo, author s
assets = append(assets, store.ReleaseAsset{Name: a.Name, StoragePath: dst, Size: info.Size()})
}
if err := s.postReceive(ctx, repo, author, dir, func() error {
return gitrepo.Tag(ctx, s.Git, dir, req.Tag, req.Commit, req.Name)
name, email := gitrepo.FallbackName, gitrepo.FallbackEmail
if author.Username != "" {
name, email = author.Username, userEmail(author.Username)
} else if job.ID != 0 {
if p, err := s.Store.PipelineByID(ctx, repo.ID, job.PipelineID); err == nil && p.Actor != "" {
name, email = p.Actor, userEmail(p.Actor)
}
}
return gitrepo.Tag(ctx, s.Git, dir, req.Tag, req.Commit, req.Name, name, email)
}); err != nil {
return 0, fail(400, i18n.E("err.tagFail", err.Error()))
}
@@ -238,6 +238,9 @@ func (s *Server) opPublishRelease(ctx context.Context, repo store.Repo, author s if !gitrepo.HasCommit(ctx, s.Git, dir, req.Commit) { if !gitrepo.HasCommit(ctx, s.Git, dir, req.Commit) { return 0, fail(400, i18n.E("err.commitMissing")) return 0, fail(400, i18n.E("err.commitMissing")) } } if gitrepo.HasTag(ctx, s.Git, dir, req.Tag) { return 0, fail(409, i18n.E("err.tagExists", req.Tag)) } if req.Name == "" { if req.Name == "" { req.Name = req.Tag req.Name = req.Tag } }@@ -267,7 +270,15 @@ func (s *Server) opPublishRelease(ctx context.Context, repo store.Repo, author s assets = append(assets, store.ReleaseAsset{Name: a.Name, StoragePath: dst, Size: info.Size()}) assets = append(assets, store.ReleaseAsset{Name: a.Name, StoragePath: dst, Size: info.Size()}) } } if err := s.postReceive(ctx, repo, author, dir, func() error { if err := s.postReceive(ctx, repo, author, dir, func() error { return gitrepo.Tag(ctx, s.Git, dir, req.Tag, req.Commit, req.Name) name, email := gitrepo.FallbackName, gitrepo.FallbackEmail if author.Username != "" { name, email = author.Username, userEmail(author.Username) } else if job.ID != 0 { if p, err := s.Store.PipelineByID(ctx, repo.ID, job.PipelineID); err == nil && p.Actor != "" { name, email = p.Actor, userEmail(p.Actor) } } return gitrepo.Tag(ctx, s.Git, dir, req.Tag, req.Commit, req.Name, name, email) }); err != nil { }); err != nil { return 0, fail(400, i18n.E("err.tagFail", err.Error())) return 0, fail(400, i18n.E("err.tagFail", err.Error())) } }