feat: merge master

This commit is contained in:
Fabiennne
2020-03-30 17:51:25 +02:00
parent 85aa907d12
commit 108876348f
12 changed files with 10 additions and 29 deletions

View File

@@ -1,7 +0,0 @@
package api
import "github.com/caos/zitadel/internal/api/grpc"
type Config struct {
GRPC grpc.Config
}

View File

@@ -13,7 +13,7 @@ type Gateway struct {
cutomHeaders []string
}
func StartGateway(conf *grpc_util.GatewayConfig) *Gateway {
func StartGateway(conf grpc_util.GatewayConfig) *Gateway {
return &Gateway{
grpcEndpoint: conf.GRPCEndpoint,
port: conf.Port,

View File

@@ -20,7 +20,7 @@ type Server struct {
searchLimit int
}
func StartServer(conf *grpc_util.ServerConfig) *Server {
func StartServer(conf grpc_util.ServerConfig) *Server {
return &Server{
port: conf.Port,
}

View File

@@ -17,7 +17,7 @@ type Config struct {
GRPC grpc_util.Config
}
func Start(ctx context.Context, conf *Config) error {
func Start(ctx context.Context, conf Config) error {
api := &API{
grpcServer: *grpc.StartServer(conf.GRPC.ToServerConfig()),
gateway: *grpc.StartGateway(conf.GRPC.ToGatewayConfig()),

View File

@@ -1,7 +0,0 @@
package api
import "github.com/caos/zitadel/internal/api/grpc"
type Config struct {
GRPC grpc.Config
}

View File

@@ -15,7 +15,7 @@ type Gateway struct {
cutomHeaders []string
}
func StartGateway(conf *grpc_util.GatewayConfig) *Gateway {
func StartGateway(conf grpc_util.GatewayConfig) *Gateway {
return &Gateway{
grpcEndpoint: conf.GRPCEndpoint,
port: conf.Port,

View File

@@ -15,7 +15,7 @@ type Server struct {
searchLimit int
}
func StartServer(conf *grpc_util.ServerConfig) *Server {
func StartServer(conf grpc_util.ServerConfig) *Server {
return &Server{
port: conf.Port,
}

View File

@@ -1,7 +0,0 @@
package api
import "github.com/caos/zitadel/internal/api/grpc"
type Config struct {
GRPC grpc.Config
}

View File

@@ -13,7 +13,7 @@ type Gateway struct {
cutomHeaders []string
}
func StartGateway(conf *grpc_util.GatewayConfig) *Gateway {
func StartGateway(conf grpc_util.GatewayConfig) *Gateway {
return &Gateway{
grpcEndpoint: conf.GRPCEndpoint,
port: conf.Port,

View File

@@ -13,7 +13,7 @@ type Server struct {
port string
}
func StartServer(conf *grpc_util.ServerConfig) *Server {
func StartServer(conf grpc_util.ServerConfig) *Server {
return &Server{
port: conf.Port,
}