TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-01-06 13:57:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: merge master

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
go.mod
View File

@ -11,6 +11,7 @@ require (
github.com/Masterminds/sprig v2.22.0+incompatible
github.com/aws/aws-sdk-go v1.29.16 // indirect
github.com/caos/logging v0.0.1
github.com/envoyproxy/protoc-gen-validate v0.1.0
github.com/ghodss/yaml v1.0.0
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/golang/mock v1.4.3
@ -34,7 +35,7 @@ require (
golang.org/x/text v0.3.2
golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56
google.golang.org/api v0.20.0 // indirect
google.golang.org/genproto v0.0.0-20200319113533-08878b785e9c // indirect
google.golang.org/genproto v0.0.0-20200319113533-08878b785e9c
google.golang.org/grpc v1.28.0
gopkg.in/yaml.v2 v2.2.8 // indirect
)

1
go.sum
View File

@ -47,6 +47,7 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=

7
pkg/admin/api/config.go
View File

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

2
pkg/admin/api/grpc/gateway.go
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,

2
pkg/admin/api/grpc/server.go
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,
}

2
pkg/auth/api/api.go
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()),

7
pkg/auth/api/config.go
View File

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

2
pkg/auth/api/grpc/gateway.go
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,

2
pkg/auth/api/grpc/server.go
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,
}

7
pkg/management/api/config.go
View File

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

2
pkg/management/api/grpc/gateway.go
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,

2
pkg/management/api/grpc/server.go
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,
}