gogo provided via bazel works for some targets. Need to mass replace to fully address

Signed-off-by: Dom Del Nano <ddelnano@gmail.com>

Author: ddelnano

bazel/external/rules_go.patch

@@ -11,3 +11,20 @@ index abacbc80..09b2c9bf 100644
      ]
      env.update({
          "CGO_ENABLED": "1",
+diff --git a/proto/gogo.bzl b/proto/gogo.bzl
+index 05a8f044..374e7295 100644
+--- a/proto/gogo.bzl
++++ b/proto/gogo.bzl
+@@ -17,9 +17,9 @@ def _gogo_special_proto_impl(ctx):
+     ctx.file("BUILD.bazel", "")
+     ctx.symlink(
+         ctx.path(Label("@com_github_gogo_protobuf//gogoproto:gogo.proto")),
+-        "github.com/gogo/protobuf/gogoproto/gogo.proto",
++        "github/gogo/protobuf/gogoproto/gogo.proto",
+     )
+-    ctx.file("github.com/gogo/protobuf/gogoproto/BUILD.bazel", """
++    ctx.file("github/gogo/protobuf/gogoproto/BUILD.bazel", """
+ load("@rules_proto//proto:defs.bzl", "proto_library")
+
+ proto_library(
+

bazel/gogo.bzl

@@ -24,9 +24,9 @@ def _gogo_grpc_proto_impl(ctx):
     ctx.file("BUILD.bazel", "")
     ctx.symlink(
         ctx.path(Label("@com_github_gogo_protobuf//gogoproto:gogo.proto")),
-        "github.com/gogo/protobuf/gogoproto/gogo.proto",
+        "github/gogo/protobuf/gogoproto/gogo.proto",
     )
-    ctx.file("github.com/gogo/protobuf/gogoproto/BUILD.bazel", """
+    ctx.file("github/gogo/protobuf/gogoproto/BUILD.bazel", """
 
 load("@px//bazel:proto_compile.bzl", "pl_proto_library", "pl_cc_proto_library", "pl_py_proto_library")
 

bazel/proto_compile.bzl

@@ -172,6 +172,11 @@ def _colocate_python_files_impl(ctx):
                 dest.path,
             )
             for src, dest in src_dest
+        # ]) + "\n" + "\n".join([
+        #     "sed -i 's|from github.com|from github|g' {}".format(
+        #         dest.path,
+        #     )
+        #     for src, dest in src_dest
         ]),
     )
     ctx.actions.run(

bazel/repositories.bzl

@@ -121,7 +121,7 @@ def _cc_deps():
     # Dependencies with native bazel build files.
 
     _bazel_repo("upb")
-    _bazel_repo("com_google_protobuf", patches = ["//bazel/external:protobuf_gogo_hack.patch", "//bazel/external:protobuf_text_format.patch", "//bazel/external:protobuf_warning.patch"], patch_args = ["-p1"])
+    _bazel_repo("com_google_protobuf", patches = ["//bazel/external:protobuf_text_format.patch", "//bazel/external:protobuf_warning.patch"], patch_args = ["-p1"])
     _bazel_repo("com_github_grpc_grpc", patches = ["//bazel/external:grpc.patch", "//bazel/external:grpc_go_toolchain.patch", "//bazel/external:grpc_test_visibility.patch"], patch_args = ["-p1"])
 
     _bazel_repo("boringssl", patches = ["//bazel/external:boringssl.patch"], patch_args = ["-p0"])

src/api/proto/cloudpb/BUILD.bazel

@@ -26,8 +26,7 @@ pl_proto_library(
         "//src/api/proto/uuidpb:uuid_pl_proto",
         "//src/api/proto/vispb:vis_pl_proto",
         "//src/api/proto/vizierconfigpb:vizier_pl_proto",
-        "@gogo_special_proto//github.com/gogo/protobuf/gogoproto",
-        "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto",
+        "@gogo_grpc_proto//github/gogo/protobuf/gogoproto:gogo_pl_proto",
     ],
 )
 
@@ -59,6 +58,6 @@ pl_py_grpc_library(
         "//src/api/proto/uuidpb:uuid_pl_py_proto",
         "//src/api/proto/vispb:vis_pl_py_proto",
         "//src/api/proto/vizierconfigpb:vizier_pl_py_proto",
-        "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_py_proto",
+        "@gogo_grpc_proto//github/gogo/protobuf/gogoproto:gogo_pl_py_proto",
     ],
 )

src/api/proto/cloudpb/cloudapi.proto

@@ -28,7 +28,7 @@ option go_package = "cloudpb";
 // * Please do not include dependencies that are outside of src/api
 // * and only include protobufs that are useful to external-facing users.
 //
-import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+import "github/gogo/protobuf/gogoproto/gogo.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";

src/api/proto/vispb/BUILD.bazel

@@ -21,7 +21,7 @@ pl_proto_library(
     srcs = ["vis.proto"],
     visibility = ["//src:__subpackages__"],
     deps = [
-        "@gogo_special_proto//github.com/gogo/protobuf/gogoproto",
+        "@gogo_special_proto//github/gogo/protobuf/gogoproto",
     ],
 )
 

src/api/proto/vispb/vis.proto

@@ -27,7 +27,7 @@ import "google/protobuf/wrappers.proto";
 
 // Keep this below the google imports. Apparently protobufjs cli doesn't like
 // it when this is loaded before the google imports. :(
-import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+import "github/gogo/protobuf/gogoproto/gogo.proto";
 
 // PXType represents the data type of an argument that a pxl script can take.
 // For example, with a func like def my_func(arg1: px.Service, arg2: int),

src/api/proto/vizierconfigpb/BUILD.bazel

@@ -21,7 +21,7 @@ pl_proto_library(
     srcs = ["vizier_types.proto"],
     visibility = ["//src:__subpackages__"],
     deps = [
-        "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_proto",
+        "@gogo_grpc_proto//github/gogo/protobuf/gogoproto:gogo_pl_proto",
     ],
 )
 
@@ -30,7 +30,7 @@ pl_cc_proto_library(
     proto = ":vizier_pl_proto",
     visibility = ["//src:__subpackages__"],
     deps = [
-        "@gogo_grpc_proto//github.com/gogo/protobuf/gogoproto:gogo_pl_cc_proto",
+        "@gogo_grpc_proto//github/gogo/protobuf/gogoproto:gogo_pl_cc_proto",
     ],
 )
 

src/api/proto/vizierconfigpb/vizier_types.proto

@@ -22,7 +22,7 @@ package px.vizierconfigpb;
 
 option go_package = "vizierconfigpb";
 
-import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+import "github/gogo/protobuf/gogoproto/gogo.proto";
 import "google/protobuf/wrappers.proto";
 
 // Note: Any changes to this file should be in sync with operatpro/api/v1alpha1/vizier_types.go.