Mirrors/flux2
1
0
Fork 0
mirror of synced 2026-02-06 19:05:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use git package for bootstrap

Browse Source
This commit is contained in:
stefanprodan
2020-06-18 09:59:39 +03:00
parent bd781bbcfb
commit d0a79c2b4c
5 changed files with 341 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/git/provider.go
View File

@@ -2,6 +2,7 @@ package git
import "context"
// Provider is the interface that a git provider should implement
type Provider interface {
CreateRepository(ctx context.Context, r *Repository) (bool, error)
AddTeam(ctx context.Context, r *Repository, name, permission string) (bool, error)

44
pkg/git/repository.go
View File

@@ -17,14 +17,15 @@ type Repository struct {
Name string
Owner string
Host string
Branch string
Token string
AuthorName string
AuthorEmail string
repo *git.Repository
}
// NewRepository returns a git repository wrapper
func NewRepository(name, owner, host, branch, token, authorName, authorEmail string) (*Repository, error) {
func NewRepository(name, owner, host, token, authorName, authorEmail string) (*Repository, error) {
if name == "" {
return nil, fmt.Errorf("name required")
}
@@ -34,24 +35,20 @@ func NewRepository(name, owner, host, branch, token, authorName, authorEmail str
if host == "" {
return nil, fmt.Errorf("host required")
}
if branch == "" {
return nil, fmt.Errorf("branch required")
}
if token == "" {
return nil, fmt.Errorf("token required")
}
if authorName == "" {
authorName = "tk"
return nil, fmt.Errorf("author name required")
}
if authorEmail == "" {
authorEmail = "tk@users.noreply.git-scm.com"
return nil, fmt.Errorf("author email required")
}
return &Repository{
Name: name,
Owner: owner,
Host: host,
Branch: branch,
Token: token,
AuthorName: authorName,
AuthorEmail: authorEmail,
@@ -75,33 +72,38 @@ func (r *Repository) auth() transport.AuthMethod {
}
}
// Checkout repository at specified path
func (r *Repository) Checkout(ctx context.Context, path string) (*git.Repository, error) {
// Checkout repository branch at specified path
func (r *Repository) Checkout(ctx context.Context, branch, path string) error {
repo, err := git.PlainCloneContext(ctx, path, false, &git.CloneOptions{
URL: r.GetURL(),
Auth: r.auth(),
RemoteName: git.DefaultRemoteName,
ReferenceName: plumbing.NewBranchReferenceName(r.Branch),
ReferenceName: plumbing.NewBranchReferenceName(branch),
SingleBranch: true,
NoCheckout: false,
Progress: nil,
Tags: git.NoTags,
})
if err != nil {
return nil, fmt.Errorf("git clone error: %w", err)
return fmt.Errorf("git clone error: %w", err)
}
_, err = repo.Head()
if err != nil {
return nil, fmt.Errorf("git resolve HEAD error: %w", err)
return fmt.Errorf("git resolve HEAD error: %w", err)
}
return repo, nil
r.repo = repo
return nil
}
// Commit changes for the specified path, returns false if no changes are made
func (r *Repository) Commit(ctx context.Context, repo *git.Repository, path, message string) (bool, error) {
w, err := repo.Worktree()
// Commit changes for the specified path, returns false if no changes are detected
func (r *Repository) Commit(ctx context.Context, path, message string) (bool, error) {
if r.repo == nil {
return false, fmt.Errorf("repository hasn't been cloned")
}
w, err := r.repo.Worktree()
if err != nil {
return false, err
}
@@ -133,8 +135,12 @@ func (r *Repository) Commit(ctx context.Context, repo *git.Repository, path, mes
}
// Push commits to origin
func (r *Repository) Push(ctx context.Context, repo *git.Repository) error {
err := repo.PushContext(ctx, &git.PushOptions{
func (r *Repository) Push(ctx context.Context) error {
if r.repo == nil {
return fmt.Errorf("repository hasn't been cloned")
}
err := r.repo.PushContext(ctx, &git.PushOptions{
Auth: r.auth(),
Progress: nil,
})