Skip to content

Commit aa697b0

Browse files
Remove local copy of google.rpc.Status proto (google#392)
1 parent 546108d commit aa697b0

File tree

8 files changed

+23
-24
lines changed

8 files changed

+23
-24
lines changed

BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ go_library(
1616
importpath = "cel.dev/expr",
1717
visibility = ["//visibility:public"],
1818
deps = [
19-
"//proto/cel/expr:google_rpc_status_go_proto",
19+
"@org_golang_google_genproto_googleapis_rpc//status:go_default_library",
2020
"@org_golang_google_protobuf//reflect/protoreflect",
2121
"@org_golang_google_protobuf//runtime/protoimpl",
2222
"@org_golang_google_protobuf//types/known/anypb",

WORKSPACE

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ http_archive(
2727
],
2828
)
2929

30-
# googleapis as of 05/26/2023
30+
# googleapis as of 09/16/2024
3131
http_archive(
3232
name = "com_google_googleapis",
33-
strip_prefix = "googleapis-07c27163ac591955d736f3057b1619ece66f5b99",
34-
sha256 = "bd8e735d881fb829751ecb1a77038dda4a8d274c45490cb9fcf004583ee10571",
33+
strip_prefix = "googleapis-4082d5e51e8481f6ccc384cacd896f4e78f19dee",
34+
sha256 = "57319889d47578b3c89bf1b3f34888d796a8913d63b32d750a4cd12ed303c4e8",
3535
urls = [
36-
"https://github.com/googleapis/googleapis/archive/07c27163ac591955d736f3057b1619ece66f5b99.tar.gz",
36+
"https://github.com/googleapis/googleapis/archive/4082d5e51e8481f6ccc384cacd896f4e78f19dee.tar.gz",
3737
],
3838
)
3939

@@ -95,22 +95,22 @@ switched_rules_by_language(
9595
# Do *not* call *_dependencies(), etc, yet. See comment at the end.
9696

9797
# Generated Google APIs protos for Golang
98-
# Generated Google APIs protos for Golang 05/25/2023
98+
# Generated Google APIs protos for Golang 08/26/2024
9999
go_repository(
100100
name = "org_golang_google_genproto_googleapis_api",
101101
build_file_proto_mode = "disable_global",
102102
importpath = "google.golang.org/genproto/googleapis/api",
103-
sum = "h1:m8v1xLLLzMe1m5P+gCTF8nJB9epwZQUBERm20Oy1poQ=",
104-
version = "v0.0.0-20230525234035-dd9d682886f9",
103+
sum = "h1:YcyjlL1PRr2Q17/I0dPk2JmYS5CDXfcdb2Z3YRioEbw=",
104+
version = "v0.0.0-20240826202546-f6391c0de4c7",
105105
)
106106

107-
# Generated Google APIs protos for Golang 05/25/2023
107+
# Generated Google APIs protos for Golang 08/26/2024
108108
go_repository(
109109
name = "org_golang_google_genproto_googleapis_rpc",
110110
build_file_proto_mode = "disable_global",
111111
importpath = "google.golang.org/genproto/googleapis/rpc",
112-
sum = "h1:0nDDozoAU19Qb2HwhXadU8OcsiO/09cnTqhUtq2MEOM=",
113-
version = "v0.0.0-20230525234030-28d5490b6b19",
112+
sum = "h1:2035KHhUv+EpyB+hWgJnaWKJOdX1E95w2S8Rr4uWKTs=",
113+
version = "v0.0.0-20240826202546-f6391c0de4c7",
114114
)
115115

116116
# gRPC deps

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module cel.dev/expr
22

3-
go 1.18
3+
go 1.21.1
4+
5+
toolchain go1.23.0
46

57
require (
68
github.com/bazelbuild/rules_go v0.49.0

go.sum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
github.com/bazelbuild/rules_go v0.49.0 h1:5vCbuvy8Q11g41lseGJDc5vxhDjJtfxr6nM/IC4VmqM=
22
github.com/bazelbuild/rules_go v0.49.0/go.mod h1:Dhcz716Kqg1RHNWos+N6MlXNkjNP2EwZQ0LukRKJfMs=
33
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
4+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
45
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
56
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
67
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=

proto/cel/expr/BUILD.bazel

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,18 +124,12 @@ java_proto_library(
124124

125125
load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
126126

127-
go_proto_library(
128-
name = "google_rpc_status_go_proto",
129-
importpath = "google.golang.org/genproto/googleapis/rpc/status",
130-
protos = ["@com_google_googleapis//google/rpc:status_proto"],
131-
)
132-
133127
go_proto_library(
134128
name = "expr_go_proto",
135129
importpath = "cel.dev/expr",
136130
protos = [":expr_proto"],
137131
deps = [
138-
":google_rpc_status_go_proto",
132+
"@org_golang_google_genproto_googleapis_rpc//status:go_default_library",
139133
],
140134
)
141135

@@ -164,7 +158,7 @@ go_proto_library(
164158
importpath = "cel.dev/expr",
165159
protos = [":eval_proto"],
166160
deps = [
167-
":google_rpc_status_go_proto",
161+
"@org_golang_google_genproto_googleapis_rpc//status:go_default_library",
168162
],
169163
)
170164

proto/cel/expr/conformance/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ go_proto_library(
8585
protos = [":conformance_proto"],
8686
deps = [
8787
"//proto/cel/expr:expr_go_proto",
88-
"//proto/cel/expr:google_rpc_status_go_proto",
88+
"@org_golang_google_genproto_googleapis_rpc//status:go_default_library",
8989
],
9090
)
9191

@@ -95,7 +95,7 @@ go_proto_library(
9595
protos = [":conformance_service_proto"],
9696
deps = [
9797
"//proto/cel/expr:expr_go_proto",
98-
"//proto/cel/expr:google_rpc_status_go_proto",
98+
"@org_golang_google_genproto_googleapis_rpc//status:go_default_library",
9999
],
100100
)
101101

tests/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module cel.dev/expr/tests
22

3-
go 1.18
3+
go 1.21.1
44

55
require (
6-
cel.dev/expr v0.16.0
6+
cel.dev/expr v0.16.1
77
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7
88
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7
99
google.golang.org/grpc v1.65.0

tests/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
github.com/bazelbuild/rules_go v0.49.0 h1:5vCbuvy8Q11g41lseGJDc5vxhDjJtfxr6nM/IC4VmqM=
2+
github.com/bazelbuild/rules_go v0.49.0/go.mod h1:Dhcz716Kqg1RHNWos+N6MlXNkjNP2EwZQ0LukRKJfMs=
23
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
4+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
35
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
46
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
57
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=

0 commit comments

Comments
 (0)