Skip to content

Commit 75e2cdd

Browse files
tbgtbg
committedNov 13, 2024
go.mod: go get google.golang.org/[email protected]
See googleapis/go-genproto#1015. Sadly grpc-gateway is incompatible with this version of `genproto`: ``` ERROR: no such package '@@org_golang_google_genproto//googleapis/api/httpbody': BUILD file not found in directory 'googleapis/api/httpbody' of external repository @@org_golang_google_genproto. Add a BUILD file to a directory to mark it as a package. ERROR: /private/var/tmp/_bazel_tbg/b1346cddcc70d57afdaa90f7f09f9b2c/external/com_github_grpc_ecosystem_grpc_gateway/runtime/BUILD.bazel:5:11: no such package '@@org_golang_google_genproto//googleapis/api/httpbody': BUILD file not found in directory 'googleapis/api/httpbody' of external repository @@org_golang_google_genproto. Add a BUILD file to a directory to mark it as a package. and referenced by '@@com_github_grpc_ecosystem_grpc_gateway//runtime:go_default_library' ``` Since we are on the final `grpc-gateway/v1` version already[^1], we'll have to make the leap to v2 to fix this. [^1]: https://github.com/grpc-ecosystem/grpc-gateway/releases/tag/v1.16.0
1 parent 7bdf6ac commit 75e2cdd

File tree

4 files changed

+7
-49
lines changed

4 files changed

+7
-49
lines changed
 

‎DEPS.bzl

+3-43
Original file line numberDiff line numberDiff line change
@@ -9405,16 +9405,6 @@ def go_deps():
94059405
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/apigeeregistry/com_google_cloud_go_apigeeregistry-v0.6.0.zip",
94069406
],
94079407
)
9408-
go_repository(
9409-
name = "com_google_cloud_go_apikeys",
9410-
build_file_proto_mode = "disable_global",
9411-
importpath = "cloud.google.com/go/apikeys",
9412-
sha256 = "511ba83f3837459a9e553026ecf556ebec9007403054635d90f065f7d735ddbe",
9413-
strip_prefix = "cloud.google.com/go/apikeys@v0.6.0",
9414-
urls = [
9415-
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/apikeys/com_google_cloud_go_apikeys-v0.6.0.zip",
9416-
],
9417-
)
94189408
go_repository(
94199409
name = "com_google_cloud_go_appengine",
94209410
build_file_proto_mode = "disable_global",
@@ -10335,16 +10325,6 @@ def go_deps():
1033510325
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/securitycenter/com_google_cloud_go_securitycenter-v1.19.0.zip",
1033610326
],
1033710327
)
10338-
go_repository(
10339-
name = "com_google_cloud_go_servicecontrol",
10340-
build_file_proto_mode = "disable_global",
10341-
importpath = "cloud.google.com/go/servicecontrol",
10342-
sha256 = "499ce8763d315e0ffdf3705549a507051a27eff9b8dec9debe43bca8d130fabb",
10343-
strip_prefix = "cloud.google.com/go/servicecontrol@v1.11.1",
10344-
urls = [
10345-
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/servicecontrol/com_google_cloud_go_servicecontrol-v1.11.1.zip",
10346-
],
10347-
)
1034810328
go_repository(
1034910329
name = "com_google_cloud_go_servicedirectory",
1035010330
build_file_proto_mode = "disable_global",
@@ -10355,26 +10335,6 @@ def go_deps():
1035510335
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/servicedirectory/com_google_cloud_go_servicedirectory-v1.9.0.zip",
1035610336
],
1035710337
)
10358-
go_repository(
10359-
name = "com_google_cloud_go_servicemanagement",
10360-
build_file_proto_mode = "disable_global",
10361-
importpath = "cloud.google.com/go/servicemanagement",
10362-
sha256 = "2e02a723d1c226c2ecba4e47892b96052efb941be2910fd7afc38197f5bc6083",
10363-
strip_prefix = "cloud.google.com/go/servicemanagement@v1.8.0",
10364-
urls = [
10365-
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/servicemanagement/com_google_cloud_go_servicemanagement-v1.8.0.zip",
10366-
],
10367-
)
10368-
go_repository(
10369-
name = "com_google_cloud_go_serviceusage",
10370-
build_file_proto_mode = "disable_global",
10371-
importpath = "cloud.google.com/go/serviceusage",
10372-
sha256 = "377bad0176bbec558ddb55b1fe10318e2c034c9e87536aba1ba8216b57548f3f",
10373-
strip_prefix = "cloud.google.com/go/serviceusage@v1.6.0",
10374-
urls = [
10375-
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/serviceusage/com_google_cloud_go_serviceusage-v1.6.0.zip",
10376-
],
10377-
)
1037810338
go_repository(
1037910339
name = "com_google_cloud_go_shell",
1038010340
build_file_proto_mode = "disable_global",
@@ -11492,10 +11452,10 @@ def go_deps():
1149211452
name = "org_golang_google_genproto",
1149311453
build_file_proto_mode = "disable_global",
1149411454
importpath = "google.golang.org/genproto",
11495-
sha256 = "28f0317e6948788a33c07698109005675062f0203ed06bc866350a575bc974bf",
11496-
strip_prefix = "google.golang.org/genproto@v0.0.0-20230410155749-daa745c078e1",
11455+
sha256 = "dd3a50a0b27c99b52c9bbcf1ed54529b8d95f97c11d7f50d734a2592f2caa766",
11456+
strip_prefix = "google.golang.org/genproto@v0.0.0-20230526161137-0005af68ea54",
1149711457
urls = [
11498-
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/org_golang_google_genproto-v0.0.0-20230410155749-daa745c078e1.zip",
11458+
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/org_golang_google_genproto-v0.0.0-20230526161137-0005af68ea54.zip",
1149911459
],
1150011460
)
1150111461
go_repository(

‎build/bazelutil/distdir_files.bzl

+1-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ DISTDIR_FILES = {
1010
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/apigateway/com_google_cloud_go_apigateway-v1.5.0.zip": "81f9cf7d46093a4cf3bb6dfb7ea942784295f093261c45698656dd844bdfa163",
1111
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/apigeeconnect/com_google_cloud_go_apigeeconnect-v1.5.0.zip": "a0ae141afd9c762b722778b3508dcc459e18c6890a22586235dafc0f436532a2",
1212
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/apigeeregistry/com_google_cloud_go_apigeeregistry-v0.6.0.zip": "1cf7728c1b8d31247d5c2ec10b4b252d6224e9549c2ee7d2222b482dec8aeba4",
13-
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/apikeys/com_google_cloud_go_apikeys-v0.6.0.zip": "511ba83f3837459a9e553026ecf556ebec9007403054635d90f065f7d735ddbe",
1413
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/appengine/com_google_cloud_go_appengine-v1.7.1.zip": "09f35ee5b9d8782bced76b733c7c3a2a5f3b9e41630236a47854b4a92567e646",
1514
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/area120/com_google_cloud_go_area120-v0.7.1.zip": "7dcfdf365eb9f29fcedf29b8e32f0023b829732869dc7ad9a2cd8450cbdea8df",
1615
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/artifactregistry/com_google_cloud_go_artifactregistry-v1.13.0.zip": "abf73586bdced0f590918b37f19643646c3aa04a651480cbdbfad86171f03d98",
@@ -104,10 +103,7 @@ DISTDIR_FILES = {
104103
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/secretmanager/com_google_cloud_go_secretmanager-v1.10.0.zip": "d24cb4f507e9d531f7d75a4b070bff5f9dc548a2be1591337f4865cd8b084929",
105104
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/security/com_google_cloud_go_security-v1.13.0.zip": "e74202ce5419ed745d1c8089a2e4ffb790c0bc045d4f4ab788129ea0f0f5576d",
106105
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/securitycenter/com_google_cloud_go_securitycenter-v1.19.0.zip": "0f451a28499260a21edf268bb8b657fc55fb81a883ab47fb3d2ca472f8707afd",
107-
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/servicecontrol/com_google_cloud_go_servicecontrol-v1.11.1.zip": "499ce8763d315e0ffdf3705549a507051a27eff9b8dec9debe43bca8d130fabb",
108106
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/servicedirectory/com_google_cloud_go_servicedirectory-v1.9.0.zip": "4705df69c7e353bfa6a03dad8a50dde5066151b82528946b818df40547c79088",
109-
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/servicemanagement/com_google_cloud_go_servicemanagement-v1.8.0.zip": "2e02a723d1c226c2ecba4e47892b96052efb941be2910fd7afc38197f5bc6083",
110-
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/serviceusage/com_google_cloud_go_serviceusage-v1.6.0.zip": "377bad0176bbec558ddb55b1fe10318e2c034c9e87536aba1ba8216b57548f3f",
111107
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/shell/com_google_cloud_go_shell-v1.6.0.zip": "f88e9c2ff25a5ea22d71a1125cc6e756845ec8221c821092d05e67859966ca48",
112108
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/spanner/com_google_cloud_go_spanner-v1.45.0.zip": "e4f3951ea69d07ed383f41579c3a6af8e639558ecfa796421dc6cf3d268118ec",
113109
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/speech/com_google_cloud_go_speech-v1.15.0.zip": "27c7d30f3573b4d14a6096588fef65635bf7df8b98e921e934a0af1c7fcf7771",
@@ -1117,7 +1113,7 @@ DISTDIR_FILES = {
11171113
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/cloud/org_golang_google_cloud-v0.0.0-20151119220103-975617b05ea8.zip": "b1d5595a11b88273665d35d4316edbd4545731c979d046c82844fafef2039c2a",
11181114
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/googleapis/api/org_golang_google_genproto_googleapis_api-v0.0.0-20240903143218-8af14fe29dc1.zip": "7027cd84aeddaa671f408f03bc30373ff6cffad9599a477b79e932fac3a40cd8",
11191115
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/googleapis/rpc/org_golang_google_genproto_googleapis_rpc-v0.0.0-20240903143218-8af14fe29dc1.zip": "0a466f53eacec63d96282ed3dfb2aa5cd26a9b3aa89619262f3a58e7e20ae0ac",
1120-
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/org_golang_google_genproto-v0.0.0-20230410155749-daa745c078e1.zip": "28f0317e6948788a33c07698109005675062f0203ed06bc866350a575bc974bf",
1116+
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/genproto/org_golang_google_genproto-v0.0.0-20230526161137-0005af68ea54.zip": "dd3a50a0b27c99b52c9bbcf1ed54529b8d95f97c11d7f50d734a2592f2caa766",
11211117
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/cmd/protoc-gen-go-grpc/org_golang_google_grpc_cmd_protoc_gen_go_grpc-v1.1.0.zip": "13877d86cbfa30bde4d62fef2bc58dd56377dcb502c16cf78197f6934193009a",
11221118
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/examples/org_golang_google_grpc_examples-v0.0.0-20210324172016-702608ffae4d.zip": "f5cad7b05a93557c91864a02890a35c6bc5c394897222978cff2b880a78f7a11",
11231119
"https://storage.googleapis.com/cockroach-godeps/gomod/google.golang.org/grpc/org_golang_google_grpc-v1.68.0.zip": "02a23b873909d3a7f46b1ab5e822b698aeec0e79538924e5edb21838e7fda562",

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ require (
3838
github.com/google/pprof v0.0.0-20210827144239-02619b876842
3939
github.com/google/uuid v1.6.0 // indirect
4040
google.golang.org/api v0.114.0
41-
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1
41+
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54
4242
google.golang.org/grpc v1.68.0
4343
google.golang.org/protobuf v1.35.1
4444
)

‎go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -3139,6 +3139,8 @@ google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEc
31393139
google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
31403140
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A=
31413141
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
3142+
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 h1:9NWlQfY2ePejTmfwUH1OWwmznFa+0kKcHGPDvcPza9M=
3143+
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54/go.mod h1:zqTuNwFlFRsw5zIts5VnzLQxSRqh+CGOTVMlYbY0Eyk=
31423144
google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
31433145
google.golang.org/grpc v0.0.0-20170208002647-2a6bf6142e96/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
31443146
google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=

0 commit comments

Comments
 (0)