make auth-basic config similar to other services

extensions/auth-basic/pkg/config/config.go

@@ -4,55 +4,61 @@ import "github.com/owncloud/ocis/ocis-pkg/shared"
 
 type Config struct {
 	*shared.Commons `yaml:"-"`
-	Tracing         *TracingConfig `yaml:"tracing"`
-	Logging         *LoggingConfig `yaml:"log"`
-	Service         ServiceConfig
-	DebugService    DebugServiceConfig `yaml:"debug"`
+	Service         Service  `yaml:"-"`
+	Tracing         *Tracing `yaml:"tracing"`
+	Logging         *Logging `yaml:"log"`
+	Debug           Debug    `yaml:"debug"`
 	Supervised      bool
-}
-type TracingConfig struct {
-	Enabled     bool
-	Endpoint    string
-	Collector   string
-	ServiceName string
-	Type        string
-}
 
-type LoggingConfig struct {
-	Level  string
-	Pretty bool
-	Color  bool
-	File   string
-}
+	GRPC GRPCConfig `yaml:"grpc"`
 
-type ServiceConfig struct {
 	JWTSecret             string
 	GatewayEndpoint       string
 	SkipUserGroupsInToken bool
-	Network               string // TODO: name transport or protocol?
-	Address               string
-	AuthManager           string
-	AuthManagers          AuthManagers
+	AuthProvider          string        `yaml:"auth_provider" env:"AUTH_BASIC_AUTH_PROVIDER" desc:"The auth provider which should be used by the service"`
+	AuthProviders         AuthProviders `yaml:"auth_providers"`
+}
+type Tracing struct {
+	Enabled   bool   `yaml:"enabled" env:"OCIS_TRACING_ENABLED;AUTH_BASIC_TRACING_ENABLED" desc:"Activates tracing."`
+	Type      string `yaml:"type" env:"OCIS_TRACING_TYPE;AUTH_BASIC_TRACING_TYPE"`
+	Endpoint  string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;AUTH_BASIC_TRACING_ENDPOINT" desc:"The endpoint to the tracing collector."`
+	Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;AUTH_BASIC_TRACING_COLLECTOR"`
 }
 
-type DebugServiceConfig struct {
-	Address string
-	Pprof   bool
-	Zpages  bool
-	Token   string
+type Logging struct {
+	Level  string `yaml:"level" env:"OCIS_LOG_LEVEL;AUTH_BASIC_LOG_LEVEL" desc:"The log level."`
+	Pretty bool   `yaml:"pretty" env:"OCIS_LOG_PRETTY;AUTH_BASIC_LOG_PRETTY" desc:"Activates pretty log output."`
+	Color  bool   `yaml:"color" env:"OCIS_LOG_COLOR;AUTH_BASIC_LOG_COLOR" desc:"Activates colorized log output."`
+	File   string `yaml:"file" env:"OCIS_LOG_FILE;AUTH_BASIC_LOG_FILE" desc:"The target log file."`
 }
 
-type AuthManagers struct {
-	JSON        JSONManager
-	LDAP        LDAPManager
-	OwnCloudSQL OwnCloudSQLManager
+type Service struct {
+	Name string `yaml:"-"`
 }
 
-type JSONManager struct {
-	Users string // TODO is there a better name?
+type Debug struct {
+	Addr   string `yaml:"addr" env:"AUTH_BASIC_DEBUG_ADDR"`
+	Token  string `yaml:"token" env:"AUTH_BASIC_DEBUG_TOKEN"`
+	Pprof  bool   `yaml:"pprof" env:"AUTH_BASIC_DEBUG_PPROF"`
+	Zpages bool   `yaml:"zpages" env:"AUTH_BASIC_DEBUG_ZPAGES"`
 }
 
-type LDAPManager struct {
+type GRPCConfig struct {
+	Addr     string `yaml:"addr" env:"AUTH_BASIC_GRPC_ADDR" desc:"The address of the grpc service."`
+	Protocol string `yaml:"protocol" env:"AUTH_BASIC_GRPC_PROTOCOL" desc:"The transport protocol of the grpc service."`
+}
+
+type AuthProviders struct {
+	JSON        JSONProvider        `yaml:"json"`
+	LDAP        LDAPProvider        `yaml:"ldap"`
+	OwnCloudSQL OwnCloudSQLProvider `yaml:"owncloud_sql"`
+}
+
+type JSONProvider struct {
+	File string `yaml:"file" env:"AUTH_BASIC_JSON_PROVIDER_FILE" desc:"The file to which the json provider writes the data."`
+}
+
+type LDAPProvider struct {
 	URI              string
 	CACert           string
 	Insecure         bool
@@ -88,7 +94,7 @@ type LDAPGroupSchema struct {
 	Member          string
 }
 
-type OwnCloudSQLManager struct {
+type OwnCloudSQLProvider struct {
 	DBUsername       string
 	DBPassword       string
 	DBHost           string