From a3a0b8b165eae71664e84ce5eb4807b92202283c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A3=8E=E6=89=87=E6=BB=91=E7=BF=94=E7=BF=BC?= Date: Tue, 25 Feb 2025 12:40:31 +0000 Subject: [PATCH] Fix test --- infra/vprotogen/main.go | 11 +++++------ main/commands/all/convert/json.go | 6 +++--- main/commands/all/convert/protobuf.go | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/infra/vprotogen/main.go b/infra/vprotogen/main.go index f5a4152a..5cbe3fec 100644 --- a/infra/vprotogen/main.go +++ b/infra/vprotogen/main.go @@ -89,12 +89,11 @@ func whichProtoc(suffix, targetedVersion string) (string, error) { path, err := exec.LookPath(protoc) if err != nil { - errStr := fmt.Sprintf(` -Command "%s" not found. -Make sure that %s is in your system path or current path. -Download %s v%s or later from https://github.com/protocolbuffers/protobuf/releases -`, protoc, protoc, protoc, targetedVersion) - return "", fmt.Errorf(errStr) + return "", fmt.Errorf(` + Command "%s" not found. + Make sure that %s is in your system path or current path. + Download %s v%s or later from https://github.com/protocolbuffers/protobuf/releases + `, protoc, protoc, protoc, targetedVersion) } return path, nil } diff --git a/main/commands/all/convert/json.go b/main/commands/all/convert/json.go index d20634df..58066795 100644 --- a/main/commands/all/convert/json.go +++ b/main/commands/all/convert/json.go @@ -50,17 +50,17 @@ func executeTypedMessageToJson(cmd *base.Command, args []string) { reader, err := confloader.LoadConfig(cmd.Flag.Arg(0)) if err != nil { - base.Fatalf(err.Error()) + base.Fatalf("failed to load config: %s", err) } b, err := io.ReadAll(reader) if err != nil { - base.Fatalf(err.Error()) + base.Fatalf("failed to read config: %s", err) } tm := cserial.TypedMessage{} if err = json.Unmarshal(b, &tm); err != nil { - base.Fatalf(err.Error()) + base.Fatalf("failed to unmarshal config: %s", err) } if j, ok := creflect.MarshalToJson(&tm, injectTypeInfo); ok { diff --git a/main/commands/all/convert/protobuf.go b/main/commands/all/convert/protobuf.go index 17d6feae..c77df963 100644 --- a/main/commands/all/convert/protobuf.go +++ b/main/commands/all/convert/protobuf.go @@ -53,12 +53,12 @@ func executeConvertConfigsToProtobuf(cmd *base.Command, args []string) { } if len(unnamedArgs) < 1 { - base.Fatalf("empty config list") + base.Fatalf("invalid config list length: %d", len(unnamedArgs)) } pbConfig, err := core.LoadConfig("auto", unnamedArgs) if err != nil { - base.Fatalf(err.Error()) + base.Fatalf("failed to load config: %s", err) } if optDump {