diff options
| -rw-r--r-- | app_config.go | 26 | ||||
| -rw-r--r-- | main.go | 9 |
2 files changed, 18 insertions, 17 deletions
diff --git a/app_config.go b/app_config.go index 4bca27aa..245a9e0d 100644 --- a/app_config.go +++ b/app_config.go @@ -27,17 +27,17 @@ type appConfig struct { LogFormat string LogVerbose bool - StoreSecret string - GitLabServer string - GitLabAPISecretKey []byte - GitlabClientTimeout int64 - GitlbaJWTTokenExpiry int64 - ClientID string - ClientSecret string - RedirectURI string - SentryDSN string - SentryEnvironment string - CustomHeaders []string + StoreSecret string + GitLabServer string + GitLabAPISecretKey []byte + GitlabClientHTTPTimeout time.Duration + GitlabJWTTokenExpiration time.Duration + ClientID string + ClientSecret string + RedirectURI string + SentryDSN string + SentryEnvironment string + CustomHeaders []string } // GitlabServerURL returns URL to a GitLab instance. @@ -51,9 +51,9 @@ func (config appConfig) GitlabAPISecret() []byte { } func (config appConfig) GitlabClientConnectionTimeout() time.Duration { - return time.Duration(config.GitlabClientTimeout) * time.Second + return config.GitlabClientHTTPTimeout } func (config appConfig) GitlabJWTTokenExpiry() time.Duration { - return time.Duration(config.GitlbaJWTTokenExpiry) * time.Second + return config.GitlabJWTTokenExpiration } @@ -8,6 +8,7 @@ import ( "net/url" "os" "strings" + "time" "github.com/namsral/flag" log "github.com/sirupsen/logrus" @@ -59,8 +60,8 @@ var ( gitLabAuthServer = flag.String("auth-server", "", "DEPRECATED, use gitlab-server instead. GitLab server, for example https://www.gitlab.com") gitLabServer = flag.String("gitlab-server", "", "GitLab server, for example https://www.gitlab.com") gitLabAPISecretKey = flag.String("api-secret-key", "", "File with secret key used to authenticate with the GitLab API") - gitlabClientHTTPTimeout = flag.Int64("gitlab-client-http-timeout", 10, "GitLab API HTTP client connection timeout in seconds (default: 10s)") - gitlabClientJWTExpiry = flag.Int64("gitlab-client-jwt-expiry", 30, "JWT Token expiry time in seconds (default: 30s)") + gitlabClientHTTPTimeout = flag.Duration("gitlab-client-http-timeout", 10*time.Second, "GitLab API HTTP client connection timeout in seconds (default: 10s)") + gitlabClientJWTExpiry = flag.Duration("gitlab-client-jwt-expiry", 30*time.Second, "JWT Token expiry time in seconds (default: 30s)") clientID = flag.String("auth-client-id", "", "GitLab application Client ID") clientSecret = flag.String("auth-client-secret", "", "GitLab application Client Secret") redirectURI = flag.String("auth-redirect-uri", "", "GitLab application redirect URI") @@ -178,8 +179,8 @@ func configFromFlags() appConfig { } config.GitLabServer = gitlabServerFromFlags() - config.GitlabClientTimeout = *gitlabClientHTTPTimeout - config.GitlbaJWTTokenExpiry = *gitlabClientJWTExpiry + config.GitlabClientHTTPTimeout = *gitlabClientHTTPTimeout + config.GitlabJWTTokenExpiration = *gitlabClientJWTExpiry config.StoreSecret = *secret config.ClientID = *clientID config.ClientSecret = *clientSecret |