scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-10-07 11:27:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed arg cli descriptions

Browse source
This commit is contained in:
Souhaila Noor 2021-12-02 14:52:38 -06:00
parent aebd4c4c62
commit 50d80f2f1c
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ctl/server.go
View file

@ -125,9 +125,9 @@ func BuildServerFlags(cmd *cobra.Command, srv *server.Command) {
// OAuth2.0 identity provider configuration
flags.BoolVar(&srv.Config.Auth.Enable, "auth.enable", false, "Enable AuthN/AuthZ of featurebase, disabled by default.")
flags.StringVar(&srv.Config.Auth.ClientId, "auth.client-id", srv.Config.Auth.ClientId, "Identity Provider's Application/Client ID.")
flags.StringVar(&srv.Config.Auth.ClientSecret, "auth.client-secret", srv.Config.Auth.ClientSecret, "Identity Provider's Application/Client Secret.")
flags.StringVar(&srv.Config.Auth.ClientSecret, "auth.client-secret", srv.Config.Auth.ClientSecret, "Identity Provider's Client Secret.")
flags.StringVar(&srv.Config.Auth.AuthorizeURL, "auth.authorize-url", srv.Config.Auth.AuthorizeURL, "Identity Provider's Authorize URL.")
flags.StringVar(&srv.Config.Auth.TokenURL, "auth.token-url", srv.Config.Auth.TokenURL, "Identity Provider's Token URL for identity provider.")
flags.StringVar(&srv.Config.Auth.TokenURL, "auth.token-url", srv.Config.Auth.TokenURL, "Identity Provider's Token URL.")
flags.StringVar(&srv.Config.Auth.GroupEndpointURL, "auth.group-endpoint-url", srv.Config.Auth.GroupEndpointURL, "Identity Provider's Group endpoint URL.")
}

8
server/config.go
View file

@ -630,7 +630,7 @@ func lookupAddr(ctx context.Context, resolver *net.Resolver, host string) (strin
}
func (c *Config) ValidateAuth() error {
authURL := []string{
authConfig := []string{
"ClientId", c.Auth.ClientId,
"ClientSecret", c.Auth.ClientSecret,
"AuthorizeURL", c.Auth.AuthorizeURL,
@ -638,10 +638,10 @@ func (c *Config) ValidateAuth() error {
"GroupEndpointURL", c.Auth.GroupEndpointURL,
}
n := len(authURL)
n := len(authConfig)
for i := 0; i < n; i += 2 {
name := authURL[i]
value := authURL[i+1]
name := authConfig[i]
value := authConfig[i+1]
if strings.Contains(name, "URL") {
_, err := url.ParseRequestURI(value)
if err != nil {