From 9ce901bfa042b50061c333b20bd2eb6cc95a8398 Mon Sep 17 00:00:00 2001 From: crapStone Date: Sun, 19 May 2024 23:52:46 +0200 Subject: [PATCH] better error message when using wrong forge-root-url --- server/gitea/client.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/server/gitea/client.go b/server/gitea/client.go index 5955bfb..3abb487 100644 --- a/server/gitea/client.go +++ b/server/gitea/client.go @@ -57,12 +57,13 @@ type Client struct { defaultMimeType string } -func NewClient(cfg config.GiteaConfig, respCache cache.ICache) (*Client, error) { - rootURL, err := url.Parse(cfg.Root) +func NewClient(cfg config.ForgeConfig, respCache cache.ICache) (*Client, error) { + // url.Parse returns valid on almost anything... + rootURL, err := url.ParseRequestURI(cfg.Root) if err != nil { - return nil, err + return nil, fmt.Errorf("invalid forgejo/gitea root url: %w", err) } - giteaRoot := strings.Trim(rootURL.String(), "/") + giteaRoot := strings.TrimSuffix(rootURL.String(), "/") stdClient := http.Client{Timeout: 10 * time.Second}