fix: imports

This commit is contained in:
Fabiennne
2020-03-24 16:16:05 +01:00
parent e6a4b7398c
commit 3100d4b48b
6 changed files with 12 additions and 9 deletions

View File

@@ -1,7 +1,7 @@
package grpc package grpc
import ( import (
"github.com/caos/utils/api/grpc/server" "github.com/caos/zitadel/internal/api/grpc/server"
"github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/grpc-ecosystem/grpc-gateway/runtime"
"strings" "strings"
) )

View File

@@ -1,7 +1,7 @@
package grpc package grpc
import ( import (
grpc_utils "github.com/caos/zitadel/internal/api/grpc" "github.com/caos/zitadel/internal/api/grpc/server/middleware"
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
"google.golang.org/grpc" "google.golang.org/grpc"
) )
@@ -31,9 +31,10 @@ func (s *Server) GRPCPort() string {
func (s *Server) GRPCServer() (*grpc.Server, error) { func (s *Server) GRPCServer() (*grpc.Server, error) {
gs := grpc.NewServer( gs := grpc.NewServer(
middleware.TracingStatsServer("/Healthz", "/Ready", "/Validate"),
grpc.UnaryInterceptor( grpc.UnaryInterceptor(
grpc_middleware.ChainUnaryServer( grpc_middleware.ChainUnaryServer(
grpc_utils.ErrorHandler(), middleware.ErrorHandler(),
), ),
), ),
) )

View File

@@ -1,7 +1,7 @@
package grpc package grpc
import ( import (
"github.com/caos/utils/api/grpc/server" "github.com/caos/zitadel/internal/api/grpc/server"
"github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/grpc-ecosystem/grpc-gateway/runtime"
"strings" "strings"
) )

View File

@@ -1,7 +1,7 @@
package grpc package grpc
import ( import (
grpc_utils "github.com/caos/zitadel/internal/api/grpc" "github.com/caos/zitadel/internal/api/grpc/server/middleware"
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
"google.golang.org/grpc" "google.golang.org/grpc"
) )
@@ -31,9 +31,10 @@ func (s *Server) GRPCPort() string {
func (s *Server) GRPCServer() (*grpc.Server, error) { func (s *Server) GRPCServer() (*grpc.Server, error) {
gs := grpc.NewServer( gs := grpc.NewServer(
middleware.TracingStatsServer("/Healthz", "/Ready", "/Validate"),
grpc.UnaryInterceptor( grpc.UnaryInterceptor(
grpc_middleware.ChainUnaryServer( grpc_middleware.ChainUnaryServer(
grpc_utils.ErrorHandler(), middleware.ErrorHandler(),
), ),
), ),
) )

View File

@@ -1,7 +1,7 @@
package grpc package grpc
import ( import (
"github.com/caos/utils/api/grpc/server" "github.com/caos/zitadel/internal/api/grpc/server"
"github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/grpc-ecosystem/grpc-gateway/runtime"
"strings" "strings"
) )

View File

@@ -1,7 +1,7 @@
package grpc package grpc
import ( import (
grpc_utils "github.com/caos/zitadel/internal/api/grpc" "github.com/caos/zitadel/internal/api/grpc/server/middleware"
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
"google.golang.org/grpc" "google.golang.org/grpc"
) )
@@ -31,9 +31,10 @@ func (s *Server) GRPCPort() string {
func (s *Server) GRPCServer() (*grpc.Server, error) { func (s *Server) GRPCServer() (*grpc.Server, error) {
gs := grpc.NewServer( gs := grpc.NewServer(
middleware.TracingStatsServer("/Healthz", "/Ready", "/Validate"),
grpc.UnaryInterceptor( grpc.UnaryInterceptor(
grpc_middleware.ChainUnaryServer( grpc_middleware.ChainUnaryServer(
grpc_utils.ErrorHandler(), middleware.ErrorHandler(),
), ),
), ),
) )