From 8c6eea468ebd90b5d19d9fb3bffda67219210a7c Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sun, 18 Sep 2022 00:21:23 +0200 Subject: [PATCH 01/11] with docker action --- _examples/actions/docker_action/Dockerfile | 8 ++++ _examples/actions/docker_action/go.mod | 11 ++++++ _examples/actions/docker_action/go.sum | 20 ++++++++++ _examples/actions/docker_action/kraken.yml | 11 ++++++ cmd/kraken/commands/process.go | 4 +- internal/actions/action.go | 11 ++++++ internal/actions/builders/docker.go | 44 ++++++++++++++++++++++ 7 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 _examples/actions/docker_action/Dockerfile create mode 100644 _examples/actions/docker_action/go.mod create mode 100644 _examples/actions/docker_action/go.sum create mode 100644 _examples/actions/docker_action/kraken.yml create mode 100644 internal/actions/builders/docker.go diff --git a/_examples/actions/docker_action/Dockerfile b/_examples/actions/docker_action/Dockerfile new file mode 100644 index 0000000..7af7f8e --- /dev/null +++ b/_examples/actions/docker_action/Dockerfile @@ -0,0 +1,8 @@ +FROM debian:bullseye-slim + +# Kraken relies on this path being the specified path +WORKDIR /src/work/ + +COPY . . + +RUN echo "# README docker" >> README.md diff --git a/_examples/actions/docker_action/go.mod b/_examples/actions/docker_action/go.mod new file mode 100644 index 0000000..248ba10 --- /dev/null +++ b/_examples/actions/docker_action/go.mod @@ -0,0 +1,11 @@ +module write_a_readme + +go 1.19 + +require github.com/bitfield/script v0.20.2 + +require ( + bitbucket.org/creachadair/shell v0.0.7 // indirect + github.com/itchyny/gojq v0.12.7 // indirect + github.com/itchyny/timefmt-go v0.1.3 // indirect +) diff --git a/_examples/actions/docker_action/go.sum b/_examples/actions/docker_action/go.sum new file mode 100644 index 0000000..234eb1e --- /dev/null +++ b/_examples/actions/docker_action/go.sum @@ -0,0 +1,20 @@ +bitbucket.org/creachadair/shell v0.0.7 h1:Z96pB6DkSb7F3Y3BBnJeOZH2gazyMTWlvecSD4vDqfk= +bitbucket.org/creachadair/shell v0.0.7/go.mod h1:oqtXSSvSYr4624lnnabXHaBsYW6RD80caLi2b3hJk0U= +github.com/bitfield/script v0.20.2 h1:4DexsRtBILVMEn3EZwHbtJdDqdk43sXI8gM3F04JXgs= +github.com/bitfield/script v0.20.2/go.mod h1:l3AZPVAtKQrL03bwh7nlNTUtgrgSWurpJSbtqspYrOA= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= +github.com/itchyny/gojq v0.12.7 h1:hYPTpeWfrJ1OT+2j6cvBScbhl0TkdwGM4bc66onUSOQ= +github.com/itchyny/gojq v0.12.7/go.mod h1:ZdvNHVlzPgUf8pgjnuDTmGfHA/21KoutQUJ3An/xNuw= +github.com/itchyny/timefmt-go v0.1.3 h1:7M3LGVDsqcd0VZH2U+x393obrzZisp7C0uEe921iRkU= +github.com/itchyny/timefmt-go v0.1.3/go.mod h1:0osSSCQSASBJMsIZnhAaF1C2fCBTJZXrnj37mG8/c+A= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/_examples/actions/docker_action/kraken.yml b/_examples/actions/docker_action/kraken.yml new file mode 100644 index 0000000..0aa7013 --- /dev/null +++ b/_examples/actions/docker_action/kraken.yml @@ -0,0 +1,11 @@ +apiVersion: git.front.kjuulh.io/kjuulh/kraken/blob/main/schema/v1 +name: write-a-readme +select: + repositories: + - git@git.front.kjuulh.io:kjuulh/kraken-test.git + # providers: + # - gitea: https://git.front.kjuulh.io + # organisation: "cibus" +actions: + - type: docker-build + entry: "Dockerfile" diff --git a/cmd/kraken/commands/process.go b/cmd/kraken/commands/process.go index 342ebc4..1ffd16e 100644 --- a/cmd/kraken/commands/process.go +++ b/cmd/kraken/commands/process.go @@ -22,8 +22,8 @@ func CreateKrakenProcessCmd() *cobra.Command { Path string `json:"path"` }{ Repository: "git@git.front.kjuulh.io:kjuulh/kraken.git", - Branch: "feature/gitea-integration", - Path: "_examples/actions/write_a_readme/", + Branch: "feature/docker-action", + Path: "_examples/actions/docker_action/", }) if err != nil { panic(err) diff --git a/internal/actions/action.go b/internal/actions/action.go index 3c6416e..ea4f253 100644 --- a/internal/actions/action.go +++ b/internal/actions/action.go @@ -30,6 +30,17 @@ func (a *Action) Execute(ctx context.Context, area *storage.Area) error { zap.L().Debug("Execution done") + case "docker-build": + runCmd, err := builders.NewDockerBuild(zap.L()).Build(ctx, a.SchemaPath, action.Entry) + if err != nil { + return err + } + err = runCmd(ctx, area.Path) + if err != nil { + return err + } + return nil + default: return errors.New("could not determine action type") } diff --git a/internal/actions/builders/docker.go b/internal/actions/builders/docker.go new file mode 100644 index 0000000..644cdde --- /dev/null +++ b/internal/actions/builders/docker.go @@ -0,0 +1,44 @@ +package builders + +import ( + "context" + "errors" + "fmt" + "os" + "os/exec" + + "go.uber.org/zap" +) + +type DockerBuild struct { + logger *zap.Logger +} + +func NewDockerBuild(logger *zap.Logger) *Go { + return &Go{logger: logger} +} + +type DockerRunCommand func(ctx context.Context, victimPath string) error + +func (g *DockerBuild) Build(ctx context.Context, modulePath, entryPath string) (DockerRunCommand, error) { + g.logger.Debug("Building docker image", zap.String("actiondir", modulePath), zap.String("entry", entryPath)) + + if _, err := os.Stat(fmt.Sprintf("%s/%s", modulePath, entryPath)); os.IsNotExist(err) { + return nil, errors.New("could not find entry") + } + + g.logger.Debug("Go binary built!") + + return func(ctx context.Context, victimPath string) error { + g.logger.Debug("Executing script", zap.String("victim", victimPath)) + + cmd := exec.CommandContext( + ctx, + "/bin/bash", + "-c", + fmt.Sprintf("(cd %s; docker build)", modulePath), + ) + + return cmd.Run() + }, nil +} -- 2.45.2 From c2d1a7b89e6b145031e957457d2c789c582a1859 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sun, 18 Sep 2022 00:53:41 +0200 Subject: [PATCH 02/11] WIP: with docker action --- _examples/actions/docker_action/Dockerfile | 4 +- _examples/actions/docker_action/kraken.yml | 2 +- internal/actions/action.go | 1 + internal/actions/builders/docker.go | 61 ++++++++++++++++++++-- 4 files changed, 59 insertions(+), 9 deletions(-) diff --git a/_examples/actions/docker_action/Dockerfile b/_examples/actions/docker_action/Dockerfile index 7af7f8e..88ad6a0 100644 --- a/_examples/actions/docker_action/Dockerfile +++ b/_examples/actions/docker_action/Dockerfile @@ -3,6 +3,4 @@ FROM debian:bullseye-slim # Kraken relies on this path being the specified path WORKDIR /src/work/ -COPY . . - -RUN echo "# README docker" >> README.md +RUN echo "# README docker" > README.md diff --git a/_examples/actions/docker_action/kraken.yml b/_examples/actions/docker_action/kraken.yml index 0aa7013..f2c8dba 100644 --- a/_examples/actions/docker_action/kraken.yml +++ b/_examples/actions/docker_action/kraken.yml @@ -8,4 +8,4 @@ select: # organisation: "cibus" actions: - type: docker-build - entry: "Dockerfile" + entry: Dockerfile diff --git a/internal/actions/action.go b/internal/actions/action.go index ea4f253..bc9fdb4 100644 --- a/internal/actions/action.go +++ b/internal/actions/action.go @@ -31,6 +31,7 @@ func (a *Action) Execute(ctx context.Context, area *storage.Area) error { zap.L().Debug("Execution done") case "docker-build": + zap.L().Debug("Building docker-build") runCmd, err := builders.NewDockerBuild(zap.L()).Build(ctx, a.SchemaPath, action.Entry) if err != nil { return err diff --git a/internal/actions/builders/docker.go b/internal/actions/builders/docker.go index 644cdde..4120229 100644 --- a/internal/actions/builders/docker.go +++ b/internal/actions/builders/docker.go @@ -2,20 +2,23 @@ package builders import ( "context" + "crypto/rand" + "encoding/hex" "errors" "fmt" "os" "os/exec" "go.uber.org/zap" + "go.uber.org/zap/zapio" ) type DockerBuild struct { logger *zap.Logger } -func NewDockerBuild(logger *zap.Logger) *Go { - return &Go{logger: logger} +func NewDockerBuild(logger *zap.Logger) *DockerBuild { + return &DockerBuild{logger: logger} } type DockerRunCommand func(ctx context.Context, victimPath string) error @@ -27,7 +30,41 @@ func (g *DockerBuild) Build(ctx context.Context, modulePath, entryPath string) ( return nil, errors.New("could not find entry") } - g.logger.Debug("Go binary built!") + b := make([]byte, 20) + _, err := rand.Reader.Read(b) + if err != nil { + return nil, err + } + tag := hex.EncodeToString(b) + buildDockerCmd := fmt.Sprintf("(cd %s; docker build -f %s --tag kraken/%s .)", modulePath, entryPath, tag) + g.logger.Debug("Running command", zap.String("command", buildDockerCmd)) + + cmd := exec.CommandContext( + ctx, + "/bin/bash", + "-c", + buildDockerCmd, + ) + + debugwriter := &zapio.Writer{ + Log: g.logger, + Level: zap.DebugLevel, + } + defer debugwriter.Close() + + cmd.Stdout = debugwriter + cmd.Stderr = debugwriter + err = cmd.Start() + if err != nil { + return nil, err + } + + err = cmd.Wait() + if err != nil { + return nil, err + } + + g.logger.Debug("Docker image built!") return func(ctx context.Context, victimPath string) error { g.logger.Debug("Executing script", zap.String("victim", victimPath)) @@ -36,9 +73,23 @@ func (g *DockerBuild) Build(ctx context.Context, modulePath, entryPath string) ( ctx, "/bin/bash", "-c", - fmt.Sprintf("(cd %s; docker build)", modulePath), + fmt.Sprintf("docker run --rm -v %s/:/src/work/ kraken/%s", victimPath, tag), ) - return cmd.Run() + runDockerWriter := &zapio.Writer{ + Log: g.logger, + Level: zap.DebugLevel, + } + defer runDockerWriter.Close() + + cmd.Stdout = runDockerWriter + cmd.Stderr = runDockerWriter + + err = cmd.Start() + if err != nil { + return err + } + + return cmd.Wait() }, nil } -- 2.45.2 From 544716a2232720e50c2eb0d8bdb7e64cd638fa15 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sun, 18 Sep 2022 00:56:05 +0200 Subject: [PATCH 03/11] with entrypoint --- _examples/actions/docker_action/Dockerfile | 4 +++- _examples/actions/docker_action/script.sh | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 _examples/actions/docker_action/script.sh diff --git a/_examples/actions/docker_action/Dockerfile b/_examples/actions/docker_action/Dockerfile index 88ad6a0..572de73 100644 --- a/_examples/actions/docker_action/Dockerfile +++ b/_examples/actions/docker_action/Dockerfile @@ -3,4 +3,6 @@ FROM debian:bullseye-slim # Kraken relies on this path being the specified path WORKDIR /src/work/ -RUN echo "# README docker" > README.md +COPY entry.sh /src/script.sh + +CMD [ "/src/script.sh" ] diff --git a/_examples/actions/docker_action/script.sh b/_examples/actions/docker_action/script.sh new file mode 100644 index 0000000..11771f4 --- /dev/null +++ b/_examples/actions/docker_action/script.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +set -e + +echo "# README docker" > README.md -- 2.45.2 From a98d4ee85eebda9b9da7256c33d6647963260593 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sun, 18 Sep 2022 00:57:11 +0200 Subject: [PATCH 04/11] with correct name --- _examples/actions/docker_action/{script.sh => entry.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename _examples/actions/docker_action/{script.sh => entry.sh} (100%) mode change 100644 => 100755 diff --git a/_examples/actions/docker_action/script.sh b/_examples/actions/docker_action/entry.sh old mode 100644 new mode 100755 similarity index 100% rename from _examples/actions/docker_action/script.sh rename to _examples/actions/docker_action/entry.sh -- 2.45.2 From 531e2abbbe2922e4333f248e847d0cc97c656eac Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sun, 18 Sep 2022 00:57:58 +0200 Subject: [PATCH 05/11] fix exit early --- internal/commands/process_repos.go | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/internal/commands/process_repos.go b/internal/commands/process_repos.go index ae8049d..f801240 100644 --- a/internal/commands/process_repos.go +++ b/internal/commands/process_repos.go @@ -168,6 +168,16 @@ func (pr *ProcessRepos) commit(ctx context.Context, area *storage.Area, repo *pr return fmt.Errorf("could not add file: %w", err) } + status, err := wt.Status() + if err != nil { + return err + } + + if status.IsClean() { + pr.logger.Info("Returning early, as no modifications are detected") + return nil + } + err = pr.git.Commit(ctx, repo) if err != nil { return fmt.Errorf("could not get diff: %w", err) @@ -175,15 +185,6 @@ func (pr *ProcessRepos) commit(ctx context.Context, area *storage.Area, repo *pr dryrun := false if !dryrun { - status, err := wt.Status() - if err != nil { - return err - } - - if status.IsClean() { - pr.logger.Info("Returning early, as no modifications are detected") - return nil - } err = pr.git.Push(ctx, repo) if err != nil { -- 2.45.2 From 32ab6dd95823a12ff5439e8affdcd02077342d89 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sun, 18 Sep 2022 01:07:56 +0200 Subject: [PATCH 06/11] with force push --- internal/services/providers/git.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/services/providers/git.go b/internal/services/providers/git.go index 07018b6..c43b811 100644 --- a/internal/services/providers/git.go +++ b/internal/services/providers/git.go @@ -287,7 +287,7 @@ func (g *Git) Push(ctx context.Context, gitRepo *GitRepo) error { Auth: auth, Progress: g.getProgressWriter(), Prune: false, - Force: false, + Force: true, InsecureSkipTLS: false, CABundle: []byte{}, RequireRemoteRefs: []config.RefSpec{}, -- 2.45.2 From 3d710db0ae920ba170807ad65f2f29a1bcfce603 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sun, 18 Sep 2022 01:08:19 +0200 Subject: [PATCH 07/11] with docker build action --- roadmap.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roadmap.md b/roadmap.md index ae23587..8c2a5af 100644 --- a/roadmap.md +++ b/roadmap.md @@ -20,7 +20,7 @@ - [x] Setup a way to choose actions and predicates - [x] Allow instantiation of actions, kraken template repo etc. -- [ ] Implement docker action +- [x] Implement docker action - [ ] Providing query results - [x] Create pr for gitea provider - [ ] Think about some sort of isolation -- 2.45.2 From 744f870e749df0127b2ee983de579db9b4ed155b Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sun, 18 Sep 2022 01:09:16 +0200 Subject: [PATCH 08/11] remove secret --- internal/gitproviders/gitea.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/gitproviders/gitea.go b/internal/gitproviders/gitea.go index 8fa3690..db11621 100644 --- a/internal/gitproviders/gitea.go +++ b/internal/gitproviders/gitea.go @@ -121,7 +121,6 @@ func (g *Gitea) getOrCreateClient(ctx context.Context, server string) (*gitea.Cl client, ok := g.giteaClients[server] if !ok || client == nil { c, err := gitea.NewClient(server) - c.SetBasicAuth("kjuulh", "c0bd801cc9a7f2ed559ea45d603afc92f5443f19") if err != nil { return nil, err } -- 2.45.2 From 1889f05db29f94b121e311db79967005c2066517 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sun, 18 Sep 2022 01:12:12 +0200 Subject: [PATCH 09/11] with env --- internal/gitproviders/gitea.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/internal/gitproviders/gitea.go b/internal/gitproviders/gitea.go index db11621..fcc277a 100644 --- a/internal/gitproviders/gitea.go +++ b/internal/gitproviders/gitea.go @@ -2,7 +2,9 @@ package gitproviders import ( "context" + "errors" "fmt" + "os" "sync" "code.gitea.io/sdk/gitea" @@ -121,6 +123,15 @@ func (g *Gitea) getOrCreateClient(ctx context.Context, server string) (*gitea.Cl client, ok := g.giteaClients[server] if !ok || client == nil { c, err := gitea.NewClient(server) + username, ok := os.LookupEnv("GITEA_USERNAME") + if !ok { + return nil, errors.New("missing environment variable GITEA_USERNAME") + } + apitoken, ok := os.LookupEnv("GITEA_API_TOKEN") + if !ok { + return nil, errors.New("missing environment variable GITEA_API_TOKEN") + } + c.SetBasicAuth(username, apitoken) if err != nil { return nil, err } -- 2.45.2 From 64e9f8dca85a81ecfa2799a427d4d344c2267847 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sun, 18 Sep 2022 01:46:58 +0200 Subject: [PATCH 10/11] with actual head branch name --- .gitignore | 1 + internal/services/providers/git.go | 26 ++++++++++++++++---------- scripts/run_server.sh | 2 ++ 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 75d1871..dddecf9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .cuddle/ +.env diff --git a/internal/services/providers/git.go b/internal/services/providers/git.go index c43b811..63db3cf 100644 --- a/internal/services/providers/git.go +++ b/internal/services/providers/git.go @@ -2,7 +2,9 @@ package providers import ( "context" + "errors" "fmt" + "strings" "time" "git.front.kjuulh.io/kjuulh/kraken/internal/services/signer" @@ -63,12 +65,12 @@ func NewGit(logger *zap.Logger, gitConfig *GitConfig, openPGP *signer.OpenPGP) * } func (g *Git) GetOriginHEADForRepo(ctx context.Context, gitRepo *GitRepo) (string, error) { - remote, err := gitRepo.repo.Remote("origin") + auth, err := g.GetAuth() if err != nil { return "", err } - auth, err := g.GetAuth() + remote, err := gitRepo.repo.Remote("origin") if err != nil { return "", err } @@ -82,11 +84,16 @@ func (g *Git) GetOriginHEADForRepo(ctx context.Context, gitRepo *GitRepo) (strin headRef := "" for _, ref := range refs { - if !ref.Name().IsBranch() { - headRef = ref.Target().Short() + //g.logger.Debug(ref.String()) + if ref.Name().IsBranch() && strings.Contains(ref.String(), "/heads/") { + headRef = ref.Name().Short() } } + if headRef == "" { + return "", errors.New("no upstream HEAD branch could be found") + } + return headRef, nil } @@ -140,11 +147,11 @@ func (g *Git) Clone(ctx context.Context, storageArea *storage.Area, repoUrl stri } cloneOptions := git.CloneOptions{ - URL: repoUrl, - Auth: auth, - RemoteName: "origin", - ReferenceName: "refs/heads/main", - SingleBranch: true, + URL: repoUrl, + Auth: auth, + RemoteName: "origin", + // ReferenceName: "refs/heads/main", + SingleBranch: false, NoCheckout: false, Depth: 1, RecurseSubmodules: 1, @@ -292,7 +299,6 @@ func (g *Git) Push(ctx context.Context, gitRepo *GitRepo) error { CABundle: []byte{}, RequireRemoteRefs: []config.RefSpec{}, }) - if err != nil { return err } diff --git a/scripts/run_server.sh b/scripts/run_server.sh index 6fb5602..59ec179 100755 --- a/scripts/run_server.sh +++ b/scripts/run_server.sh @@ -2,4 +2,6 @@ set -e +export $(cat .env | xargs) + go run cmd/server/server.go start -- 2.45.2 From c865b597c0c7fd00d3d7b539fe63a8fd66cc9fe9 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sun, 18 Sep 2022 11:50:57 +0200 Subject: [PATCH 11/11] fixed git --- internal/services/providers/git.go | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/internal/services/providers/git.go b/internal/services/providers/git.go index 63db3cf..45ed04e 100644 --- a/internal/services/providers/git.go +++ b/internal/services/providers/git.go @@ -4,7 +4,6 @@ import ( "context" "errors" "fmt" - "strings" "time" "git.front.kjuulh.io/kjuulh/kraken/internal/services/signer" @@ -85,8 +84,8 @@ func (g *Git) GetOriginHEADForRepo(ctx context.Context, gitRepo *GitRepo) (strin headRef := "" for _, ref := range refs { //g.logger.Debug(ref.String()) - if ref.Name().IsBranch() && strings.Contains(ref.String(), "/heads/") { - headRef = ref.Name().Short() + if !ref.Name().IsBranch() { + headRef = ref.Target().Short() } } @@ -114,7 +113,7 @@ func (g *Git) CloneBranch(ctx context.Context, storageArea *storage.Area, repoUr Auth: auth, RemoteName: "origin", ReferenceName: plumbing.NewBranchReferenceName(branch), - SingleBranch: true, + SingleBranch: false, NoCheckout: false, Depth: 1, RecurseSubmodules: 1, @@ -125,7 +124,7 @@ func (g *Git) CloneBranch(ctx context.Context, storageArea *storage.Area, repoUr } repo, err := git.PlainCloneContext(ctx, storageArea.Path, false, &cloneOptions) - if err != nil { + if err != nil && !errors.Is(err, git.NoErrAlreadyUpToDate) { return nil, err } @@ -147,10 +146,10 @@ func (g *Git) Clone(ctx context.Context, storageArea *storage.Area, repoUrl stri } cloneOptions := git.CloneOptions{ - URL: repoUrl, - Auth: auth, - RemoteName: "origin", - // ReferenceName: "refs/heads/main", + URL: repoUrl, + Auth: auth, + RemoteName: "origin", + ReferenceName: "refs/heads/main", SingleBranch: false, NoCheckout: false, Depth: 1, @@ -252,7 +251,7 @@ func (g *Git) CreateBranch(ctx context.Context, gitRepo *GitRepo) error { InsecureSkipTLS: false, CABundle: []byte{}, }) - if err != nil { + if err != nil && !errors.Is(err, git.NoErrAlreadyUpToDate) { return fmt.Errorf("could not pull from origin: %w", err) } -- 2.45.2