Skip to content

Commit

Permalink
refactor: improve releases/scm.go a bit (#4334)
Browse files Browse the repository at this point in the history
use `ApplyAll`

Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>
  • Loading branch information
caarlos0 committed Sep 29, 2023
1 parent b7218b0 commit f3d2864
Showing 1 changed file with 18 additions and 30 deletions.
48 changes: 18 additions & 30 deletions internal/pipe/release/scm.go
Expand Up @@ -16,25 +16,21 @@ func setupGitHub(ctx *context.Context) error {
ctx.Config.Release.GitHub = repo
}

owner, err := tmpl.New(ctx).Apply(ctx.Config.Release.GitHub.Owner)
if err != nil {
if err := tmpl.New(ctx).ApplyAll(
&ctx.Config.Release.GitHub.Name,
&ctx.Config.Release.GitHub.Owner,
); err != nil {
return err
}
ctx.Config.Release.GitHub.Owner = owner

name, err := tmpl.New(ctx).Apply(ctx.Config.Release.GitHub.Name)
if err != nil {
return err
}
ctx.Config.Release.GitHub.Name = name

ctx.ReleaseURL, err = tmpl.New(ctx).Apply(fmt.Sprintf(
url, err := tmpl.New(ctx).Apply(fmt.Sprintf(
"%s/%s/%s/releases/tag/%s",
ctx.Config.GitHubURLs.Download,
ctx.Config.Release.GitHub.Owner,
ctx.Config.Release.GitHub.Name,
ctx.Git.CurrentTag,
))
ctx.ReleaseURL = url
return err
}

Expand All @@ -47,25 +43,21 @@ func setupGitLab(ctx *context.Context) error {
ctx.Config.Release.GitLab = repo
}

owner, err := tmpl.New(ctx).Apply(ctx.Config.Release.GitLab.Owner)
if err != nil {
if err := tmpl.New(ctx).ApplyAll(
&ctx.Config.Release.GitLab.Name,
&ctx.Config.Release.GitLab.Owner,
); err != nil {
return err
}
ctx.Config.Release.GitLab.Owner = owner

name, err := tmpl.New(ctx).Apply(ctx.Config.Release.GitLab.Name)
if err != nil {
return err
}
ctx.Config.Release.GitLab.Name = name

ctx.ReleaseURL, err = tmpl.New(ctx).Apply(fmt.Sprintf(
url, err := tmpl.New(ctx).Apply(fmt.Sprintf(
"%s/%s/%s/-/releases/%s",
ctx.Config.GitLabURLs.Download,
ctx.Config.Release.GitLab.Owner,
ctx.Config.Release.GitLab.Name,
ctx.Git.CurrentTag,
))
ctx.ReleaseURL = url
return err
}

Expand All @@ -78,24 +70,20 @@ func setupGitea(ctx *context.Context) error {
ctx.Config.Release.Gitea = repo
}

owner, err := tmpl.New(ctx).Apply(ctx.Config.Release.Gitea.Owner)
if err != nil {
return err
}
ctx.Config.Release.Gitea.Owner = owner

name, err := tmpl.New(ctx).Apply(ctx.Config.Release.Gitea.Name)
if err != nil {
if err := tmpl.New(ctx).ApplyAll(
&ctx.Config.Release.Gitea.Name,
&ctx.Config.Release.Gitea.Owner,
); err != nil {
return err
}
ctx.Config.Release.Gitea.Name = name

ctx.ReleaseURL, err = tmpl.New(ctx).Apply(fmt.Sprintf(
url, err := tmpl.New(ctx).Apply(fmt.Sprintf(
"%s/%s/%s/releases/tag/%s",
ctx.Config.GiteaURLs.Download,
ctx.Config.Release.Gitea.Owner,
ctx.Config.Release.Gitea.Name,
ctx.Git.CurrentTag,
))
ctx.ReleaseURL = url
return err
}

0 comments on commit f3d2864

Please sign in to comment.