[proto] Allow multiple outputs from a proto compiler - fix import

bazel-contrib · Aug 11, 2023 · 7b9eade · 7b9eade
1 parent 416dca0
commit 7b9eade
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/tests/core/go_proto_library/compilers/BUILD.bazel b/tests/core/go_proto_library/compilers/BUILD.bazel
@@ -9,24 +9,17 @@ load(
 )
 
 go_library(
-    name = "dbenum",
-    srcs = ["dbenums.go"],
+    name = "protoc-gen-dbenum_lib",
+    srcs = [
+        "dbenums.go",
+        "main.go",
+    ],
     importpath = "github.com/bazelbuild/rules_go/tests/core/go_proto_library/compilers",
     visibility = ["//visibility:private"],
     deps = [
         "@com_github_gogo_protobuf//proto",
         "@com_github_gogo_protobuf//protoc-gen-gogo/descriptor",
         "@com_github_gogo_protobuf//protoc-gen-gogo/generator",
-    ],
-)
-
-go_library(
-    name = "protoc-gen-dbenum_lib",
-    srcs = ["main.go"],
-    importpath = "github.com/bazelbuild/rules_go/tests/core/go_proto_library/compilers",
-    visibility = ["//visibility:private"],
-    deps = [
-        "//tests/core/go_proto_library/compilers:dbenum",
         "@com_github_gogo_protobuf//protoc-gen-gogo/plugin",
         "@com_github_gogo_protobuf//vanity",
         "@com_github_gogo_protobuf//vanity/command",

diff --git a/tests/core/go_proto_library/compilers/dbenums.go b/tests/core/go_proto_library/compilers/dbenums.go
@@ -1,4 +1,4 @@
-package dbenum
+package main
 
 import (
 	"bytes"

diff --git a/tests/core/go_proto_library/compilers/main.go b/tests/core/go_proto_library/compilers/main.go
@@ -4,8 +4,6 @@ import (
 	plugin "github.com/gogo/protobuf/protoc-gen-gogo/plugin"
 	"github.com/gogo/protobuf/vanity"
 	"github.com/gogo/protobuf/vanity/command"
-
-	dbenum "github.com/bazelbuild/rules_go/tests/core/go_proto_library/compilers"
 )
 
 func main() {
@@ -21,7 +19,7 @@ func main() {
 
 	baseFiles := req.FileToGenerate
 
-	dbenumGenerator := dbenum.NewGenerator()
+	dbenumGenerator := NewGenerator()
 	req = onlyEnumFiles(req, baseFiles)
 	if len(req.FileToGenerate) > 0 {
 		resp = command.GeneratePlugin(req, dbenumGenerator, "_dbenum.pb.go")
@@ -36,7 +34,7 @@ func onlyEnumFiles(
 	dbEnumFiles := make(map[string]bool)
 	for _, file := range req.GetProtoFile() {
 		for _, enum := range file.EnumType {
-			if dbenum.HasDBEnum(enum.Value) {
+			if HasDBEnum(enum.Value) {
 				dbEnumFiles[*file.Name] = true
 				break
 			}