This commit is contained in:
Livio Amstutz 2020-03-25 10:41:17 +01:00
parent 6bf96ecbd7
commit 1aaf721d92
5 changed files with 4 additions and 15 deletions

View File

@ -22,8 +22,8 @@ type Config struct {
Admin *admin.Config Admin *admin.Config
Console *console.Config Console *console.Config
//Log //Log //TODO: add
//Tracing tracing.TracingConfig //Tracing tracing.TracingConfig //TODO: add
AuthZ *authz.Config AuthZ *authz.Config
} }
@ -35,7 +35,6 @@ func main() {
loginEnabled := flag.Bool("login", true, "enable login ui") loginEnabled := flag.Bool("login", true, "enable login ui")
adminEnabled := flag.Bool("admin", true, "enable admin api") adminEnabled := flag.Bool("admin", true, "enable admin api")
consoleEnabled := flag.Bool("console", true, "enable console ui") consoleEnabled := flag.Bool("console", true, "enable console ui")
flag.Parse() flag.Parse()
conf := new(Config) conf := new(Config)

View File

@ -14,7 +14,6 @@ Mgmt:
GRPC: GRPC:
ServerPort: 60020 ServerPort: 60020
GatewayPort: 60021 GatewayPort: 60021
SearchLimit: 100
CustomHeaders: CustomHeaders:
- x-caos- - x-caos-
@ -23,7 +22,6 @@ Auth:
GRPC: GRPC:
ServerPort: 60050 ServerPort: 60050
GatewayPort: 60051 GatewayPort: 60051
SearchLimit: 100
CustomHeaders: CustomHeaders:
- x-caos- - x-caos-
@ -35,7 +33,6 @@ Admin:
GRPC: GRPC:
ServerPort: 60090 ServerPort: 60090
GatewayPort: 60091 GatewayPort: 60091
SearchLimit: 100
CustomHeaders: CustomHeaders:
- x-caos- - x-caos-

View File

@ -7,10 +7,6 @@ import (
"github.com/caos/logging" "github.com/caos/logging"
) )
const (
HeaderOrgID = "x-caos-zitadel-orgid"
)
type CtxKeyPermissions struct{} type CtxKeyPermissions struct{}
type CtxKeyData struct{} type CtxKeyData struct{}

View File

@ -3,14 +3,12 @@ package grpc
type Config struct { type Config struct {
ServerPort string ServerPort string
GatewayPort string GatewayPort string
SearchLimit int
CustomHeaders []string CustomHeaders []string
} }
func (c *Config) ToServerConfig() *ServerConfig { func (c *Config) ToServerConfig() *ServerConfig {
return &ServerConfig{ return &ServerConfig{
Port: c.ServerPort, Port: c.ServerPort,
SearchLimit: c.SearchLimit,
} }
} }
@ -23,8 +21,7 @@ func (c *Config) ToGatewayConfig() *GatewayConfig {
} }
type ServerConfig struct { type ServerConfig struct {
Port string Port string
SearchLimit int
} }
type GatewayConfig struct { type GatewayConfig struct {