From 69dee67975dd65b740b66ca4a18a5fe9bd8cb093 Mon Sep 17 00:00:00 2001 From: Carlos A Becker Date: Fri, 21 Jan 2022 23:08:32 -0300 Subject: [PATCH] fix: improve deprecate logs Signed-off-by: Carlos A Becker --- internal/deprecate/deprecate.go | 12 ++++++++---- internal/deprecate/testdata/TestNotice.txt.golden | 2 +- .../deprecate/testdata/TestNoticeCustom.txt.golden | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/internal/deprecate/deprecate.go b/internal/deprecate/deprecate.go index 094797609f7..5f5b815af47 100644 --- a/internal/deprecate/deprecate.go +++ b/internal/deprecate/deprecate.go @@ -43,10 +43,14 @@ func Notice(ctx *context.Context, property string) { // NoticeCustom warns the user about the deprecation of the given property. func NoticeCustom(ctx *context.Context, property, tmpl string) { ctx.Deprecated = true - cli.Default.Padding += 3 - defer func() { - cli.Default.Padding -= 3 - }() + // XXX: this is very ugly! + w := log.Log.(*log.Logger).Handler.(*cli.Handler).Writer + handler := cli.New(w) + handler.Padding = cli.Default.Padding + 3 + log := &log.Logger{ + Handler: handler, + Level: log.InfoLevel, + } // replaces . and _ with - url := baseURL + strings.NewReplacer( ".", "", diff --git a/internal/deprecate/testdata/TestNotice.txt.golden b/internal/deprecate/testdata/TestNotice.txt.golden index bd4a5aab277..7048f68692e 100644 --- a/internal/deprecate/testdata/TestNotice.txt.golden +++ b/internal/deprecate/testdata/TestNotice.txt.golden @@ -1,3 +1,3 @@ • first - • DEPRECATED: `foo.bar.whatever` should not be used anymore, check https://goreleaser.com/deprecations#foobarwhatever for more info + • DEPRECATED: `foo.bar.whatever` should not be used anymore, check https://goreleaser.com/deprecations#foobarwhatever for more info • last diff --git a/internal/deprecate/testdata/TestNoticeCustom.txt.golden b/internal/deprecate/testdata/TestNoticeCustom.txt.golden index dad95691c8c..1ef2d0e5e43 100644 --- a/internal/deprecate/testdata/TestNoticeCustom.txt.golden +++ b/internal/deprecate/testdata/TestNoticeCustom.txt.golden @@ -1,3 +1,3 @@ • first - • DEPRECATED: some custom template with a url https://goreleaser.com/deprecations#something-else + • DEPRECATED: some custom template with a url https://goreleaser.com/deprecations#something-else • last