Updates to the Bazel WORKSPACE to support granular go-genproto targets (

#287) Updates to the Bazel WORKSPACE to support more granular go-genproto build targets
google · May 30, 2023 · 51af45e · 51af45e
1 parent c8bbae9
commit 51af45e
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 18 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -37,12 +37,13 @@ http_archive(
     ],
 )
 
+# googleapis as of 05/26/2023
 http_archive(
     name = "com_google_googleapis",
-    sha256 = "1f742f6cafe616fe73302db010e0b7ee6579cb1ce06010427b7d0995cbd80ce4",
-    strip_prefix = "googleapis-6a813acf535e4746fa4a135ce23547bb6425c26d",
+    strip_prefix = "googleapis-07c27163ac591955d736f3057b1619ece66f5b99",
+    sha256 = "bd8e735d881fb829751ecb1a77038dda4a8d274c45490cb9fcf004583ee10571",
     urls = [
-        "https://github.com/googleapis/googleapis/archive/6a813acf535e4746fa4a135ce23547bb6425c26d.tar.gz",
+        "https://github.com/googleapis/googleapis/archive/07c27163ac591955d736f3057b1619ece66f5b99.tar.gz",
     ],
 )
 
@@ -104,11 +105,22 @@ switched_rules_by_language(
 # Do *not* call *_dependencies(), etc, yet.  See comment at the end.
 
 # Generated Google APIs protos for Golang
+# Generated Google APIs protos for Golang 05/25/2023
 go_repository(
-  name = "org_golang_google_genproto",
-  build_file_proto_mode = "disable_global",
-  commit = "69f6226f97e558dbaa68715071622af0d86b3a17",
-  importpath = "google.golang.org/genproto",
+    name = "org_golang_google_genproto_googleapis_api",
+    build_file_proto_mode = "disable_global",
+    importpath = "google.golang.org/genproto/googleapis/api",
+    sum = "h1:m8v1xLLLzMe1m5P+gCTF8nJB9epwZQUBERm20Oy1poQ=",
+    version = "v0.0.0-20230525234035-dd9d682886f9",
+)
+
+# Generated Google APIs protos for Golang 05/25/2023
+go_repository(
+    name = "org_golang_google_genproto_googleapis_rpc",
+    build_file_proto_mode = "disable_global",
+    importpath = "google.golang.org/genproto/googleapis/rpc",
+    sum = "h1:0nDDozoAU19Qb2HwhXadU8OcsiO/09cnTqhUtq2MEOM=",
+    version = "v0.0.0-20230525234030-28d5490b6b19",
 )
 
 # gRPC deps

diff --git a/proto/test/v1/BUILD.bazel b/proto/test/v1/BUILD.bazel
@@ -42,6 +42,6 @@ go_proto_library(
     ],
     importpath = "github.com/google/cel-spec/proto/test/v1/testpb",
     deps = [
-        "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
+        "@org_golang_google_genproto_googleapis_api//expr/v1alpha1:go_default_library",
     ],
 )
diff --git a/tests/envcheck/BUILD.bazel b/tests/envcheck/BUILD.bazel
@@ -17,9 +17,9 @@ go_library(
     deps = [
         "//tools/celrpc:go_default_library",
         "@com_github_golang_protobuf//proto:go_default_library",
-        "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-        "@org_golang_google_genproto//googleapis/api/expr/conformance/v1alpha1:go_default_library",
-        "@org_golang_google_genproto//googleapis/rpc/status:go_default_library",
+        "@org_golang_google_genproto_googleapis_api//expr/v1alpha1:go_default_library",
+        "@org_golang_google_genproto_googleapis_api//expr/conformance/v1alpha1:go_default_library",
+        "@org_golang_google_genproto_googleapis_rpc//status:go_default_library",
         "@org_golang_google_grpc//codes:go_default_library",
         "@org_golang_google_grpc//status:go_default_library",
         "@org_golang_google_protobuf//proto:go_default_library",

diff --git a/tests/simple/BUILD.bazel b/tests/simple/BUILD.bazel
@@ -18,8 +18,8 @@ go_library(
         "//proto/test/v1:testpb_go_proto",
         "//tools/celrpc:go_default_library",
         "@org_golang_google_protobuf//encoding/prototext:go_default_library",
-        "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-        "@org_golang_google_genproto//googleapis/api/expr/conformance/v1alpha1:go_default_library",
+        "@org_golang_google_genproto_googleapis_api//expr/v1alpha1:go_default_library",
+        "@org_golang_google_genproto_googleapis_api//expr/conformance/v1alpha1:go_default_library",
     ],
 )
 
@@ -37,7 +37,7 @@ go_test(
         "@org_golang_google_protobuf//encoding/prototext:go_default_library",
         "@org_golang_google_protobuf//types/known/anypb:go_default_library",
         "@org_golang_google_protobuf//types/known/structpb:go_default_library",
-        "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
+        "@org_golang_google_genproto_googleapis_api//expr/v1alpha1:go_default_library",
         "//proto/test/v1:testpb_go_proto",
         "//proto/test/v1/proto2:test_all_types_go_proto",
         "//proto/test/v1/proto3:test_all_types_go_proto",

diff --git a/tools/celrpc/BUILD.bazel b/tools/celrpc/BUILD.bazel
@@ -11,7 +11,7 @@ go_library(
     ],
     importpath = "github.com/google/cel-spec/tools/celrpc",
     deps = [
-        "@org_golang_google_genproto//googleapis/api/expr/conformance/v1alpha1:go_default_library",
+        "@org_golang_google_genproto_googleapis_api//expr/conformance/v1alpha1:go_default_library",
         "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_grpc//reflection:go_default_library",
         "@org_golang_google_protobuf//encoding/protojson:go_default_library",

diff --git a/tools/celrpc/testpipeimpl/main/BUILD.bazel b/tools/celrpc/testpipeimpl/main/BUILD.bazel
@@ -10,11 +10,11 @@ go_binary(
     name="main",
     srcs = ["main.go"],
     deps = [
-        "@org_golang_google_genproto//googleapis/api/expr/conformance/v1alpha1:go_default_library",
         "@org_golang_google_protobuf//encoding/protojson:go_default_library",
         "@org_golang_google_protobuf//proto:go_default_library",
-        "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library",
-        "@org_golang_google_genproto//googleapis/rpc/status:go_default_library", 
+        "@org_golang_google_genproto_googleapis_api//expr/v1alpha1:go_default_library",
+        "@org_golang_google_genproto_googleapis_api//expr/conformance/v1alpha1:go_default_library",
+        "@org_golang_google_genproto_googleapis_rpc//status:go_default_library", 
         "@org_golang_google_grpc//codes:go_default_library"  
     ]
 )