From 6152d866d6e426e4a4ad789a352fffb0ff1f9ca1 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Wed, 18 Oct 2023 01:01:30 +0300 Subject: [PATCH] error generate in standalone mode Signed-off-by: Vasiliy Tolstov --- main.go | 8 +++----- util.go | 11 ++++++++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/main.go b/main.go index bca7cf4..71a52f0 100644 --- a/main.go +++ b/main.go @@ -90,6 +90,9 @@ func (g *Generator) Generate(plugin *protogen.Plugin) error { continue case "micro": err = g.microGenerate(component, plugin, genClient, genServer) + if err == nil { + err = g.writeErrors(plugin) + } case "http": err = g.httpGenerate(component, plugin, genClient, genServer) case "grpc", "drpc", "rpc": @@ -113,11 +116,6 @@ func (g *Generator) Generate(plugin *protogen.Plugin) error { } - if err = g.writeErrors(plugin); err != nil { - plugin.Error(err) - return err - } - if err = g.astGenerate(plugin); err != nil { plugin.Error(err) return err diff --git a/util.go b/util.go index a684bd2..52e358c 100644 --- a/util.go +++ b/util.go @@ -975,8 +975,10 @@ func (g *Generator) writeErrors(plugin *protogen.Plugin) error { } var gfile *protogen.GeneratedFile + var importPath protogen.GoImportPath + if len(errorsMap) > 0 { - gfile = plugin.NewGeneratedFile("micro_errors.pb.go", ".") + var packageName string for _, file := range plugin.Files { @@ -987,9 +989,16 @@ func (g *Generator) writeErrors(plugin *protogen.Plugin) error { continue } packageName = string(file.GoPackageName) + importPath = file.GoImportPath break } + if g.standalone { + importPath = "." + } + + gfile = plugin.NewGeneratedFile("micro_errors.pb.go", importPath) + gfile.P("// Code generated by protoc-gen-go-micro. DO NOT EDIT.") gfile.P("// protoc-gen-go-micro version: " + versionComment) gfile.P()