toolshed/abra
toolshed/abra
4
2
Fork 18
Code Issues 29 Pull Requests 3 Packages Releases 40 Activity

fix: make branches available as recipe source #453

Closed
stevensting wants to merge 3 commits from branch-recipes into main
pull from: branch-recipes
merge into: toolshed:main
Conversation 7 Commits 3 Files Changed 3 +16 -24
3 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/git/clone.go
View File

@ -8,7 +8,6 @@ import (
"coopcloud.tech/abra/pkg/log" "coopcloud.tech/abra/pkg/log"
"github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5"
"github.com/go-git/go-git/v5/plumbing"
) )
// Clone runs a git clone which accounts for different default branches. // Clone runs a git clone which accounts for different default branches.
@ -19,18 +18,10 @@ func Clone(dir, url string) error {
_, err := git.PlainClone(dir, false, &git.CloneOptions{ _, err := git.PlainClone(dir, false, &git.CloneOptions{
URL: url, URL: url,
Tags: git.AllTags, Tags: git.AllTags,
ReferenceName: plumbing.ReferenceName("refs/heads/master"), // To be able to pull recipe from any branch
SingleBranch: true, SingleBranch: false,
}) })
if err != nil {
log.Debugf("cloning %s default branch failed, attempting from main branch", url)
_, err := git.PlainClone(dir, false, &git.CloneOptions{
URL: url,
Tags: git.AllTags,
ReferenceName: plumbing.ReferenceName("refs/heads/main"),
SingleBranch: true,
})
if err != nil { if err != nil {
if strings.Contains(err.Error(), "authentication required") { if strings.Contains(err.Error(), "authentication required") {
name := filepath.Base(dir) name := filepath.Base(dir)
@ -39,7 +30,6 @@ func Clone(dir, url string) error {
return err return err
} }
}
log.Debugf("%s has been git cloned successfully", dir) log.Debugf("%s has been git cloned successfully", dir)
} else { } else {

1
pkg/recipe/compose.go
View File

@ -95,6 +95,7 @@ func (r Recipe) GetVersionLabelLocal() (string, error) {
for _, service := range config.Services { for _, service := range config.Services {
for label, value := range service.Deploy.Labels { for label, value := range service.Deploy.Labels {
log.Debugf("checking deploy label '%s' with value '%s' for correct formatting", label, value)
if strings.HasPrefix(label, "coop-cloud") && strings.Contains(label, "version") { if strings.HasPrefix(label, "coop-cloud") && strings.Contains(label, "version") {
return value, nil return value, nil
} }

9
pkg/recipe/git.go
View File

@ -68,6 +68,7 @@ func (r Recipe) EnsureExists() error {
// EnsureVersion checks whether a specific version exists for a recipe. // EnsureVersion checks whether a specific version exists for a recipe.
func (r Recipe) EnsureVersion(version string) (bool, error) { func (r Recipe) EnsureVersion(version string) (bool, error) {
isChaosCommit := false isChaosCommit := false
log.Debugf("ensuring version '%s' exists for recipe '%s'", version, r.Name)
if err := gitPkg.EnsureGitRepo(r.Dir); err != nil { if err := gitPkg.EnsureGitRepo(r.Dir); err != nil {
return isChaosCommit, err return isChaosCommit, err
@ -78,7 +79,7 @@ func (r Recipe) EnsureVersion(version string) (bool, error) {
return isChaosCommit, err return isChaosCommit, err
} }
tags, err := repo.Tags() tags, err := repo.References()
if err != nil { if err != nil {
return isChaosCommit, err return isChaosCommit, err
} }
@ -117,11 +118,11 @@ func (r Recipe) EnsureVersion(version string) (bool, error) {
worktree, err := repo.Worktree() worktree, err := repo.Worktree()
if err != nil { if err != nil {
return isChaosCommit, nil return isChaosCommit, err
} }
if err := worktree.Checkout(opts); err != nil { if err := worktree.Checkout(opts); err != nil {
return isChaosCommit, nil return isChaosCommit, err
} }
log.Debugf("successfully checked %s out to %s in %s", r.Name, tagRef.Short(), r.Dir) log.Debugf("successfully checked %s out to %s in %s", r.Name, tagRef.Short(), r.Dir)
@ -216,7 +217,7 @@ func (r Recipe) EnsureUpToDate() error {
opts := &git.PullOptions{ opts := &git.PullOptions{
Force: true, Force: true,
ReferenceName: branch, ReferenceName: branch,
SingleBranch: true, SingleBranch: false,
} }
if err := worktree.Pull(opts); err != nil { if err := worktree.Pull(opts); err != nil {