leviathonbeast/ionscale
1
0
Fork 0
mirror of https://github.com/jsiebens/ionscale.git synced 2026-03-31 15:07:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove auth provider config from flags and env variables

Browse Source
This commit is contained in:
Johan Siebens
2022-09-22 18:05:03 +02:00
parent 8c6ea9041b
commit 617575803c
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/cmd/server.go
-8
View File
@@ -61,14 +61,6 @@ func (c *configByFlags) prepareCommand(cmd *coral.Command) {
cmd.Flags().StringVar(&c.c.Database.Type, "database-type", "", "") cmd.Flags().StringVar(&c.c.Database.Type, "database-type", "", "")
cmd.Flags().StringVar(&c.c.Database.Url, "database-url", "", "") cmd.Flags().StringVar(&c.c.Database.Url, "database-url", "", "")
cmd.Flags().StringVar(&c.c.AuthProvider.Issuer, "auth-provider-issuer", "", "")
cmd.Flags().StringVar(&c.c.AuthProvider.ClientID, "auth-provider-client-id", "", "")
cmd.Flags().StringVar(&c.c.AuthProvider.ClientSecret, "auth-provider-client-secret", "", "")
cmd.Flags().StringSliceVar(&c.c.AuthProvider.Scopes, "auth-provider-additional-scopes", []string{}, "")
cmd.Flags().StringSliceVar(&c.c.AuthProvider.SystemAdminPolicy.Subs, "auth-provider-system-admins-subs", []string{}, "")
cmd.Flags().StringSliceVar(&c.c.AuthProvider.SystemAdminPolicy.Emails, "auth-provider-system-admins-emails", []string{}, "")
cmd.Flags().StringSliceVar(&c.c.AuthProvider.SystemAdminPolicy.Filters, "auth-provider-system-admins-filters", []string{}, "")
cmd.Flags().StringVar(&c.c.Logging.Level, "logging-level", "", "") cmd.Flags().StringVar(&c.c.Logging.Level, "logging-level", "", "")
cmd.Flags().StringVar(&c.c.Logging.Format, "logging-format", "", "") cmd.Flags().StringVar(&c.c.Logging.Format, "logging-format", "", "")
cmd.Flags().StringVar(&c.c.Logging.File, "logging-file", "", "") cmd.Flags().StringVar(&c.c.Logging.File, "logging-file", "", "")
internal/config/config.go
+9 -9
View File
@@ -99,7 +99,7 @@ type Config struct {
PollNet PollNet `yaml:"poll_net,omitempty" envPrefix:"POLL_NET_"` PollNet PollNet `yaml:"poll_net,omitempty" envPrefix:"POLL_NET_"`
Keys Keys `yaml:"keys,omitempty" envPrefix:"KEYS_"` Keys Keys `yaml:"keys,omitempty" envPrefix:"KEYS_"`
Database Database `yaml:"database,omitempty" envPrefix:"DB_"` Database Database `yaml:"database,omitempty" envPrefix:"DB_"`
AuthProvider AuthProvider `yaml:"auth_provider,omitempty" envPrefix:"AUTH_PROVIDER_"` AuthProvider AuthProvider `yaml:"auth_provider,omitempty"`
Logging Logging `yaml:"logging,omitempty" envPrefix:"LOGGING_"` Logging Logging `yaml:"logging,omitempty" envPrefix:"LOGGING_"`
} }
@@ -136,17 +136,17 @@ type Keys struct {
} }
type AuthProvider struct { type AuthProvider struct {
Issuer string `yaml:"issuer" env:"ISSUER"` Issuer string `yaml:"issuer"`
ClientID string `yaml:"client_id" env:"CLIENT_ID"` ClientID string `yaml:"client_id"`
ClientSecret string `yaml:"client_secret" env:"CLIENT_SECRET"` ClientSecret string `yaml:"client_secret"`
Scopes []string `yaml:"additional_scopes" env:"ADDITIONAL_SCOPES"` Scopes []string `yaml:"additional_scopes"`
SystemAdminPolicy SystemAdminPolicy `yaml:"system_admins" envPrefix:"SYSTEM_ADMINS_"` SystemAdminPolicy SystemAdminPolicy `yaml:"system_admins"`
} }
type SystemAdminPolicy struct { type SystemAdminPolicy struct {
Subs []string `json:"subs,omitempty" env:"SUBS"` Subs []string `json:"subs,omitempty"`
Emails []string `json:"emails,omitempty" env:"EMAILS"` Emails []string `json:"emails,omitempty"`
Filters []string `json:"filters,omitempty" env:"FILTERS"` Filters []string `json:"filters,omitempty"`
} }
func (c *Config) CreateUrl(format string, a ...interface{}) string { func (c *Config) CreateUrl(format string, a ...interface{}) string {