v0.2 (#14)

Co-authored-by: kjuulh <contact@kjuulh.io>
Reviewed-on: #14

internal/actions/action.go

@@ -4,15 +4,15 @@ import (
 	"context"
 	"errors"
 
-	"git.front.kjuulh.io/kjuulh/kraken/internal/actions/builders"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/actions/querier"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/schema"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/services/storage"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/actions/builders"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/actions/querier"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/schema"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/services/storage"
 	"go.uber.org/zap"
 )
 
 type Action struct {
-	Schema     *schema.KrakenSchema
+	Schema     *schema.OctopushSchema
 	SchemaPath string
 }
 

internal/actions/action_creator.go

@@ -7,9 +7,9 @@ import (
 	"path"
 	"time"
 
-	"git.front.kjuulh.io/kjuulh/kraken/internal/schema"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/services/providers"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/services/storage"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/schema"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/services/providers"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/services/storage"
 	"go.uber.org/zap"
 )
 
@@ -23,12 +23,12 @@ type (
 	ActionCreator struct {
 		logger  *zap.Logger
 		storage *storage.Service
-		git     *providers.Git
+		git     *providers.GoGit
 	}
 
 	ActionCreatorDeps interface {
 		GetStorageService() *storage.Service
-		GetGitProvider() *providers.Git
+		GetGitProvider() *providers.GoGit
 	}
 )
 
@@ -59,19 +59,19 @@ func (ac *ActionCreator) Prepare(ctx context.Context, ops *ActionCreatorOps) (*A
 		return nil, fmt.Errorf("path is invalid: %s", ops.Path)
 	}
 
-	contents, err := os.ReadFile(path.Join(executorUrl, "kraken.yml"))
+	contents, err := os.ReadFile(path.Join(executorUrl, "octopush.yml"))
 	if err != nil {
 		return nil, err
 	}
 
-	krakenSchema, err := schema.Unmarshal(string(contents))
+	octopushSchema, err := schema.Unmarshal(string(contents))
 	if err != nil {
 		return nil, err
 	}
 
 	ac.logger.Debug("Action creator done")
 	return &Action{
-		Schema:     krakenSchema,
+		Schema:     octopushSchema,
 		SchemaPath: executorUrl,
 	}, nil
 }

internal/actions/builders/docker.go

@@ -36,7 +36,7 @@ func (g *DockerBuild) Build(ctx context.Context, modulePath, entryPath string) (
 		return nil, err
 	}
 	tag := hex.EncodeToString(b)
-	buildDockerCmd := fmt.Sprintf("(cd %s; docker build -f %s --tag kraken/%s .)", modulePath, entryPath, tag)
+	buildDockerCmd := fmt.Sprintf("(cd %s; docker build -f %s --tag octopush/%s .)", modulePath, entryPath, tag)
 	g.logger.Debug("Running command", zap.String("command", buildDockerCmd))
 
 	cmd := exec.CommandContext(
@@ -73,7 +73,7 @@ func (g *DockerBuild) Build(ctx context.Context, modulePath, entryPath string) (
 			ctx,
 			"/bin/bash",
 			"-c",
-			fmt.Sprintf("docker run --rm -v %s/:/src/work/ kraken/%s", victimPath, tag),
+			fmt.Sprintf("docker run --rm -v %s/:/src/work/ octopush/%s", victimPath, tag),
 		)
 
 		runDockerWriter := &zapio.Writer{

internal/api/process_command.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"net/http"
 
-	"git.front.kjuulh.io/kjuulh/kraken/internal/commands"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/serverdeps"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/services/jobs"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/commands"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/serverdeps"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/services/jobs"
 	"github.com/gin-gonic/gin"
 	"github.com/google/uuid"
 	"go.uber.org/zap"

internal/api/root.go

@@ -1,7 +1,7 @@
 package api
 
 import (
-	"git.front.kjuulh.io/kjuulh/kraken/internal/serverdeps"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/serverdeps"
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 )

internal/cli/cli.go

@@ -0,0 +1,30 @@
+package cli
+
+import (
+	"context"
+
+	"git.front.kjuulh.io/kjuulh/curre"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/server"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/serverdeps"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/services/signer"
+	"go.uber.org/zap"
+)
+
+func Start(ctx context.Context, logger *zap.Logger) (*serverdeps.ServerDeps, curre.CleanupFunc, error) {
+	deps := serverdeps.NewServerDeps(logger)
+
+	readyChan := make(chan curre.ComponentsAreReady, 1)
+
+	cleanupFunc, err := curre.NewManager().
+		Register(
+			server.NewStorageServer(logger.With(zap.Namespace("storage")), deps),
+		).
+		Register(
+			signer.NewOpenPGPApp(deps.GetOpenPGP()),
+		).
+		RunNonBlocking(ctx, readyChan)
+
+	<-readyChan
+
+	return deps, cleanupFunc, err
+}

internal/commands/process_repos.go

@@ -7,11 +7,11 @@ import (
 	"sync"
 	"time"
 
-	"git.front.kjuulh.io/kjuulh/kraken/internal/actions"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/gitproviders"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/schema"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/services/providers"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/services/storage"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/actions"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/gitproviders"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/schema"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/services/providers"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/services/storage"
 	giturls "github.com/whilp/git-urls"
 	"go.uber.org/zap"
 )
@@ -20,14 +20,14 @@ type (
 	ProcessRepos struct {
 		logger        *zap.Logger
 		storage       *storage.Service
-		git           *providers.Git
+		git           *providers.GoGit
 		actionCreator *actions.ActionCreator
 		gitea         *gitproviders.Gitea
 	}
 
 	ProcessReposDeps interface {
 		GetStorageService() *storage.Service
-		GetGitProvider() *providers.Git
+		GetGitProvider() *providers.GoGit
 		GetActionCreator() *actions.ActionCreator
 		GetGitea() *gitproviders.Gitea
 	}
@@ -79,7 +79,7 @@ func (pr *ProcessRepos) Process(ctx context.Context, repository string, branch s
 	return nil
 }
 
-func (pr *ProcessRepos) getRepoUrls(ctx context.Context, schema *schema.KrakenSchema) ([]string, error) {
+func (pr *ProcessRepos) getRepoUrls(ctx context.Context, schema *schema.OctopushSchema) ([]string, error) {
 	repoUrls := make([]string, 0)
 
 	repoUrls = append(repoUrls, schema.Select.Repositories...)
@@ -161,7 +161,7 @@ func (pr *ProcessRepos) prepareAction(
 	return cleanupfunc, area, nil
 }
 
-func (pr *ProcessRepos) clone(ctx context.Context, area *storage.Area, repoUrl string) (*providers.GitRepo, error) {
+func (pr *ProcessRepos) clone(ctx context.Context, area *storage.Area, repoUrl string) (*providers.GoGitRepo, error) {
 	pr.logger.Debug("Cloning repo", zap.String("path", area.Path), zap.String("repoUrl", repoUrl))
 	cloneCtx, _ := context.WithTimeout(ctx, time.Second*5)
 	repo, err := pr.git.Clone(cloneCtx, area, repoUrl)
@@ -177,7 +177,7 @@ func (pr *ProcessRepos) clone(ctx context.Context, area *storage.Area, repoUrl s
 	return repo, nil
 }
 
-func (pr *ProcessRepos) commit(ctx context.Context, area *storage.Area, repo *providers.GitRepo, repoUrl string) error {
+func (pr *ProcessRepos) commit(ctx context.Context, area *storage.Area, repo *providers.GoGitRepo, repoUrl string) error {
 	wt, err := pr.git.Add(ctx, area, repo)
 	if err != nil {
 		return fmt.Errorf("could not add file: %w", err)
@@ -189,8 +189,9 @@ func (pr *ProcessRepos) commit(ctx context.Context, area *storage.Area, repo *pr
 	}
 
 	if status.IsClean() {
+		// TODO: check for pr
 		pr.logger.Info("Returning early, as no modifications are detected")
-		return nil
+		//return nil
 	}
 
 	err = pr.git.Commit(ctx, repo)
@@ -231,7 +232,7 @@ func (pr *ProcessRepos) commit(ctx context.Context, area *storage.Area, repo *pr
 			return err
 		}
 
-		err = pr.gitea.CreatePr(ctx, fmt.Sprintf("%s://%s", "https", url.Host), org, semanticName, head, originHead, "kraken-apply")
+		err = pr.gitea.CreatePr(ctx, fmt.Sprintf("%s://%s", "https", url.Host), org, semanticName, head, originHead, "octopush-apply")
 		if err != nil {
 			return err
 		}

internal/logger/zap.go

@@ -12,7 +12,7 @@ func New() (*zap.Logger, error) {
 		return lvl >= zapcore.ErrorLevel
 	})
 	lowPriority := zap.LevelEnablerFunc(func(lvl zapcore.Level) bool {
-		return lvl < zapcore.ErrorLevel
+		return lvl < zapcore.ErrorLevel // && lvl > zapcore.DebugLevel
 	})
 
 	config := zap.NewDevelopmentEncoderConfig()
@@ -28,5 +28,6 @@ func New() (*zap.Logger, error) {
 	)
 
 	logger := zap.New(core)
+
 	return logger, nil
 }

internal/schema/kraken.go

@@ -2,7 +2,7 @@ package schema
 
 import "gopkg.in/yaml.v3"
 
-type KrakenSchema struct {
+type OctopushSchema struct {
 	ApiVersion string `yaml:"apiVersion"`
 	Name       string `yaml:"name"`
 	Select     struct {
@@ -22,8 +22,8 @@ type KrakenSchema struct {
 	} `yaml:"queries"`
 }
 
-func Unmarshal(raw string) (*KrakenSchema, error) {
-	k := &KrakenSchema{}
+func Unmarshal(raw string) (*OctopushSchema, error) {
+	k := &OctopushSchema{}
 	err := yaml.Unmarshal([]byte(raw), k)
 	if err != nil {
 		return nil, err

internal/server/http_server.go

@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"git.front.kjuulh.io/kjuulh/curre"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/api"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/serverdeps"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/api"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/serverdeps"
 	ginzap "github.com/gin-contrib/zap"
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"

internal/server/server.go

@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"git.front.kjuulh.io/kjuulh/curre"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/serverdeps"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/services/signer"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/serverdeps"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/services/signer"
 	"go.uber.org/zap"
 )
 

internal/server/storage_server.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"git.front.kjuulh.io/kjuulh/curre"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/serverdeps"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/serverdeps"
 	"go.uber.org/zap"
 )
 

internal/serverdeps/server_deps.go

@@ -1,12 +1,12 @@
 package serverdeps
 
 import (
-	actionc "git.front.kjuulh.io/kjuulh/kraken/internal/actions"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/gitproviders"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/services/actions"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/services/providers"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/services/signer"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/services/storage"
+	actionc "git.front.kjuulh.io/kjuulh/octopush/internal/actions"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/gitproviders"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/services/actions"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/services/providers"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/services/signer"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/services/storage"
 	"go.uber.org/zap"
 )
 
@@ -53,7 +53,7 @@ func (deps *ServerDeps) GetStorageService() *storage.Service {
 	return storage.NewService(deps.logger.With(zap.Namespace("storage")), deps.storageConfig)
 }
 
-func (deps *ServerDeps) GetGitProvider() *providers.Git {
+func (deps *ServerDeps) GetGitProvider() *providers.GoGit {
 	return providers.NewGit(deps.logger.With(zap.Namespace("gitProvider")), deps.gitCfg, deps.openPGP)
 }
 

internal/services/actions/action.go

@@ -3,7 +3,7 @@ package actions
 import (
 	"context"
 
-	"git.front.kjuulh.io/kjuulh/kraken/internal/services/storage"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/services/storage"
 	"go.uber.org/zap"
 )
 

internal/services/providers/git.go

@@ -1,339 +1 @@
 package providers
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"time"
-
-	"git.front.kjuulh.io/kjuulh/kraken/internal/services/signer"
-	"git.front.kjuulh.io/kjuulh/kraken/internal/services/storage"
-	"github.com/go-git/go-git/v5"
-	"github.com/go-git/go-git/v5/config"
-	"github.com/go-git/go-git/v5/plumbing"
-	"github.com/go-git/go-git/v5/plumbing/object"
-	"github.com/go-git/go-git/v5/plumbing/transport"
-	"github.com/go-git/go-git/v5/plumbing/transport/http"
-	"github.com/go-git/go-git/v5/plumbing/transport/ssh"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapio"
-)
-
-// Git is a native git provider, it can clone, pull
-// , push and as in abstraction on native git operations
-type Git struct {
-	logger    *zap.Logger
-	gitConfig *GitConfig
-	openPGP   *signer.OpenPGP
-}
-
-type GitRepo struct {
-	repo *git.Repository
-}
-
-func (gr *GitRepo) GetHEAD() (string, error) {
-	head, err := gr.repo.Head()
-	if err != nil {
-		return "", err
-	}
-
-	return head.Name().Short(), nil
-}
-
-type GitAuth string
-
-const (
-	GIT_AUTH_SSH               GitAuth = "ssh"
-	GIT_AUTH_USERNAME_PASSWORD GitAuth = "username_password"
-	GIT_AUTH_ACCESS_TOKEN      GitAuth = "access_token"
-	GIT_AUTH_ANONYMOUS         GitAuth = "anonymous"
-	GIT_AUTH_SSH_AGENT         GitAuth = "ssh_agent"
-)
-
-type GitConfig struct {
-	AuthOption            GitAuth
-	User                  string
-	Password              string
-	AccessToken           string
-	SshPublicKeyFilePath  string
-	SshPrivateKeyPassword string
-}
-
-func NewGit(logger *zap.Logger, gitConfig *GitConfig, openPGP *signer.OpenPGP) *Git {
-	return &Git{logger: logger, gitConfig: gitConfig, openPGP: openPGP}
-}
-
-func (g *Git) GetOriginHEADForRepo(ctx context.Context, gitRepo *GitRepo) (string, error) {
-	auth, err := g.GetAuth()
-	if err != nil {
-		return "", err
-	}
-
-	remote, err := gitRepo.repo.Remote("origin")
-	if err != nil {
-		return "", err
-	}
-
-	refs, err := remote.ListContext(ctx, &git.ListOptions{
-		Auth: auth,
-	})
-	if err != nil {
-		return "", err
-	}
-
-	headRef := ""
-	for _, ref := range refs {
-		//g.logger.Debug(ref.String())
-		if !ref.Name().IsBranch() {
-			headRef = ref.Target().Short()
-		}
-	}
-
-	if headRef == "" {
-		return "", errors.New("no upstream HEAD branch could be found")
-	}
-
-	return headRef, nil
-}
-
-func (g *Git) CloneBranch(ctx context.Context, storageArea *storage.Area, repoUrl string, branch string) (*GitRepo, error) {
-	g.logger.Debug(
-		"cloning repository",
-		zap.String("repoUrl", repoUrl),
-		zap.String("path", storageArea.Path),
-	)
-
-	auth, err := g.GetAuth()
-	if err != nil {
-		return nil, err
-	}
-
-	cloneOptions := git.CloneOptions{
-		URL:               repoUrl,
-		Auth:              auth,
-		RemoteName:        "origin",
-		ReferenceName:     plumbing.NewBranchReferenceName(branch),
-		SingleBranch:      false,
-		NoCheckout:        false,
-		Depth:             1,
-		RecurseSubmodules: 1,
-		Progress:          g.getProgressWriter(),
-		Tags:              0,
-		InsecureSkipTLS:   false,
-		CABundle:          []byte{},
-	}
-
-	repo, err := git.PlainCloneContext(ctx, storageArea.Path, false, &cloneOptions)
-	if err != nil && !errors.Is(err, git.NoErrAlreadyUpToDate) {
-		return nil, err
-	}
-
-	g.logger.Debug("done cloning repo")
-
-	return &GitRepo{repo: repo}, nil
-}
-
-func (g *Git) Clone(ctx context.Context, storageArea *storage.Area, repoUrl string) (*GitRepo, error) {
-	g.logger.Debug(
-		"cloning repository",
-		zap.String("repoUrl", repoUrl),
-		zap.String("path", storageArea.Path),
-	)
-
-	auth, err := g.GetAuth()
-	if err != nil {
-		return nil, err
-	}
-
-	cloneOptions := git.CloneOptions{
-		URL:               repoUrl,
-		Auth:              auth,
-		RemoteName:        "origin",
-		ReferenceName:     "refs/heads/main",
-		SingleBranch:      false,
-		NoCheckout:        false,
-		Depth:             1,
-		RecurseSubmodules: 1,
-		Progress:          g.getProgressWriter(),
-		Tags:              0,
-		InsecureSkipTLS:   false,
-		CABundle:          []byte{},
-	}
-
-	repo, err := git.PlainCloneContext(ctx, storageArea.Path, false, &cloneOptions)
-	if err != nil {
-		return nil, err
-	}
-
-	g.logger.Debug("done cloning repo")
-
-	return &GitRepo{repo: repo}, nil
-}
-
-func (g *Git) getProgressWriter() *zapio.Writer {
-	return &zapio.Writer{
-		Log:   g.logger.With(zap.String("process", "go-git")),
-		Level: zap.DebugLevel,
-	}
-}
-
-func (g *Git) Add(ctx context.Context, storageArea *storage.Area, gitRepo *GitRepo) (*git.Worktree, error) {
-	worktree, err := gitRepo.repo.Worktree()
-	if err != nil {
-		return nil, err
-	}
-
-	err = worktree.AddWithOptions(&git.AddOptions{
-		All: true,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	status, err := worktree.Status()
-	if err != nil {
-		return nil, err
-	}
-
-	g.logger.Debug("git status", zap.String("status", status.String()))
-
-	return worktree, nil
-}
-
-func (g *Git) CreateBranch(ctx context.Context, gitRepo *GitRepo) error {
-	worktree, err := gitRepo.repo.Worktree()
-	if err != nil {
-		return err
-	}
-
-	refSpec := plumbing.NewBranchReferenceName("kraken-apply")
-	err = gitRepo.repo.CreateBranch(&config.Branch{
-		Name:   "kraken-apply",
-		Remote: "origin",
-		Merge:  refSpec,
-		Rebase: "",
-	})
-	if err != nil {
-		return fmt.Errorf("could not create branch: %w", err)
-	}
-
-	err = worktree.Checkout(&git.CheckoutOptions{
-		Branch: plumbing.ReferenceName(refSpec.String()),
-		Create: true,
-		Force:  false,
-		Keep:   false,
-	})
-	if err != nil {
-		return fmt.Errorf("could not checkout branch: %w", err)
-	}
-
-	remoteRef := plumbing.NewRemoteReferenceName("origin", "kraken-apply")
-	ref := plumbing.NewSymbolicReference(refSpec, remoteRef)
-	err = gitRepo.repo.Storer.SetReference(ref)
-	if err != nil {
-		return fmt.Errorf("could not set reference: %w", err)
-	}
-
-	auth, err := g.GetAuth()
-	if err != nil {
-		return err
-	}
-
-	err = worktree.PullContext(ctx, &git.PullOptions{
-		RemoteName:        "origin",
-		ReferenceName:     "refs/heads/main",
-		SingleBranch:      false,
-		Depth:             1,
-		Auth:              auth,
-		RecurseSubmodules: 1,
-		Progress:          g.getProgressWriter(),
-		Force:             true,
-		InsecureSkipTLS:   false,
-		CABundle:          []byte{},
-	})
-	if err != nil && !errors.Is(err, git.NoErrAlreadyUpToDate) {
-		return fmt.Errorf("could not pull from origin: %w", err)
-	}
-
-	g.logger.Debug("done creating branches")
-
-	return nil
-}
-
-func (g *Git) Commit(ctx context.Context, gitRepo *GitRepo) error {
-	worktree, err := gitRepo.repo.Worktree()
-	if err != nil {
-		return err
-	}
-
-	_, err = worktree.Commit("some-commit", &git.CommitOptions{
-		All:       true,
-		Author:    &object.Signature{Name: "kraken", Email: "kraken@kasperhermansen.com", When: time.Now()},
-		Committer: &object.Signature{Name: "kraken", Email: "kraken@kasperhermansen.com", When: time.Now()},
-		SignKey:   g.openPGP.SigningKey,
-	})
-	if err != nil {
-		return err
-	}
-
-	g.logger.Debug("done commiting objects")
-
-	return nil
-}
-
-func (g *Git) Push(ctx context.Context, gitRepo *GitRepo) error {
-	auth, err := g.GetAuth()
-	if err != nil {
-		return err
-	}
-
-	err = gitRepo.repo.PushContext(ctx, &git.PushOptions{
-		RemoteName:        "origin",
-		RefSpecs:          []config.RefSpec{},
-		Auth:              auth,
-		Progress:          g.getProgressWriter(),
-		Prune:             false,
-		Force:             true,
-		InsecureSkipTLS:   false,
-		CABundle:          []byte{},
-		RequireRemoteRefs: []config.RefSpec{},
-	})
-	if err != nil {
-		return err
-	}
-
-	g.logger.Debug("done pushing branch")
-
-	return nil
-}
-
-func (g *Git) GetAuth() (transport.AuthMethod, error) {
-	switch g.gitConfig.AuthOption {
-	case GIT_AUTH_SSH:
-		sshKey, err := ssh.NewPublicKeysFromFile(
-			g.gitConfig.User,
-			g.gitConfig.SshPublicKeyFilePath,
-			g.gitConfig.SshPrivateKeyPassword,
-		)
-		if err != nil {
-			return nil, err
-		}
-		return sshKey, nil
-	case GIT_AUTH_USERNAME_PASSWORD:
-		return &http.BasicAuth{
-			Username: g.gitConfig.User,
-			Password: g.gitConfig.Password,
-		}, nil
-	case GIT_AUTH_ACCESS_TOKEN:
-		return &http.BasicAuth{
-			Username: "required-username",
-			Password: g.gitConfig.AccessToken,
-		}, nil
-	case GIT_AUTH_ANONYMOUS:
-		return nil, nil
-	case GIT_AUTH_SSH_AGENT:
-		return ssh.NewSSHAgentAuth(g.gitConfig.User)
-	default:
-		return nil, nil
-	}
-}

internal/services/providers/gogit.go

@@ -0,0 +1,339 @@
+package providers
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"time"
+
+	"git.front.kjuulh.io/kjuulh/octopush/internal/services/signer"
+	"git.front.kjuulh.io/kjuulh/octopush/internal/services/storage"
+	"github.com/go-git/go-git/v5"
+	"github.com/go-git/go-git/v5/config"
+	"github.com/go-git/go-git/v5/plumbing"
+	"github.com/go-git/go-git/v5/plumbing/object"
+	"github.com/go-git/go-git/v5/plumbing/transport"
+	"github.com/go-git/go-git/v5/plumbing/transport/http"
+	"github.com/go-git/go-git/v5/plumbing/transport/ssh"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapio"
+)
+
+// GoGit is a native git provider, it can clone, pull
+// , push and as in abstraction on native git operations
+type GoGit struct {
+	logger    *zap.Logger
+	gitConfig *GitConfig
+	openPGP   *signer.OpenPGP
+}
+
+type GoGitRepo struct {
+	repo *git.Repository
+}
+
+func (gr *GoGitRepo) GetHEAD() (string, error) {
+	head, err := gr.repo.Head()
+	if err != nil {
+		return "", err
+	}
+
+	return head.Name().Short(), nil
+}
+
+type GitAuth string
+
+const (
+	GIT_AUTH_SSH               GitAuth = "ssh"
+	GIT_AUTH_USERNAME_PASSWORD GitAuth = "username_password"
+	GIT_AUTH_ACCESS_TOKEN      GitAuth = "access_token"
+	GIT_AUTH_ANONYMOUS         GitAuth = "anonymous"
+	GIT_AUTH_SSH_AGENT         GitAuth = "ssh_agent"
+)
+
+type GitConfig struct {
+	AuthOption            GitAuth
+	User                  string
+	Password              string
+	AccessToken           string
+	SshPublicKeyFilePath  string
+	SshPrivateKeyPassword string
+}
+
+func NewGit(logger *zap.Logger, gitConfig *GitConfig, openPGP *signer.OpenPGP) *GoGit {
+	return &GoGit{logger: logger, gitConfig: gitConfig, openPGP: openPGP}
+}
+
+func (g *GoGit) GetOriginHEADForRepo(ctx context.Context, gitRepo *GoGitRepo) (string, error) {
+	auth, err := g.GetAuth()
+	if err != nil {
+		return "", err
+	}
+
+	remote, err := gitRepo.repo.Remote("origin")
+	if err != nil {
+		return "", err
+	}
+
+	refs, err := remote.ListContext(ctx, &git.ListOptions{
+		Auth: auth,
+	})
+	if err != nil {
+		return "", err
+	}
+
+	headRef := ""
+	for _, ref := range refs {
+		//g.logger.Debug(ref.String())
+		if ref.Target().IsBranch() {
+			headRef = ref.Target().Short()
+		}
+	}
+
+	if headRef == "" {
+		return "", errors.New("no upstream HEAD branch could be found")
+	}
+
+	return headRef, nil
+}
+
+func (g *GoGit) CloneBranch(ctx context.Context, storageArea *storage.Area, repoUrl string, branch string) (*GoGitRepo, error) {
+	g.logger.Debug(
+		"cloning repository",
+		zap.String("repoUrl", repoUrl),
+		zap.String("path", storageArea.Path),
+	)
+
+	auth, err := g.GetAuth()
+	if err != nil {
+		return nil, err
+	}
+
+	cloneOptions := git.CloneOptions{
+		URL:               repoUrl,
+		Auth:              auth,
+		RemoteName:        "origin",
+		ReferenceName:     plumbing.NewBranchReferenceName(branch),
+		SingleBranch:      false,
+		NoCheckout:        false,
+		Depth:             1,
+		RecurseSubmodules: 1,
+		Progress:          g.getProgressWriter(),
+		Tags:              0,
+		InsecureSkipTLS:   false,
+		CABundle:          []byte{},
+	}
+
+	repo, err := git.PlainCloneContext(ctx, storageArea.Path, false, &cloneOptions)
+	if err != nil && !errors.Is(err, git.NoErrAlreadyUpToDate) {
+		return nil, err
+	}
+
+	g.logger.Debug("done cloning repo")
+
+	return &GoGitRepo{repo: repo}, nil
+}
+
+func (g *GoGit) Clone(ctx context.Context, storageArea *storage.Area, repoUrl string) (*GoGitRepo, error) {
+	g.logger.Debug(
+		"cloning repository",
+		zap.String("repoUrl", repoUrl),
+		zap.String("path", storageArea.Path),
+	)
+
+	auth, err := g.GetAuth()
+	if err != nil {
+		return nil, err
+	}
+
+	cloneOptions := git.CloneOptions{
+		URL:               repoUrl,
+		Auth:              auth,
+		RemoteName:        "origin",
+		ReferenceName:     "",
+		SingleBranch:      false,
+		NoCheckout:        false,
+		Depth:             1,
+		RecurseSubmodules: 1,
+		Progress:          g.getProgressWriter(),
+		Tags:              0,
+		InsecureSkipTLS:   false,
+		CABundle:          []byte{},
+	}
+
+	repo, err := git.PlainCloneContext(ctx, storageArea.Path, false, &cloneOptions)
+	if err != nil {
+		return nil, err
+	}
+
+	g.logger.Debug("done cloning repo")
+
+	return &GoGitRepo{repo: repo}, nil
+}
+
+func (g *GoGit) getProgressWriter() *zapio.Writer {
+	return &zapio.Writer{
+		Log:   g.logger.With(zap.String("process", "go-git")),
+		Level: zap.DebugLevel,
+	}
+}
+
+func (g *GoGit) Add(ctx context.Context, storageArea *storage.Area, gitRepo *GoGitRepo) (*git.Worktree, error) {
+	worktree, err := gitRepo.repo.Worktree()
+	if err != nil {
+		return nil, err
+	}
+
+	err = worktree.AddWithOptions(&git.AddOptions{
+		All: true,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	status, err := worktree.Status()
+	if err != nil {
+		return nil, err
+	}
+
+	g.logger.Debug("git status", zap.String("status", status.String()))
+
+	return worktree, nil
+}
+
+func (g *GoGit) CreateBranch(ctx context.Context, gitRepo *GoGitRepo) error {
+	worktree, err := gitRepo.repo.Worktree()
+	if err != nil {
+		return err
+	}
+
+	refSpec := plumbing.NewBranchReferenceName("octopush-apply")
+	err = gitRepo.repo.CreateBranch(&config.Branch{
+		Name:   "octopush-apply",
+		Remote: "origin",
+		Merge:  refSpec,
+		Rebase: "",
+	})
+	if err != nil {
+		return fmt.Errorf("could not create branch: %w", err)
+	}
+
+	err = worktree.Checkout(&git.CheckoutOptions{
+		Branch: plumbing.ReferenceName(refSpec.String()),
+		Create: true,
+		Force:  false,
+		Keep:   false,
+	})
+	if err != nil {
+		return fmt.Errorf("could not checkout branch: %w", err)
+	}
+
+	//remoteRef := plumbing.NewRemoteReferenceName("origin", "octopush-apply")
+	//ref := plumbing.NewSymbolicReference(refSpec, remoteRef)
+	//err = gitRepo.repo.Storer.SetReference(ref)
+	//if err != nil {
+	//	return fmt.Errorf("could not set reference: %w", err)
+	//}
+
+	auth, err := g.GetAuth()
+	if err != nil {
+		return err
+	}
+
+	err = worktree.PullContext(ctx, &git.PullOptions{
+		RemoteName:        "origin",
+		ReferenceName:     "",
+		SingleBranch:      false,
+		Depth:             1,
+		Auth:              auth,
+		RecurseSubmodules: 1,
+		Progress:          g.getProgressWriter(),
+		Force:             true,
+		InsecureSkipTLS:   false,
+		CABundle:          []byte{},
+	})
+	if err != nil && !errors.Is(err, git.NoErrAlreadyUpToDate) {
+		return fmt.Errorf("could not pull from origin: %w", err)
+	}
+
+	g.logger.Debug("done creating branches")
+
+	return nil
+}
+
+func (g *GoGit) Commit(ctx context.Context, gitRepo *GoGitRepo) error {
+	worktree, err := gitRepo.repo.Worktree()
+	if err != nil {
+		return err
+	}
+
+	_, err = worktree.Commit("some-commit", &git.CommitOptions{
+		All:       true,
+		Author:    &object.Signature{Name: "octopush", Email: "octopush@kasperhermansen.com", When: time.Now()},
+		Committer: &object.Signature{Name: "octopush", Email: "octopush@kasperhermansen.com", When: time.Now()},
+		SignKey:   g.openPGP.SigningKey,
+	})
+	if err != nil {
+		return err
+	}
+
+	g.logger.Debug("done commiting objects")
+
+	return nil
+}
+
+func (g *GoGit) Push(ctx context.Context, gitRepo *GoGitRepo) error {
+	auth, err := g.GetAuth()
+	if err != nil {
+		return err
+	}
+
+	err = gitRepo.repo.PushContext(ctx, &git.PushOptions{
+		RemoteName:        "origin",
+		RefSpecs:          []config.RefSpec{},
+		Auth:              auth,
+		Progress:          g.getProgressWriter(),
+		Prune:             false,
+		Force:             true,
+		InsecureSkipTLS:   false,
+		CABundle:          []byte{},
+		RequireRemoteRefs: []config.RefSpec{},
+	})
+	if err != nil {
+		return err
+	}
+
+	g.logger.Debug("done pushing branch")
+
+	return nil
+}
+
+func (g *GoGit) GetAuth() (transport.AuthMethod, error) {
+	switch g.gitConfig.AuthOption {
+	case GIT_AUTH_SSH:
+		sshKey, err := ssh.NewPublicKeysFromFile(
+			g.gitConfig.User,
+			g.gitConfig.SshPublicKeyFilePath,
+			g.gitConfig.SshPrivateKeyPassword,
+		)
+		if err != nil {
+			return nil, err
+		}
+		return sshKey, nil
+	case GIT_AUTH_USERNAME_PASSWORD:
+		return &http.BasicAuth{
+			Username: g.gitConfig.User,
+			Password: g.gitConfig.Password,
+		}, nil
+	case GIT_AUTH_ACCESS_TOKEN:
+		return &http.BasicAuth{
+			Username: "required-username",
+			Password: g.gitConfig.AccessToken,
+		}, nil
+	case GIT_AUTH_ANONYMOUS:
+		return nil, nil
+	case GIT_AUTH_SSH_AGENT:
+		return ssh.NewSSHAgentAuth(g.gitConfig.User)
+	default:
+		return nil, nil
+	}
+}

internal/services/storage/storage.go

@@ -22,7 +22,7 @@ func NewDefaultStorageConfig() (*StorageConfig, error) {
 		return nil, err
 	}
 	return &StorageConfig{
-		Path: path.Join(tempDir, "kraken"),
+		Path: path.Join(tempDir, "octopush"),
 	}, nil
 }