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 +6 -4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 161f2127d6 - Show all commits

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'", label)
decentral1se marked this conversation as resolved Outdated
decentral1se commented 2024-12-26 18:49:15 +00:00
Outdated
Review
Copy Link

Could we make this message more specific, e.g. what are we checking for?

Also, you don't log the value, is that by choice?

Could we make this message more specific, e.g. what are we checking for? Also, you don't log the `value`, is that by choice?
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'", version)
decentral1se marked this conversation as resolved Outdated
decentral1se commented 2024-12-26 18:49:48 +00:00
Outdated
Review
Copy Link

%s/Ensuring/ensuring (lowercase convention everywhere else in the codebase).

Also, can you make this more specific, e.g. using the r.Name there too?

`%s/Ensuring/ensuring` (lowercase convention everywhere else in the codebase). Also, can you make this more specific, e.g. using the `r.Name` there too?
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 {