Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfeistel <6742251-feistel@users.noreply.gitlab.com>2022-06-01 01:03:27 +0300
committerfeistel <6742251-feistel@users.noreply.gitlab.com>2022-06-01 01:03:27 +0300
commite0bf1a2bb69db1ca911aa82dc2b730172635c58d (patch)
treefbc0d4f8464971c8647c4839567432255f0d3405 /internal/config
parentd820de93ee18a6c052fd73df6743718424f00e8f (diff)
Infer artifacts-server from internal server unless it's set explicitly
Diffstat (limited to 'internal/config')
-rw-r--r--internal/config/config.go10
1 files changed, 10 insertions, 0 deletions
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
}