From f5af4461ad812bf3d4db2f83a84fdece000270e9 Mon Sep 17 00:00:00 2001 From: Livio Amstutz Date: Fri, 27 Mar 2020 13:57:16 +0100 Subject: [PATCH] remove pointers on configs --- cmd/zitadel/main.go | 12 ++++++------ internal/api/grpc/config.go | 8 ++++---- pkg/admin/admin.go | 2 +- pkg/auth/auth.go | 2 +- pkg/console/console.go | 2 +- pkg/login/login.go | 6 +++--- pkg/management/api/config.go | 2 +- pkg/management/management.go | 6 +++--- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/cmd/zitadel/main.go b/cmd/zitadel/main.go index e56940361d..5d0b1e6a9c 100644 --- a/cmd/zitadel/main.go +++ b/cmd/zitadel/main.go @@ -16,15 +16,15 @@ import ( ) type Config struct { - Mgmt *management.Config - Auth *auth.Config - Login *login.Config - Admin *admin.Config - Console *console.Config + Mgmt management.Config + Auth auth.Config + Login login.Config + Admin admin.Config + Console console.Config //Log //TODO: add //Tracing tracing.TracingConfig //TODO: add - AuthZ *authz.Config + AuthZ authz.Config } func main() { diff --git a/internal/api/grpc/config.go b/internal/api/grpc/config.go index 1b3179d5a5..03b743fdc1 100644 --- a/internal/api/grpc/config.go +++ b/internal/api/grpc/config.go @@ -6,14 +6,14 @@ type Config struct { CustomHeaders []string } -func (c *Config) ToServerConfig() *ServerConfig { - return &ServerConfig{ +func (c Config) ToServerConfig() ServerConfig { + return ServerConfig{ Port: c.ServerPort, } } -func (c *Config) ToGatewayConfig() *GatewayConfig { - return &GatewayConfig{ +func (c Config) ToGatewayConfig() GatewayConfig { + return GatewayConfig{ Port: c.GatewayPort, GRPCEndpoint: c.ServerPort, CustomHeaders: c.CustomHeaders, diff --git a/pkg/admin/admin.go b/pkg/admin/admin.go index 968bb7fa75..bdf9010253 100644 --- a/pkg/admin/admin.go +++ b/pkg/admin/admin.go @@ -14,6 +14,6 @@ type Config struct { API *api.Config } -func Start(ctx context.Context, config *Config, authZ *auth.Config) error { +func Start(ctx context.Context, config Config, authZ auth.Config) error { return errors.ThrowUnimplemented(nil, "ADMIN-n8vw5", "not implemented yet") //TODO: implement } diff --git a/pkg/auth/auth.go b/pkg/auth/auth.go index 21f3229f67..43527dc43b 100644 --- a/pkg/auth/auth.go +++ b/pkg/auth/auth.go @@ -14,6 +14,6 @@ type Config struct { API *api.Config } -func Start(ctx context.Context, config *Config, authZ *auth.Config) error { +func Start(ctx context.Context, config Config, authZ auth.Config) error { return errors.ThrowUnimplemented(nil, "AUTH-l7Hdx", "not implemented yet") //TODO: implement } diff --git a/pkg/console/console.go b/pkg/console/console.go index 8a17d33c2f..663a1197a7 100644 --- a/pkg/console/console.go +++ b/pkg/console/console.go @@ -11,6 +11,6 @@ type Config struct { StaticDir string } -func Start(ctx context.Context, config *Config) error { +func Start(ctx context.Context, config Config) error { return errors.ThrowUnimplemented(nil, "CONSO-4cT5D", "not implemented yet") //TODO: implement } diff --git a/pkg/login/login.go b/pkg/login/login.go index 8a593092a3..462ba37aa1 100644 --- a/pkg/login/login.go +++ b/pkg/login/login.go @@ -9,10 +9,10 @@ import ( ) type Config struct { - App *app.Config - API *api.Config + App app.Config + API api.Config } -func Start(ctx context.Context, config *Config) error { +func Start(ctx context.Context, config Config) error { return errors.ThrowUnimplemented(nil, "LOGIN-3fwvD", "not implemented yet") //TODO: implement } diff --git a/pkg/management/api/config.go b/pkg/management/api/config.go index b63086cc83..8fce0aca62 100644 --- a/pkg/management/api/config.go +++ b/pkg/management/api/config.go @@ -3,5 +3,5 @@ package api import "github.com/caos/zitadel/internal/api/grpc" type Config struct { - GRPC *grpc.Config + GRPC grpc.Config } diff --git a/pkg/management/management.go b/pkg/management/management.go index 2ba24ff227..9f6af48229 100644 --- a/pkg/management/management.go +++ b/pkg/management/management.go @@ -10,10 +10,10 @@ import ( ) type Config struct { - App *app.Config - API *api.Config + App app.Config + API api.Config } -func Start(ctx context.Context, config *Config, authZ *auth.Config) error { +func Start(ctx context.Context, config Config, authZ auth.Config) error { return errors.ThrowUnimplemented(nil, "MANAG-h3k3x", "not implemented yet") //TODO: implement }