From b9177e0463aab3ca1614694390e8b6125420ee72 Mon Sep 17 00:00:00 2001 From: Sam Therapy Date: Fri, 21 Oct 2022 21:10:35 +0200 Subject: [PATCH 1/3] fix: Trim trailing slash from Gitea URL Fixes #3487 Signed-off-by: Sam Therapy --- internal/pipe/defaults/defaults.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/pipe/defaults/defaults.go b/internal/pipe/defaults/defaults.go index 4bdfeb1c580..f947e69cf5d 100644 --- a/internal/pipe/defaults/defaults.go +++ b/internal/pipe/defaults/defaults.go @@ -36,6 +36,7 @@ func (Pipe) Run(ctx *context.Context) error { } ctx.Config.GiteaURLs.Download = strings.ReplaceAll(apiURL, "/api/v1", "") + ctx.Config.GiteaURLs.Download = strings.TrimSuffix(apiURL, "/") } for _, defaulter := range defaults.Defaulters { if err := errhandler.Handle(defaulter.Default)(ctx); err != nil { From 2e123a6b8b3e1dac65a68096aa733b7730259649 Mon Sep 17 00:00:00 2001 From: Sam Therapy <87501267+SamTherapy@users.noreply.github.com> Date: Fri, 21 Oct 2022 19:44:13 +0000 Subject: [PATCH 2/3] Apply suggested change Thank you! Co-authored-by: Carlos Alexandro Becker --- internal/pipe/defaults/defaults.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/pipe/defaults/defaults.go b/internal/pipe/defaults/defaults.go index f947e69cf5d..dd6e92d2c0e 100644 --- a/internal/pipe/defaults/defaults.go +++ b/internal/pipe/defaults/defaults.go @@ -36,7 +36,7 @@ func (Pipe) Run(ctx *context.Context) error { } ctx.Config.GiteaURLs.Download = strings.ReplaceAll(apiURL, "/api/v1", "") - ctx.Config.GiteaURLs.Download = strings.TrimSuffix(apiURL, "/") + ctx.Config.GiteaURLs.Download = strings.TrimSuffix(ctx.Config.GiteaURLs.Download, "/") } for _, defaulter := range defaults.Defaulters { if err := errhandler.Handle(defaulter.Default)(ctx); err != nil { From 303cf05c2c4b6304138ca6ae93ceb830e7e84e54 Mon Sep 17 00:00:00 2001 From: Sam Therapy Date: Fri, 21 Oct 2022 21:49:50 +0200 Subject: [PATCH 3/3] Apply suggested change Signed-off-by: Sam Therapy --- internal/pipe/defaults/defaults.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/pipe/defaults/defaults.go b/internal/pipe/defaults/defaults.go index dd6e92d2c0e..116862397b0 100644 --- a/internal/pipe/defaults/defaults.go +++ b/internal/pipe/defaults/defaults.go @@ -35,8 +35,7 @@ func (Pipe) Run(ctx *context.Context) error { return fmt.Errorf("templating Gitea API URL: %w", err) } - ctx.Config.GiteaURLs.Download = strings.ReplaceAll(apiURL, "/api/v1", "") - ctx.Config.GiteaURLs.Download = strings.TrimSuffix(ctx.Config.GiteaURLs.Download, "/") + ctx.Config.GiteaURLs.Download = strings.TrimSuffix(strings.ReplaceAll(apiURL, "/api/v1", ""), "/") } for _, defaulter := range defaults.Defaulters { if err := errhandler.Handle(defaulter.Default)(ctx); err != nil {