From e0bf1a2bb69db1ca911aa82dc2b730172635c58d Mon Sep 17 00:00:00 2001 From: feistel <6742251-feistel@users.noreply.gitlab.com> Date: Wed, 1 Jun 2022 00:03:27 +0200 Subject: Infer artifacts-server from internal server unless it's set explicitly --- internal/config/config.go | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'internal/config') diff --git a/internal/config/config.go b/internal/config/config.go index 06e0520a..395e7e42 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -154,6 +154,14 @@ func internalGitlabServerFromFlags() string { return *publicGitLabServer } +func artifactsServerFromFlags() string { + if *artifactsServer != "" { + return *artifactsServer + } + + return *internalGitLabServer + "/api/v4" +} + func setGitLabAPISecretKey(secretFile string, config *Config) error { if secretFile == "" { return nil @@ -288,6 +296,8 @@ func loadConfig() (*Config, error) { config.GitLab.InternalServer = internalGitlabServerFromFlags() + config.ArtifactsServer.URL = artifactsServerFromFlags() + if err = setGitLabAPISecretKey(*gitLabAPISecretKey, config); err != nil { return nil, err } -- cgit v1.2.3