diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2019-11-28 12:17:38 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2019-11-28 12:17:38 +0300 |
commit | f6e438fc249656ad13ad3eb4cc59cecb959353a8 (patch) | |
tree | 43cd091e42322a252a5004dbee9d6ac051e56c6f /app_config.go | |
parent | 84812ac14c428b7af6d6a185bc1894b7ea47dc45 (diff) | |
parent | 29b0a2d8ebc10ef9fa070d5634ab5d18938c935e (diff) |
Merge branch 'master' into feature/gitlab-source-enum-domains
* master:
Improve GitLab client tests
Change GitLab API JWT expire time to 5s
Read the context of api-secret-key file and store it in app config
Improve gitlab client tests
Ensure there is response before defer close it in gitlab.GetVirtualDomain
Document acrguments for gitlab.NewClient
Add HTTP client to consume GitLab internal API for Pages
Diffstat (limited to 'app_config.go')
-rw-r--r-- | app_config.go | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/app_config.go b/app_config.go index 379a3696..639ece85 100644 --- a/app_config.go +++ b/app_config.go @@ -25,14 +25,15 @@ type appConfig struct { LogFormat string LogVerbose bool - StoreSecret string - GitLabServer string - ClientID string - ClientSecret string - RedirectURI string - SentryDSN string - SentryEnvironment string - CustomHeaders []string + StoreSecret string + GitLabServer string + GitLabAPISecretKey []byte + ClientID string + ClientSecret string + RedirectURI string + SentryDSN string + SentryEnvironment string + CustomHeaders []string } // GitlabServerURL returns URL to a GitLab instance. @@ -41,6 +42,6 @@ func (config appConfig) GitlabServerURL() string { } // GitlabClientSecret returns GitLab server access token. -func (config appConfig) GitlabClientSecret() []byte { - return []byte(config.ClientSecret) +func (config appConfig) GitlabAPISecret() []byte { + return config.GitLabAPISecretKey } |