From e580a18382403747f98aca97e3df966fe2e5d4ee Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Sun, 12 Apr 2020 10:43:33 -0300 Subject: [PATCH] fix: brew no token (#1434) * fix: remove useless log Signed-off-by: Carlos Alexandro Becker * fix: brew no token Signed-off-by: Carlos Alexandro Becker * fix: add a warn Signed-off-by: Carlos Alexandro Becker --- internal/pipe/brew/brew.go | 16 +++++++-------- internal/pipe/brew/brew_test.go | 36 --------------------------------- 2 files changed, 7 insertions(+), 45 deletions(-) diff --git a/internal/pipe/brew/brew.go b/internal/pipe/brew/brew.go index 0d2e8aebf..d95646e87 100644 --- a/internal/pipe/brew/brew.go +++ b/internal/pipe/brew/brew.go @@ -259,13 +259,6 @@ func dataFor(ctx *context.Context, cfg config.Homebrew, tokenType context.TokenT if cfg.URLTemplate == "" { switch tokenType { - case context.TokenTypeGitHub: - cfg.URLTemplate = fmt.Sprintf( - "%s/%s/%s/releases/download/{{ .Tag }}/{{ .ArtifactName }}", - ctx.Config.GitHubURLs.Download, - ctx.Config.Release.GitHub.Owner, - ctx.Config.Release.GitHub.Name, - ) case context.TokenTypeGitLab: cfg.URLTemplate = fmt.Sprintf( "%s/%s/%s/uploads/{{ .ArtifactUploadHash }}/{{ .ArtifactName }}", @@ -274,8 +267,13 @@ func dataFor(ctx *context.Context, cfg config.Homebrew, tokenType context.TokenT ctx.Config.Release.GitLab.Name, ) default: - log.WithField("type", tokenType).Info("here") - return result, ErrTokenTypeNotImplementedForBrew + log.Warn("no url_template set and not github/gitlab/gitea token found, defaulting to github url template") + cfg.URLTemplate = fmt.Sprintf( + "%s/%s/%s/releases/download/{{ .Tag }}/{{ .ArtifactName }}", + ctx.Config.GitHubURLs.Download, + ctx.Config.Release.GitHub.Owner, + ctx.Config.Release.GitHub.Name, + ) } } url, err := tmpl.New(ctx).WithArtifact(artifact, map[string]string{}).Apply(cfg.URLTemplate) diff --git a/internal/pipe/brew/brew_test.go b/internal/pipe/brew/brew_test.go index ce466a34a..73b2a4790 100644 --- a/internal/pipe/brew/brew_test.go +++ b/internal/pipe/brew/brew_test.go @@ -660,42 +660,6 @@ func TestRunPipeNoUpload(t *testing.T) { }) } -func TestRunTokenTypeNotImplementedForBrew(t *testing.T) { - folder, err := ioutil.TempDir("", "goreleasertest") - assert.NoError(t, err) - var ctx = context.New(config.Project{ - Dist: folder, - ProjectName: "foo", - Release: config.Release{}, - Brews: []config.Homebrew{ - { - GitHub: config.Repo{ - Owner: "test", - Name: "test", - }, - }, - }, - }) - ctx.Git = context.GitInfo{CurrentTag: "v1.0.1"} - var path = filepath.Join(folder, "whatever.tar.gz") - _, err = os.Create(path) - assert.NoError(t, err) - ctx.Artifacts.Add(&artifact.Artifact{ - Name: "bin", - Path: path, - Goos: "darwin", - Goarch: "amd64", - Type: artifact.UploadableArchive, - Extra: map[string]interface{}{ - "ID": "foo", - "Format": "tar.gz", - }, - }) - client := &DummyClient{} - require.Equal(t, ErrTokenTypeNotImplementedForBrew, Pipe{}.Run(ctx)) - testlib.AssertSkipped(t, doPublish(ctx, client)) -} - func TestDefault(t *testing.T) { _, back := testlib.Mktmp(t) defer back()