diff options
-rw-r--r-- | app_config.go | 30 | ||||
-rw-r--r-- | internal/source/domains.go | 2 | ||||
-rw-r--r-- | internal/source/domains_test.go | 2 | ||||
-rw-r--r-- | internal/source/gitlab/client/config.go | 2 | ||||
-rw-r--r-- | main.go | 18 |
5 files changed, 27 insertions, 27 deletions
diff --git a/app_config.go b/app_config.go index 9e10b4aa..3bc2197b 100644 --- a/app_config.go +++ b/app_config.go @@ -27,19 +27,19 @@ type appConfig struct { LogFormat string LogVerbose bool - StoreSecret string - GitLabServer string - InternalGitLabServer string - GitLabAPISecretKey []byte - GitlabClientHTTPTimeout time.Duration - GitlabJWTTokenExpiration time.Duration - DomainSource string - ClientID string - ClientSecret string - RedirectURI string - SentryDSN string - SentryEnvironment string - CustomHeaders []string + StoreSecret string + GitLabServer string + InternalGitLabServer string + GitLabAPISecretKey []byte + GitlabClientHTTPTimeout time.Duration + GitlabJWTTokenExpiration time.Duration + DomainConfigurationSource string + ClientID string + ClientSecret string + RedirectURI string + SentryDSN string + SentryEnvironment string + CustomHeaders []string } // InternalGitLabServerURL returns URL to a GitLab instance. @@ -60,6 +60,6 @@ func (config appConfig) GitlabJWTTokenExpiry() time.Duration { return config.GitlabJWTTokenExpiration } -func (config appConfig) DomainSourceConfig() string { - return config.DomainSource +func (config appConfig) DomainConfigSource() string { + return config.DomainConfigurationSource } diff --git a/internal/source/domains.go b/internal/source/domains.go index e2d24a67..7a376bc7 100644 --- a/internal/source/domains.go +++ b/internal/source/domains.go @@ -41,7 +41,7 @@ type Domains struct { // not initialize `dm` as we later check the readiness by comparing it with a // nil value. func NewDomains(config Config) (*Domains, error) { - // TODO: choose domain source config via config.DomainSourceConfig() + // TODO: choose domain source config via config.DomainConfigSource() // https://gitlab.com/gitlab-org/gitlab/-/issues/217912 if len(config.InternalGitLabServerURL()) == 0 || len(config.GitlabAPISecret()) == 0 { diff --git a/internal/source/domains_test.go b/internal/source/domains_test.go index 4a328a3c..9fffe4a9 100644 --- a/internal/source/domains_test.go +++ b/internal/source/domains_test.go @@ -32,7 +32,7 @@ func (c sourceConfig) GitlabJWTTokenExpiry() time.Duration { return 30 * time.Second } -func (c sourceConfig) DomainSourceConfig() string { +func (c sourceConfig) DomainConfigSource() string { return c.domainSource } diff --git a/internal/source/gitlab/client/config.go b/internal/source/gitlab/client/config.go index 51b75025..bd9aa061 100644 --- a/internal/source/gitlab/client/config.go +++ b/internal/source/gitlab/client/config.go @@ -9,5 +9,5 @@ type Config interface { GitlabAPISecret() []byte GitlabClientConnectionTimeout() time.Duration GitlabJWTTokenExpiry() time.Duration - DomainSourceConfig() string + DomainConfigSource() string } @@ -66,14 +66,14 @@ var ( 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)") // TODO: implement functionality for disk, auto and gitlab https://gitlab.com/gitlab-org/gitlab/-/issues/217912 - domainSource = flag.String("domain-source", "disk", "Domain configuration source 'disk', 'auto' or 'gitlab' (default: 'disk')") - 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") - maxConns = flag.Uint("max-conns", 5000, "Limit on the number of concurrent connections to the HTTP, HTTPS or proxy listeners") - insecureCiphers = flag.Bool("insecure-ciphers", false, "Use default list of cipher suites, may contain insecure ones like 3DES and RC4") - tlsMinVersion = flag.String("tls-min-version", "tls1.2", tlsconfig.FlagUsage("min")) - tlsMaxVersion = flag.String("tls-max-version", "", tlsconfig.FlagUsage("max")) + domainConfigSource = flag.String("domain-config-source", "disk", "Domain configuration source 'disk', 'auto' or 'gitlab' (default: 'disk')") + 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") + maxConns = flag.Uint("max-conns", 5000, "Limit on the number of concurrent connections to the HTTP, HTTPS or proxy listeners") + insecureCiphers = flag.Bool("insecure-ciphers", false, "Use default list of cipher suites, may contain insecure ones like 3DES and RC4") + tlsMinVersion = flag.String("tls-min-version", "tls1.2", tlsconfig.FlagUsage("min")) + tlsMaxVersion = flag.String("tls-max-version", "", tlsconfig.FlagUsage("max")) disableCrossOriginRequests = flag.Bool("disable-cross-origin-requests", false, "Disable cross-origin requests") @@ -195,7 +195,7 @@ func configFromFlags() appConfig { config.InternalGitLabServer = internalGitLabServerFromFlags() config.GitlabClientHTTPTimeout = *gitlabClientHTTPTimeout config.GitlabJWTTokenExpiration = *gitlabClientJWTExpiry - config.DomainSource = *domainSource + config.DomainConfigurationSource = *domainConfigSource config.StoreSecret = *secret config.ClientID = *clientID config.ClientSecret = *clientSecret |