Prefer go_grpc_library

This allows for easier compiler upgrades via rules_go upgrades

cmd/gazelle/integration_test.go

@@ -761,17 +761,16 @@ service TestService {}
 		Content: `
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
-load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@io_bazel_rules_go//proto:def.bzl", "go_grpc_library")
 
 proto_library(
     name = "repo_proto",
     srcs = ["foo.proto"],
     visibility = ["//visibility:public"],
 )
 
-go_proto_library(
+go_grpc_library(
     name = "repo_go_proto",
-    compilers = ["@io_bazel_rules_go//proto:go_grpc"],
     importpath = "example.com/repo",
     proto = ":repo_proto",
     visibility = ["//visibility:public"],
@@ -1790,12 +1789,11 @@ message Bar {};
 			Path: "service/BUILD.bazel",
 			Content: `
 load("@rules_proto//proto:defs.bzl", "proto_library")
-load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@io_bazel_rules_go//proto:def.bzl", "go_grpc_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
-go_proto_library(
+go_grpc_library(
     name = "service_go_proto",
-    compilers = ["@io_bazel_rules_go//proto:go_grpc"],
     importpath = "example.com/repo/service",
     proto = ":service_proto",
     visibility = ["//visibility:public"],
@@ -1867,10 +1865,10 @@ go_library(
 			Path: "service/BUILD.bazel",
 			Content: `
 load("@rules_proto//proto:defs.bzl", "proto_library")
-load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@io_bazel_rules_go//proto:def.bzl", "go_grpc_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
-go_proto_library(
+go_grpc_library(
     name = "service_go_proto",
     compilers = ["//foo"],
     importpath = "example.com/repo/service",

language/go/config.go

@@ -147,8 +147,8 @@ const (
 )
 
 var (
-	defaultGoProtoCompilers = []string{"@io_bazel_rules_go//proto:go_proto"}
-	defaultGoGrpcCompilers  = []string{"@io_bazel_rules_go//proto:go_grpc"}
+	defaultGoProtoCompilers = []string{}
+	defaultGoGrpcCompilers  = []string{}
 )
 
 func (m testMode) String() string {

language/go/constants.go

@@ -31,9 +31,9 @@ const (
 	// mode for libraries that contained .pb.go files and .proto files.
 	legacyProtoFilegroupName = "go_default_library_protos"
 
-	// grpcCompilerLabel is the label for the gRPC compiler plugin, used in the
-	// "compilers" attribute of go_proto_library rules.
-	grpcCompilerLabel = "@io_bazel_rules_go//proto:go_grpc"
+	// oldGrpcCompilerLabel is the label for the old gRPC compiler plugin, used
+	// in the "compilers" attribute of go_proto_library rules.
+	oldGrpcCompilerLabel = "@io_bazel_rules_go//proto:go_grpc"
 
 	// goProtoSuffix is the suffix applied to the labels of all generated
 	// go_proto_library targets.

language/go/fix.go

@@ -171,15 +171,15 @@ func migrateLibraryEmbed(c *config.Config, f *rule.File) {
 	}
 }
 
-// migrateGrpcCompilers converts "go_grpc_library" rules into "go_proto_library"
-// rules with a "compilers" attribute.
+// migrateGrpcCompilers converts "go_proto_library" rules with a "compilers"
+// attribute containing exactly oldGrpcCompilerLabel into "go_grpc_library" rules.
 func migrateGrpcCompilers(c *config.Config, f *rule.File) {
 	for _, r := range f.Rules {
-		if r.Kind() != "go_grpc_library" || r.ShouldKeep() || r.Attr("compilers") != nil {
+		if r.Kind() != "go_proto_library" || r.ShouldKeep() || r.Attr("compilers") == nil || len(r.AttrStrings("compilers")) != 1 || !strListAttrContains(r, "compilers", oldGrpcCompilerLabel) {
 			continue
 		}
-		r.SetKind("go_proto_library")
-		r.SetAttr("compilers", []string{grpcCompilerLabel})
+		r.SetKind("go_grpc_library")
+		r.DelAttr("compilers")
 	}
 }
 

language/go/fix_test.go

@@ -555,7 +555,7 @@ gomock(
 		},
 		// migrateGrpcCompilers tests
 		{
-			desc: "go_grpc_library migrated to compilers",
+			desc: "go_proto_library with grpc compilers migrated to go_grpc_library",
 			old: `load("@io_bazel_rules_go//proto:def.bzl", "go_grpc_library")
 
 proto_library(
@@ -564,8 +564,9 @@ proto_library(
     visibility = ["//visibility:public"],
 )
 
-go_grpc_library(
+go_proto_library(
     name = "foo_go_proto",
+    compilers = ["@io_bazel_rules_go//proto:go_grpc"],
     importpath = "example.com/repo",
     proto = ":foo_proto",
     visibility = ["//visibility:public"],
@@ -579,9 +580,8 @@ proto_library(
     visibility = ["//visibility:public"],
 )
 
-go_proto_library(
+go_grpc_library(
     name = "foo_go_proto",
-    compilers = ["@io_bazel_rules_go//proto:go_grpc"],
     importpath = "example.com/repo",
     proto = ":foo_proto",
     visibility = ["//visibility:public"],

language/go/generate.go

@@ -46,7 +46,7 @@ func (gl *goLang) GenerateRules(args language.GenerateArgs) language.GenerateRes
 	protoPackages := make(map[string]proto.Package)
 	protoFileInfo := make(map[string]proto.FileInfo)
 	for _, r := range args.OtherGen {
-		if r.Kind() == "go_proto_library" {
+		if r.Kind() == "go_proto_library" || r.Kind() == "go_grpc_library" {
 			if proto := r.AttrString("proto"); proto != "" {
 				goProtoRules[proto] = struct{}{}
 			}
@@ -454,14 +454,20 @@ func (g *generator) generateProto(mode proto.Mode, target protoTarget, importPat
 		}
 	}
 
-	goProtoLibrary := rule.NewRule("go_proto_library", goProtoName)
+	var goProtoLibrary *rule.Rule
+	if !target.hasServices {
+		goProtoLibrary = rule.NewRule("go_proto_library", goProtoName)
+		if gc.goProtoCompilersSet {
+			goProtoLibrary.SetAttr("compilers", gc.goProtoCompilers)
+		}
+	} else {
+		goProtoLibrary = rule.NewRule("go_grpc_library", goProtoName)
+		if gc.goGrpcCompilersSet {
+			goProtoLibrary.SetAttr("compilers", gc.goGrpcCompilers)
+		}
+	}
 	goProtoLibrary.SetAttr("proto", ":"+protoName)
 	g.setImportAttrs(goProtoLibrary, importPath)
-	if target.hasServices {
-		goProtoLibrary.SetAttr("compilers", gc.goGrpcCompilers)
-	} else if gc.goProtoCompilersSet {
-		goProtoLibrary.SetAttr("compilers", gc.goProtoCompilers)
-	}
 	if g.shouldSetVisibility {
 		goProtoLibrary.SetAttr("visibility", visibility)
 	}

language/go/resolve.go

@@ -73,6 +73,8 @@ func (gl *goLang) Resolve(c *config.Config, ix *resolve.RuleIndex, rc *repo.Remo
 	switch r.Kind() {
 	case "go_proto_library":
 		resolve = resolveProto
+	case "go_grpc_library":
+		resolve = resolveProto
 	default:
 		resolve = ResolveGo
 	}
@@ -95,7 +97,7 @@ func (gl *goLang) Resolve(c *config.Config, ix *resolve.RuleIndex, rc *repo.Remo
 		log.Print(err)
 	}
 	if !deps.IsEmpty() {
-		if r.Kind() == "go_proto_library" {
+		if isGoProtoLibrary(r.Kind()) {
 			// protos may import the same library multiple times by different names,
 			// so we need to de-duplicate them. Protos are not platform-specific,
 			// so it's safe to just flatten them.

language/go/testdata/service/BUILD.want

@@ -1,6 +1,6 @@
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
-load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@io_bazel_rules_go//proto:def.bzl", "go_grpc_library")
 
 proto_library(
     name = "service_proto",
@@ -12,13 +12,12 @@ proto_library(
     visibility = ["//visibility:public"],
 )
 
-go_proto_library(
+go_grpc_library(
     name = "service_go_proto",
     _gazelle_imports = [
         "google/protobuf/any.proto",
         "service/sub/sub.proto",
     ],
-    compilers = ["@io_bazel_rules_go//proto:go_grpc"],
     importpath = "example.com/repo/service",
     proto = ":service_proto",
     visibility = ["//visibility:public"],

language/go/testdata/service_gogo/BUILD.want

@@ -1,6 +1,6 @@
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
-load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@io_bazel_rules_go//proto:def.bzl", "go_grpc_library")
 
 proto_library(
     name = "service_gogo_proto",
@@ -12,7 +12,7 @@ proto_library(
     visibility = ["//visibility:public"],
 )
 
-go_proto_library(
+go_grpc_library(
     name = "service_gogo_go_proto",
     _gazelle_imports = [
         "google/protobuf/any.proto",

language/go/testdata/service_gogo_subdir_reset/BUILD.want

@@ -1,6 +1,6 @@
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
-load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@io_bazel_rules_go//proto:def.bzl", "go_grpc_library")
 
 proto_library(
     name = "protos_gogo_proto",
@@ -9,7 +9,7 @@ proto_library(
     visibility = ["//visibility:public"],
 )
 
-go_proto_library(
+go_grpc_library(
     name = "protos_gogo_go_proto",
     _gazelle_imports = [],
     compilers = [

language/go/testdata/service_gogo_subdir_reset/sub/BUILD.want

@@ -1,6 +1,6 @@
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
-load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@io_bazel_rules_go//proto:def.bzl", "go_grpc_library")
 
 proto_library(
     name = "protos_gogo_proto",
@@ -9,10 +9,9 @@ proto_library(
     visibility = ["//visibility:public"],
 )
 
-go_proto_library(
+go_grpc_library(
     name = "protos_gogo_go_proto",
     _gazelle_imports = [],
-    compilers = ["@io_bazel_rules_go//proto:go_grpc"],
     importpath = "example.com/repo/protos_gogo",
     proto = ":protos_gogo_proto",
     visibility = ["//visibility:public"],