fix(bazel): upgrade rules_go & gazelle to drop go_googleapis shading (googleapis#1486)

---------

Co-authored-by: Mend Renovate <bot@renovateapp.com>

Author: noahdietz

BUILD

@@ -2,3 +2,19 @@ load("@bazel_gazelle//:def.bzl", "gazelle")
 
 # gazelle:prefix github.com/googleapis/gapic-generator-go
 gazelle(name = "gazelle")
+
+# Note: Direct gazelle to resolve common proto imports to googleapis.
+#
+# gazelle:resolve proto proto google/rpc/code.proto @com_google_googleapis//google/rpc:code_proto
+# gazelle:resolve proto go google/rpc/code.proto  @org_golang_google_genproto_googleapis_rpc//code
+# gazelle:resolve proto proto google/api/annotations.proto @com_google_googleapis//google/api:annotations_proto
+# gazelle:resolve proto go google/api/annotations.proto  @org_golang_google_genproto//googleapis/api/annotations
+# gazelle:resolve proto proto google/longrunning/operations.proto @com_google_googleapis//google/longrunning:operations_proto
+# gazelle:resolve proto go google/longrunning/operations.proto @com_google_googleapis//google/longrunning:longrunning_go_proto
+
+# Note: Direct gazelle to resolve the protobuf-go v1 module to rules_go well
+# known types. This will be removed when we migrate to protobuf-go v2.
+#
+# gazelle:resolve go go github.com/golang/protobuf/protoc-gen-go/plugin @io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto
+# gazelle:resolve go go github.com/golang/protobuf/protoc-gen-go/descriptor @io_bazel_rules_go//proto/wkt:descriptor_go_proto
+# gazelle:resolve go go github.com/golang/protobuf/ptypes/duration @io_bazel_rules_go//proto/wkt:duration_go_proto

Makefile

@@ -32,9 +32,6 @@ update-bazel-repos:
 
 gazelle:
 	bazelisk run //:gazelle
-	sed -i '' "s/extendedops_go_proto/extended_operations_go_proto/g" internal/gengapic/BUILD.bazel
-	sed -i '' "s/@com_github_golang_protobuf\/\/protoc-gen-go\/plugin/@io_bazel_rules_go\/\/proto\/wkt:compiler_plugin_go_proto/g" cmd/protoc-gen-go_gapic/BUILD
-	sed -i '' "s/@com_github_golang_protobuf\/\/protoc-gen-go\/plugin/@io_bazel_rules_go\/\/proto\/wkt:compiler_plugin_go_proto/g" cmd/protoc-gen-go_cli/BUILD.bazel
 
 clean:
 	rm -rf testdata

WORKSPACE

@@ -29,37 +29,32 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 protobuf_deps()
 
 http_archive(
-    # go_googleapis is used instead of com_google_googleapis in order to override
-    # the dependency on github.com/googleapis/googleapis defined by rules_go
-    # that is named go_googleapis. googleapis already has all of the necessary
-    # rules, so using the rules_go patched version isn't necessary and it lags in
-    # freshness which would require dependency overrides anyways.
-    name = "go_googleapis",
+    name = "com_google_googleapis",
     # Use `master` because googleapis isn't semantically versioned and the protos
     # this repo cares about (the annotation definitions) do not have breaking
     # changes, so we can live on HEAD. Pinning to commit is cumbersome to maintain.
     strip_prefix = "googleapis-master",
     urls = ["https://github.com/googleapis/googleapis/archive/master.tar.gz"],
 )
 
-load("@go_googleapis//:repository_rules.bzl", "switched_rules_by_language")
+load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
 switched_rules_by_language(name = "com_google_googleapis_imports", go = True, grpc = True)
 
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "6734a719993b1ba4ebe9806e853864395a8d3968ad27f9dd759c196b3eb3abe8",
+    sha256 = "80a98277ad1311dacd837f9b16db62887702e9f1d1c4c9f796d0121a46c8e184",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.45.1/rules_go-v0.45.1.zip",
-        "https://github.com/bazelbuild/rules_go/releases/download/v0.45.1/rules_go-v0.45.1.zip",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.46.0/rules_go-v0.46.0.zip",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.46.0/rules_go-v0.46.0.zip",
     ],
 )
 
 http_archive(
     name = "bazel_gazelle",
-    sha256 = "b8b6d75de6e4bf7c41b7737b183523085f56283f6db929b86c5e7e1f09cf59c9",
+    sha256 = "75df288c4b31c81eb50f51e2e14f4763cb7548daae126817247064637fd9ea62",
     urls = [
-        "https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/bazel-gazelle/releases/download/v0.31.1/bazel-gazelle-v0.31.1.tar.gz",
-        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.31.1/bazel-gazelle-v0.31.1.tar.gz",
+        "https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/bazel-gazelle/releases/download/v0.36.0/bazel-gazelle-v0.36.0.tar.gz",
+        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.36.0/bazel-gazelle-v0.36.0.tar.gz",
     ],
 )
 

internal/gencli/BUILD.bazel

@@ -18,9 +18,9 @@ go_library(
         "//internal/printer",
         "@com_github_jhump_protoreflect//desc",
         "@com_google_cloud_go_longrunning//autogen/longrunningpb",
-        "@go_googleapis//google/api:annotations_go_proto",
         "@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto",
         "@io_bazel_rules_go//proto/wkt:descriptor_go_proto",
+        "@org_golang_google_genproto_googleapis_api//annotations",
         "@org_golang_google_protobuf//proto",
         "@org_golang_x_text//cases",
         "@org_golang_x_text//language",

internal/gengapic/BUILD.bazel

@@ -37,19 +37,19 @@ go_library(
         "@com_gitlab_golang_commonmark_markdown//:markdown",
         "@com_google_cloud_go_iam//apiv1/iampb",
         "@com_google_cloud_go_longrunning//autogen/longrunningpb",
-        "@go_googleapis//gapic/metadata:metadata_go_proto",
-        "@go_googleapis//google/api:annotations_go_proto",
-        "@go_googleapis//google/api:serviceconfig_go_proto",
-        "@go_googleapis//google/cloud:extended_operations_go_proto",
-        "@go_googleapis//google/cloud/location:location_go_proto",
-        "@go_googleapis//google/rpc:code_go_proto",
         "@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto",
         "@io_bazel_rules_go//proto/wkt:descriptor_go_proto",
+        "@org_golang_google_genproto//googleapis/cloud/extendedops",
+        "@org_golang_google_genproto//googleapis/cloud/location",
+        "@org_golang_google_genproto//googleapis/gapic/metadata",
+        "@org_golang_google_genproto_googleapis_api//annotations",
+        "@org_golang_google_genproto_googleapis_api//serviceconfig",
+        "@org_golang_google_genproto_googleapis_rpc//code",
         "@org_golang_google_protobuf//encoding/protojson",
         "@org_golang_google_protobuf//proto",
         "@org_golang_google_protobuf//reflect/protodesc",
-        "@org_golang_google_protobuf//runtime/protoiface",
         "@org_golang_google_protobuf//reflect/protoreflect",
+        "@org_golang_google_protobuf//runtime/protoiface",
         "@org_golang_google_protobuf//types/descriptorpb",
         "@org_golang_google_protobuf//types/known/anypb",
         "@org_golang_google_protobuf//types/known/durationpb",
@@ -70,6 +70,7 @@ go_test(
         "custom_operation_test.go",
         "doc_file_test.go",
         "example_test.go",
+        "generator_test.go",
         "gengapic_test.go",
         "genrest_test.go",
         "helpers_test.go",
@@ -90,19 +91,20 @@ go_test(
         "//internal/txtdiff",
         "@com_github_google_go_cmp//cmp",
         "@com_google_cloud_go_longrunning//autogen/longrunningpb",
-        "@go_googleapis//gapic/metadata:metadata_go_proto",
-        "@go_googleapis//google/api:annotations_go_proto",
-        "@go_googleapis//google/api:httpbody_go_proto",
-        "@go_googleapis//google/api:serviceconfig_go_proto",
-        "@go_googleapis//google/cloud:extended_operations_go_proto",
-        "@go_googleapis//google/rpc:code_go_proto",
         "@io_bazel_rules_go//proto/wkt:compiler_plugin_go_proto",
         "@io_bazel_rules_go//proto/wkt:descriptor_go_proto",
+        "@org_golang_google_genproto//googleapis/cloud/extendedops",
+        "@org_golang_google_genproto//googleapis/gapic/metadata",
+        "@org_golang_google_genproto_googleapis_api//annotations",
+        "@org_golang_google_genproto_googleapis_api//httpbody",
+        "@org_golang_google_genproto_googleapis_api//serviceconfig",
+        "@org_golang_google_genproto_googleapis_rpc//code",
         "@org_golang_google_protobuf//encoding/protojson",
         "@org_golang_google_protobuf//proto",
         "@org_golang_google_protobuf//reflect/protodesc",
         "@org_golang_google_protobuf//reflect/protoreflect",
         "@org_golang_google_protobuf//runtime/protoiface",
+        "@org_golang_google_protobuf//testing/protocmp",
         "@org_golang_google_protobuf//types/descriptorpb",
         "@org_golang_google_protobuf//types/known/apipb",
         "@org_golang_google_protobuf//types/known/durationpb",

internal/grpc_service_config/BUILD.bazel

@@ -1,15 +1,15 @@
-load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
+load("@rules_proto//proto:defs.bzl", "proto_library")
 
 proto_library(
     name = "grpc_service_config_proto",
     srcs = ["grpc_service_config.proto"],
     visibility = ["//:__subpackages__"],
     deps = [
+        "@com_google_googleapis//google/rpc:code_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:wrappers_proto",
-        "@go_googleapis//google/rpc:code_proto",
     ],
 )
 
@@ -18,7 +18,7 @@ go_proto_library(
     importpath = "github.com/googleapis/gapic-generator-go/internal/grpc_service_config",
     proto = ":grpc_service_config_proto",
     visibility = ["//:__subpackages__"],
-    deps = ["@go_googleapis//google/rpc:code_go_proto"],
+    deps = ["@org_golang_google_genproto_googleapis_rpc//code"],
 )
 
 go_library(
@@ -39,7 +39,7 @@ go_test(
     embed = [":grpc_service_config"],
     deps = [
         "@com_github_google_go_cmp//cmp",
-        "@go_googleapis//google/rpc:code_go_proto",
+        "@org_golang_google_genproto_googleapis_rpc//code",
         "@org_golang_google_protobuf//encoding/protojson",
         "@org_golang_google_protobuf//proto",
         "@org_golang_google_protobuf//types/known/durationpb",

internal/snippets/metadata/BUILD.bazel

@@ -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("@rules_proto//proto:defs.bzl", "proto_library")
 
 proto_library(
     name = "metadata_proto",

repositories.bzl

@@ -118,6 +118,9 @@ def com_googleapis_gapic_generator_go_repositories():
         importpath = "github.com/ghodss/yaml",
         sum = "h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=",
         version = "v1.0.0",
+        build_directives = [
+            "gazelle:resolve go go gopkg.in/yaml.v2 @in_gopkg_yaml_v2//:go_default_library",
+        ],
     )
     go_repository(
         name = "com_github_go_logr_logr",
@@ -213,6 +216,11 @@ def com_googleapis_gapic_generator_go_repositories():
         name = "com_github_googleapis_gax_go_v2",
         importpath = "github.com/googleapis/gax-go/v2",
         sum = "h1:mhN09QQW1jEWeMF74zGR81R30z4VJzjZsfkUhuHF+DA=",
+        build_directives = [
+            "gazelle:resolve go google.golang.org/genproto/googleapis/rpc/errdetails @org_golang_google_genproto_googleapis_rpc//errdetails",
+            "gazelle:resolve proto go google/rpc/code.proto @com_google_googleapis//google/rpc:code_go_proto",
+            "gazelle:resolve proto proto google/rpc/code.proto @com_google_googleapis//google/rpc:code_proto",
+        ],
         version = "v2.12.2",
     )
     go_repository(
@@ -397,6 +405,9 @@ def com_googleapis_gapic_generator_go_repositories():
         importpath = "gitlab.com/golang-commonmark/linkify",
         sum = "h1:oYrL81N608MLZhma3ruL8qTM4xcpYECGut8KSxRY59g=",
         version = "v0.0.0-20191026162114-a0c2df6c8f82",
+        build_directives = [
+            "gazelle:resolve go go golang.org/x/text/unicode/rangetable @org_golang_x_text//unicode/rangetable:go_default_library",
+        ],
     )
     go_repository(
         name = "com_gitlab_golang_commonmark_markdown",