diff options
author | Jaime Martinez <jmartinez@gitlab.com> | 2020-08-06 04:23:49 +0300 |
---|---|---|
committer | Jaime Martinez <jmartinez@gitlab.com> | 2020-08-06 04:23:49 +0300 |
commit | f1b46f98d343dc5b12928aaa79c39f0c7db8e3af (patch) | |
tree | 53210f593dcf59f9975b4f48a8738e9ecb14de74 /internal/source/domains.go | |
parent | b2922c74ae775f4a56c784572c6672fa2c7332fa (diff) |
Revert "Merge branch 'revert-b3bf3ac4' into 'master'"revert-84c3866
This reverts commit 84c3866ba69e2ca0ca7d512b09ae66458f5c1c5c, reversing
changes made to 185e0a0e5c621f350335495291c535e5c05df89b.
Diffstat (limited to 'internal/source/domains.go')
-rw-r--r-- | internal/source/domains.go | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/internal/source/domains.go b/internal/source/domains.go index 77e1aa1d..ca2a8b6e 100644 --- a/internal/source/domains.go +++ b/internal/source/domains.go @@ -44,19 +44,22 @@ func NewDomains(config Config) (*Domains, error) { // TODO: choose domain source config via config.DomainConfigSource() // https://gitlab.com/gitlab-org/gitlab/-/issues/217912 + domains := &Domains{ + disk: disk.New(), + } + if len(config.InternalGitLabServerURL()) == 0 || len(config.GitlabAPISecret()) == 0 { - return &Domains{disk: disk.New()}, nil + return domains, nil } - gitlab, err := gitlab.New(config) + glClient, err := gitlab.New(config) if err != nil { return nil, err } - return &Domains{ - gitlab: gitlab, - disk: disk.New(), - }, nil + domains.gitlab = glClient + + return domains, nil } // GetDomain retrieves a domain information from a source. We are using two @@ -85,7 +88,7 @@ func (d *Domains) IsReady() bool { } func (d *Domains) source(domain string) Source { - if d.gitlab == nil { + if d.gitlab == nil || !d.gitlab.IsReady() { return d.disk } |