go/go-micro
1
0
Fork 0
mirror of https://github.com/go-micro/go-micro.git synced 2024-11-24 08:02:32 +02:00
Code Issues Releases Activity

Support for -micro_out=module=<module_prefix> for protoc-gen-micro (#2435)

Browse Source
This commit is contained in:
Chris Moran 2022-02-23 00:14:50 -05:00 committed by GitHub
parent d47c2d984b
commit 69b4b5d1c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cmd/protoc-gen-micro/generator/generator.go
View File

@ -305,7 +305,7 @@ func (d *FileDescriptor) goPackageOption() (impPath GoImportPath, pkg GoPackageN
}
// goFileName returns the output name for the generated Go file.
func (d *FileDescriptor) goFileName(pathType pathType) string {
func (d *FileDescriptor) goFileName(pathType pathType, moduleRoot string) string {
name := *d.Name
if ext := path.Ext(name); ext == ".proto" || ext == ".protodevel" {
name = name[:len(name)-len(ext)]
@ -319,9 +319,18 @@ func (d *FileDescriptor) goFileName(pathType pathType) string {
// Does the file have a "go_package" option?
// If it does, it may override the filename.
if impPath, _, ok := d.goPackageOption(); ok && impPath != "" {
if pathType == pathModuleRoot && moduleRoot != "" {
root := moduleRoot
if !strings.HasSuffix(root, "/") {
root = root + "/"
}
name = strings.TrimPrefix(name, root)
} else {
// Replace the existing dirname with the declared import path.
_, name = path.Split(name)
name = path.Join(string(impPath), name)
}
return name
}
@ -405,6 +414,7 @@ type Generator struct {
PackageImportPath string // Go import path of the package we're generating code for
ImportPrefix string // String to prefix to imported package file names.
ImportMap map[string]string // Mapping from .proto file name to import path
ModuleRoot string // Mapping from the module prefix
Pkg map[string]string // The names under which we import support packages
@ -429,6 +439,7 @@ type pathType int
const (
pathTypeImport pathType = iota
pathTypeSourceRelative
pathModuleRoot
)
// New creates a new generator and allocates the request and response protobufs.
@ -475,11 +486,20 @@ func (g *Generator) CommandLineParameters(parameter string) {
g.ImportPrefix = v
case "import_path":
g.PackageImportPath = v
case "module":
if g.pathType == pathTypeSourceRelative {
g.Fail(fmt.Sprintf(`Cannot set module=%q after paths=source_relative`, v))
}
g.pathType = pathModuleRoot
g.ModuleRoot = v
case "paths":
switch v {
case "import":
g.pathType = pathTypeImport
case "source_relative":
if g.pathType == pathModuleRoot {
g.Fail("Cannot set paths=source_relative after setting module=<module_root>")
}
g.pathType = pathTypeSourceRelative
default:
g.Fail(fmt.Sprintf(`Unknown path type %q: want "import" or "source_relative".`, v))
@ -1069,7 +1089,7 @@ func (g *Generator) GenerateAllFiles() {
if !g.writeOutput {
continue
}
fname := file.goFileName(g.pathType)
fname := file.goFileName(g.pathType, g.ModuleRoot)
g.Response.File = append(g.Response.File, &plugin.CodeGeneratorResponse_File{
Name: proto.String(fname),
Content: proto.String(g.String()),