From b0919678b37bf9981f81a702ebadc54398b6fb49 Mon Sep 17 00:00:00 2001 From: OurebiKitsu <142702918+OurebiKitsu@users.noreply.github.com> Date: Sun, 17 Sep 2023 00:30:03 +0000 Subject: [PATCH] fix: improve error messages when parsing config in jsonv5 --- infra/conf/v5cfg/root.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/infra/conf/v5cfg/root.go b/infra/conf/v5cfg/root.go index ae05f925e..d70c9af97 100644 --- a/infra/conf/v5cfg/root.go +++ b/infra/conf/v5cfg/root.go @@ -3,6 +3,7 @@ package v5cfg import ( "context" "encoding/json" + "fmt" "github.com/golang/protobuf/proto" "google.golang.org/protobuf/types/known/anypb" @@ -30,7 +31,7 @@ func (c RootConfig) BuildV5(ctx context.Context) (proto.Message, error) { if c.LogConfig != nil { logConfMsgUnpacked, err := loadHeterogeneousConfigFromRawJSON("service", "log", c.LogConfig) if err != nil { - return nil, err + return nil, newError("failed to parse Log config").Base(err) } logConfMsg = serial.ToTypedMessage(logConfMsgUnpacked) } else { @@ -43,7 +44,7 @@ func (c RootConfig) BuildV5(ctx context.Context) (proto.Message, error) { if c.RouterConfig != nil { routerConfig, err := loadHeterogeneousConfigFromRawJSON("service", "router", c.RouterConfig) if err != nil { - return nil, err + return nil, newError("failed to parse Router config").Base(err) } config.App = append(config.App, serial.ToTypedMessage(routerConfig)) } @@ -75,7 +76,7 @@ func (c RootConfig) BuildV5(ctx context.Context) (proto.Message, error) { for serviceName, service := range c.Services { servicePackedConfig, err := loadHeterogeneousConfigFromRawJSON("service", serviceName, service) if err != nil { - return nil, err + return nil, newError(fmt.Sprintf("failed to parse %v config in Services", serviceName)).Base(err) } config.App = append(config.App, serial.ToTypedMessage(servicePackedConfig)) }