Merge branch 'cursor/tag-identity' into 'stage'
@@ -776,11 +776,28 @@ func Merge(ctx context.Context, gitBin, bare, work, source, target, author, emai
776
776
}
777
777
778
778
// Tag zet een annotated tag op sha.
779
func Tag(ctx context.Context, gitBin, dir, tag, sha, message string) error {
780
_, err := run(ctx, gitBin, nil, "-C", dir, "tag", "-a", tag, sha, "-m", message)
779
// Tag maakt een geannoteerde tag. Een annotated tag heeft een tagger
780
// nodig; de serviceaccount heeft geen git-identiteit, dus die komt mee.
781
// Leeg valt terug op BlueGit <noreply@git.timfalken.com>.
782
func Tag(ctx context.Context, gitBin, dir, tag, sha, message, author, email string) error {
783
if strings.TrimSpace(author) == "" || strings.TrimSpace(email) == "" {
784
author, email = FallbackName, FallbackEmail
785
}
786
home, err := os.MkdirTemp("", "bluegit-tag-")
787
if err != nil {
788
return err
789
}
790
defer os.RemoveAll(home)
791
_, err = run(ctx, gitBin, CommandEnv(author, email, home, home), "-C", dir, "tag", "-a", tag, sha, "-m", message)
781
792
return err
782
793
}
783
794
795
// FallbackName en FallbackEmail zijn de identiteit van BlueGit zelf.
796
const (
797
FallbackName = "BlueGit"
798
FallbackEmail = "noreply@git.timfalken.com"
799
)
800
784
801
// DiffStat is een korte vergelijking tussen twee branches.
785
802
func DiffStat(ctx context.Context, gitBin, dir, target, source string) (string, error) {
786
803
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, emai776
}776
}777
777
778
// Tag zet een annotated tag op sha.778
// Tag zet een annotated tag op sha.779
func Tag(ctx context.Context, gitBin, dir, tag, sha, message string) error {779
// Tag maakt een geannoteerde tag. Een annotated tag heeft een tagger780
_, err := run(ctx, gitBin, nil, "-C", dir, "tag", "-a", tag, sha, "-m", message)780
// nodig; de serviceaccount heeft geen git-identiteit, dus die komt mee.781
// Leeg valt terug op BlueGit <noreply@git.timfalken.com>.782
func Tag(ctx context.Context, gitBin, dir, tag, sha, message, author, email string) error {783
if strings.TrimSpace(author) == "" || strings.TrimSpace(email) == "" {784
author, email = FallbackName, FallbackEmail785
}786
home, err := os.MkdirTemp("", "bluegit-tag-")787
if err != nil {788
return err789
}790
defer os.RemoveAll(home)791
_, err = run(ctx, gitBin, CommandEnv(author, email, home, home), "-C", dir, "tag", "-a", tag, sha, "-m", message)781
return err792
return err782
}793
}783
794
795
// FallbackName en FallbackEmail zijn de identiteit van BlueGit zelf.796
const (797
FallbackName = "BlueGit"798
FallbackEmail = "noreply@git.timfalken.com"799
)800
784
// DiffStat is een korte vergelijking tussen twee branches.801
// DiffStat is een korte vergelijking tussen twee branches.785
func DiffStat(ctx context.Context, gitBin, dir, target, source string) (string, error) {802
func DiffStat(ctx context.Context, gitBin, dir, target, source string) (string, error) {786
out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--oneline", target+".."+source)803
out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--oneline", target+".."+source)@@ -0,0 +1,55 @@
1
package gitrepo
2
3
import (
4
"context"
5
"os"
6
"os/exec"
7
"path/filepath"
8
"strings"
9
"testing"
10
)
11
12
// De serviceaccount op de server heeft geen user.name/email. useConfigOnly
13
// bootst dat na: zonder meegegeven identiteit faalt `git tag -a`.
14
func TestTagWithoutServerIdentity(t *testing.T) {
15
if _, err := exec.LookPath("git"); err != nil {
16
t.Skip("git ontbreekt")
17
}
18
work := t.TempDir()
19
gitc := func(dir string, env []string, args ...string) (string, error) {
20
cmd := exec.Command("git", append([]string{"-C", dir}, args...)...)
21
cmd.Env = env
22
out, err := cmd.CombinedOutput()
23
return string(out), err
24
}
25
ident := append(os.Environ(), "GIT_AUTHOR_NAME=t", "GIT_AUTHOR_EMAIL=t@t", "GIT_COMMITTER_NAME=t", "GIT_COMMITTER_EMAIL=t@t")
26
for _, a := range [][]string{{"init", "-q", "-b", "master"}, {"commit", "-q", "--allow-empty", "-m", "x"}} {
27
if out, err := gitc(work, ident, a...); err != nil {
28
t.Fatal(out)
29
}
30
}
31
bare := filepath.Join(t.TempDir(), "r.git")
32
if out, err := exec.Command("git", "clone", "-q", "--bare", work, bare).CombinedOutput(); err != nil {
33
t.Fatal(string(out))
34
}
35
_, _ = gitc(bare, os.Environ(), "config", "user.useConfigOnly", "true")
36
sha, _ := gitc(bare, os.Environ(), "rev-parse", "HEAD")
37
sha = strings.TrimSpace(sha)
38
39
bareEnv := []string{"PATH=" + os.Getenv("PATH"), "HOME=" + t.TempDir(), "GIT_CONFIG_GLOBAL=/dev/null", "GIT_CONFIG_SYSTEM=/dev/null"}
40
if out, err := gitc(bare, bareEnv, "tag", "-a", "oud", sha, "-m", "oud"); err == nil {
41
t.Skipf("git raadt hier toch een identiteit: %s", out)
42
}
43
t.Setenv("HOME", t.TempDir())
44
t.Setenv("GIT_CONFIG_GLOBAL", "/dev/null")
45
if err := Tag(context.Background(), "git", bare, "v1.0.0", sha, "Release", "tim", "tim@users.git.timfalken.com"); err != nil {
46
t.Fatalf("tag met identiteit: %v", err)
47
}
48
if err := Tag(context.Background(), "git", bare, "v1.0.1", sha, "Release", "", ""); err != nil {
49
t.Fatalf("tag met fallback: %v", err)
50
}
51
out, _ := gitc(bare, os.Environ(), "for-each-ref", "--format=%(taggername) %(taggeremail)", "refs/tags/")
52
if !strings.Contains(out, "tim <tim@users.git.timfalken.com>") || !strings.Contains(out, "BlueGit <noreply@git.timfalken.com>") {
53
t.Fatalf("tagger: %s", out)
54
}
55
}
@@ -0,0 +1,55 @@1
package gitrepo2
3
import (4
"context"5
"os"6
"os/exec"7
"path/filepath"8
"strings"9
"testing"10
)11
12
// De serviceaccount op de server heeft geen user.name/email. useConfigOnly13
// bootst dat na: zonder meegegeven identiteit faalt `git tag -a`.14
func TestTagWithoutServerIdentity(t *testing.T) {15
if _, err := exec.LookPath("git"); err != nil {16
t.Skip("git ontbreekt")17
}18
work := t.TempDir()19
gitc := func(dir string, env []string, args ...string) (string, error) {20
cmd := exec.Command("git", append([]string{"-C", dir}, args...)...)21
cmd.Env = env22
out, err := cmd.CombinedOutput()23
return string(out), err24
}25
ident := append(os.Environ(), "GIT_AUTHOR_NAME=t", "GIT_AUTHOR_EMAIL=t@t", "GIT_COMMITTER_NAME=t", "GIT_COMMITTER_EMAIL=t@t")26
for _, a := range [][]string{{"init", "-q", "-b", "master"}, {"commit", "-q", "--allow-empty", "-m", "x"}} {27
if out, err := gitc(work, ident, a...); err != nil {28
t.Fatal(out)29
}30
}31
bare := filepath.Join(t.TempDir(), "r.git")32
if out, err := exec.Command("git", "clone", "-q", "--bare", work, bare).CombinedOutput(); err != nil {33
t.Fatal(string(out))34
}35
_, _ = gitc(bare, os.Environ(), "config", "user.useConfigOnly", "true")36
sha, _ := gitc(bare, os.Environ(), "rev-parse", "HEAD")37
sha = strings.TrimSpace(sha)38
39
bareEnv := []string{"PATH=" + os.Getenv("PATH"), "HOME=" + t.TempDir(), "GIT_CONFIG_GLOBAL=/dev/null", "GIT_CONFIG_SYSTEM=/dev/null"}40
if out, err := gitc(bare, bareEnv, "tag", "-a", "oud", sha, "-m", "oud"); err == nil {41
t.Skipf("git raadt hier toch een identiteit: %s", out)42
}43
t.Setenv("HOME", t.TempDir())44
t.Setenv("GIT_CONFIG_GLOBAL", "/dev/null")45
if err := Tag(context.Background(), "git", bare, "v1.0.0", sha, "Release", "tim", "tim@users.git.timfalken.com"); err != nil {46
t.Fatalf("tag met identiteit: %v", err)47
}48
if err := Tag(context.Background(), "git", bare, "v1.0.1", sha, "Release", "", ""); err != nil {49
t.Fatalf("tag met fallback: %v", err)50
}51
out, _ := gitc(bare, os.Environ(), "for-each-ref", "--format=%(taggername) %(taggeremail)", "refs/tags/")52
if !strings.Contains(out, "tim <tim@users.git.timfalken.com>") || !strings.Contains(out, "BlueGit <noreply@git.timfalken.com>") {53
t.Fatalf("tagger: %s", out)54
}55
}@@ -238,6 +238,9 @@ func (s *Server) opPublishRelease(ctx context.Context, repo store.Repo, author s
238
238
if !gitrepo.HasCommit(ctx, s.Git, dir, req.Commit) {
239
239
return 0, fail(400, i18n.E("err.commitMissing"))
240
240
}
241
if gitrepo.HasTag(ctx, s.Git, dir, req.Tag) {
242
return 0, fail(409, i18n.E("err.tagExists", req.Tag))
243
}
241
244
if req.Name == "" {
242
245
req.Name = req.Tag
243
246
}
@@ -267,7 +270,15 @@ func (s *Server) opPublishRelease(ctx context.Context, repo store.Repo, author s
267
270
assets = append(assets, store.ReleaseAsset{Name: a.Name, StoragePath: dst, Size: info.Size()})
268
271
}
269
272
if err := s.postReceive(ctx, repo, author, dir, func() error {
270
return gitrepo.Tag(ctx, s.Git, dir, req.Tag, req.Commit, req.Name)
273
name, email := gitrepo.FallbackName, gitrepo.FallbackEmail
274
if author.Username != "" {
275
name, email = author.Username, userEmail(author.Username)
276
} else if job.ID != 0 {
277
if p, err := s.Store.PipelineByID(ctx, repo.ID, job.PipelineID); err == nil && p.Actor != "" {
278
name, email = p.Actor, userEmail(p.Actor)
279
}
280
}
281
return gitrepo.Tag(ctx, s.Git, dir, req.Tag, req.Commit, req.Name, name, email)
271
282
}); err != nil {
272
283
return 0, fail(400, i18n.E("err.tagFail", err.Error()))
273
284
}
@@ -238,6 +238,9 @@ func (s *Server) opPublishRelease(ctx context.Context, repo store.Repo, author s238
if !gitrepo.HasCommit(ctx, s.Git, dir, req.Commit) {238
if !gitrepo.HasCommit(ctx, s.Git, dir, req.Commit) {239
return 0, fail(400, i18n.E("err.commitMissing"))239
return 0, fail(400, i18n.E("err.commitMissing"))240
}240
}241
if gitrepo.HasTag(ctx, s.Git, dir, req.Tag) {242
return 0, fail(409, i18n.E("err.tagExists", req.Tag))243
}241
if req.Name == "" {244
if req.Name == "" {242
req.Name = req.Tag245
req.Name = req.Tag243
}246
}@@ -267,7 +270,15 @@ func (s *Server) opPublishRelease(ctx context.Context, repo store.Repo, author s267
assets = append(assets, store.ReleaseAsset{Name: a.Name, StoragePath: dst, Size: info.Size()})270
assets = append(assets, store.ReleaseAsset{Name: a.Name, StoragePath: dst, Size: info.Size()})268
}271
}269
if err := s.postReceive(ctx, repo, author, dir, func() error {272
if err := s.postReceive(ctx, repo, author, dir, func() error {270
return gitrepo.Tag(ctx, s.Git, dir, req.Tag, req.Commit, req.Name)273
name, email := gitrepo.FallbackName, gitrepo.FallbackEmail274
if author.Username != "" {275
name, email = author.Username, userEmail(author.Username)276
} else if job.ID != 0 {277
if p, err := s.Store.PipelineByID(ctx, repo.ID, job.PipelineID); err == nil && p.Actor != "" {278
name, email = p.Actor, userEmail(p.Actor)279
}280
}281
return gitrepo.Tag(ctx, s.Git, dir, req.Tag, req.Commit, req.Name, name, email)271
}); err != nil {282
}); err != nil {272
return 0, fail(400, i18n.E("err.tagFail", err.Error()))283
return 0, fail(400, i18n.E("err.tagFail", err.Error()))273
}284
}