fix configs

pkg/admin/api/api.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+	grpc_util "github.com/caos/zitadel/internal/api/grpc"
 	"github.com/caos/zitadel/internal/api/grpc/server"
 	"github.com/caos/zitadel/pkg/admin/api/grpc"
 )
@@ -12,14 +13,13 @@ type API struct {
 }
 
 type Config struct {
-	GRPCServer grpc.Config
-	Gateway    grpc.GatewayConfig
+	GRPC grpc_util.Config
 }
 
 func Start(ctx context.Context, conf *Config) error {
 	api := &API{
-		grpcServer: *grpc.StartServer(conf.GRPCServer),
-		gateway:    *grpc.StartGateway(conf.Gateway),
+		grpcServer: *grpc.StartServer(conf.GRPC.ToServerConfig()),
+		gateway:    *grpc.StartGateway(conf.GRPC.ToGatewayConfig()),
 	}
 	server.StartServer(ctx, &api.grpcServer)
 	server.StartGateway(ctx, &api.gateway)

pkg/admin/api/grpc/gateway.go

@@ -1,24 +1,19 @@
 package grpc
 
 import (
+	grpc_util "github.com/caos/zitadel/internal/api/grpc"
 	"github.com/caos/zitadel/internal/api/grpc/server"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"strings"
 )
 
-type GatewayConfig struct {
-	Port          string
-	GRPCEndpoint  string
-	CustomHeaders []string
-}
-
 type Gateway struct {
 	grpcEndpoint string
 	port         string
 	cutomHeaders []string
 }
 
-func StartGateway(conf GatewayConfig) *Gateway {
+func StartGateway(conf *grpc_util.GatewayConfig) *Gateway {
 	return &Gateway{
 		grpcEndpoint: conf.GRPCEndpoint,
 		port:         conf.Port,

pkg/admin/api/grpc/server.go

@@ -1,9 +1,11 @@
 package grpc
 
 import (
-	"github.com/caos/zitadel/internal/api/grpc/server/middleware"
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	"google.golang.org/grpc"
+
+	grpc_util "github.com/caos/zitadel/internal/api/grpc"
+	"github.com/caos/zitadel/internal/api/grpc/server/middleware"
 )
 
 var _ AdminServiceServer = (*Server)(nil)
@@ -18,10 +20,9 @@ type Server struct {
 	searchLimit int
 }
 
-func StartServer(conf Config) *Server {
+func StartServer(conf *grpc_util.ServerConfig) *Server {
 	return &Server{
-		port:        conf.Port,
-		searchLimit: conf.SearchLimit,
+		port: conf.Port,
 	}
 }