From 6548b404d5060761fee39c7492c6fb0fa2048690 Mon Sep 17 00:00:00 2001 From: Tristan Swadell Date: Tue, 30 May 2023 14:09:45 -0700 Subject: [PATCH] Workspace deps (#722) Update WORKSPACE dependencies on cel-spec and go-genproto --- WORKSPACE | 30 ++++++++++++++++++++---------- cel/BUILD.bazel | 4 ++-- cel/cel_test.go | 20 +++++++++++++++++--- checker/BUILD.bazel | 2 +- checker/decls/BUILD.bazel | 2 +- common/BUILD.bazel | 2 +- common/containers/BUILD.bazel | 4 ++-- common/debug/BUILD.bazel | 2 +- common/types/BUILD.bazel | 6 +++--- common/types/pb/BUILD.bazel | 2 +- common/types/ref/BUILD.bazel | 2 +- ext/BUILD.bazel | 4 ++-- interpreter/BUILD.bazel | 4 ++-- parser/BUILD.bazel | 2 +- repl/BUILD.bazel | 4 ++-- repl/appengine/app/BUILD.bazel | 2 +- server/BUILD.bazel | 14 +++++++------- server/go.mod | 3 +-- server/go.sum | 7 +++---- test/BUILD.bazel | 2 +- 20 files changed, 70 insertions(+), 48 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 418bcded..8a993c36 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -30,12 +30,13 @@ http_archive( ], ) -# googleapis as of 10/31/2022 +# googleapis as of 05/26/2023 http_archive( name = "com_google_googleapis", - strip_prefix = "googleapis-d1391580360579c64417bf6d52a17eb30b19b99d", + strip_prefix = "googleapis-07c27163ac591955d736f3057b1619ece66f5b99", + sha256 = "bd8e735d881fb829751ecb1a77038dda4a8d274c45490cb9fcf004583ee10571", urls = [ - "https://github.com/googleapis/googleapis/archive/d1391580360579c64417bf6d52a17eb30b19b99d.tar.gz", + "https://github.com/googleapis/googleapis/archive/07c27163ac591955d736f3057b1619ece66f5b99.tar.gz", ], ) @@ -67,13 +68,22 @@ go_repository( tag = "v1.28.1", ) -# Generated Google APIs protos for Golang 10/27/2022 +# Generated Google APIs protos for Golang 05/25/2023 go_repository( - name = "org_golang_google_genproto", + name = "org_golang_google_genproto_googleapis_api", build_file_proto_mode = "disable_global", - importpath = "google.golang.org/genproto", - sum = "h1:3wPBShTLWQnEkZ9VW/HZZ8zT/9LLtleBtq7l8SKtJIA=", - version = "v0.0.0-20230106154932-a12b697841d9", + 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 for v1.49.0 (including x/text and x/net) @@ -106,11 +116,11 @@ go_repository( version = "v4.0.0-20230305170008-8188dc5388df", ) -# CEL Spec deps v0.7.1 +# CEL Spec deps v0.9.0 go_repository( name = "com_google_cel_spec", - commit = "ebff24990ecc57209ab9f9b28896fd171848274f", importpath = "github.com/google/cel-spec", + commit = "51af45e2b75a8aa2b3108b00f0e91cd172cfbea1", ) # strcase deps diff --git a/cel/BUILD.bazel b/cel/BUILD.bazel index ddddbd28..43313211 100644 --- a/cel/BUILD.bazel +++ b/cel/BUILD.bazel @@ -32,7 +32,7 @@ go_library( "//interpreter:go_default_library", "//interpreter/functions:go_default_library", "//parser: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", "@org_golang_google_protobuf//proto:go_default_library", "@org_golang_google_protobuf//reflect/protodesc:go_default_library", "@org_golang_google_protobuf//reflect/protoreflect:go_default_library", @@ -70,7 +70,7 @@ go_test( "//test/proto2pb:go_default_library", "//test/proto3pb:go_default_library", "@io_bazel_rules_go//proto/wkt:descriptor_go_proto", - "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library", + "@org_golang_google_genproto_googleapis_api//expr/v1alpha1:go_default_library", "@org_golang_google_protobuf//proto:go_default_library", "@org_golang_google_protobuf//types/known/structpb:go_default_library", ], diff --git a/cel/cel_test.go b/cel/cel_test.go index 5ed908fd..11ade5a2 100644 --- a/cel/cel_test.go +++ b/cel/cel_test.go @@ -1205,15 +1205,26 @@ func BenchmarkEvalOptions(b *testing.B) { } func TestEnvExtension(t *testing.T) { - e, _ := NewEnv( + e, err := NewEnv( Container("google.api.expr.v1alpha1"), Types(&exprpb.Expr{}), Variable("expr", ObjectType("google.api.expr.v1alpha1.Expr")), + Variable("m", MapType(TypeParamType("K"), TypeParamType("V"))), + OptionalTypes(), ) - e2, _ := e.Extend( + if err != nil { + t.Fatalf("NewEnv() failed: %v", err) + } + e2, err := e.Extend( CustomTypeAdapter(types.DefaultTypeAdapter), Types(&proto3pb.TestAllTypes{}), + OptionalTypes(), + OptionalTypes(), + OptionalTypes(), ) + if err != nil { + t.Fatalf("env.Extend() failed: %v", err) + } if e == e2 { t.Error("got object equality, wanted separate objects") } @@ -1223,7 +1234,10 @@ func TestEnvExtension(t *testing.T) { if e.TypeProvider() == e2.TypeProvider() { t.Error("got the same type provider, wanted isolated instances.") } - e3, _ := e2.Extend() + e3, err := e2.Extend(OptionalTypes()) + if err != nil { + t.Fatalf("env.Extend() failed: %v", err) + } if e2.TypeAdapter() != e3.TypeAdapter() { t.Error("got different type adapters, wanted immutable adapter reference") } diff --git a/checker/BUILD.bazel b/checker/BUILD.bazel index ac2417b8..1c6ddb7f 100644 --- a/checker/BUILD.bazel +++ b/checker/BUILD.bazel @@ -30,7 +30,7 @@ go_library( "//common/types/pb:go_default_library", "//common/types/ref:go_default_library", "//parser: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", "@org_golang_google_protobuf//proto:go_default_library", "@org_golang_google_protobuf//types/known/emptypb:go_default_library", "@org_golang_google_protobuf//types/known/structpb:go_default_library", diff --git a/checker/decls/BUILD.bazel b/checker/decls/BUILD.bazel index 5a24f1da..9384be45 100644 --- a/checker/decls/BUILD.bazel +++ b/checker/decls/BUILD.bazel @@ -13,7 +13,7 @@ go_library( ], importpath = "github.com/google/cel-go/checker/decls", deps = [ - "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library", + "@org_golang_google_genproto_googleapis_api//expr/v1alpha1:go_default_library", "@org_golang_google_protobuf//types/known/emptypb:go_default_library", "@org_golang_google_protobuf//types/known/structpb:go_default_library", ], diff --git a/common/BUILD.bazel b/common/BUILD.bazel index a0058aeb..d6165b13 100644 --- a/common/BUILD.bazel +++ b/common/BUILD.bazel @@ -17,7 +17,7 @@ go_library( importpath = "github.com/google/cel-go/common", deps = [ "//common/runes: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", "@org_golang_x_text//width:go_default_library", ], ) diff --git a/common/containers/BUILD.bazel b/common/containers/BUILD.bazel index 18142d94..3f3f0788 100644 --- a/common/containers/BUILD.bazel +++ b/common/containers/BUILD.bazel @@ -12,7 +12,7 @@ go_library( ], importpath = "github.com/google/cel-go/common/containers", deps = [ - "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library", + "@org_golang_google_genproto_googleapis_api//expr/v1alpha1:go_default_library", ], ) @@ -26,6 +26,6 @@ go_test( ":go_default_library", ], 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/common/debug/BUILD.bazel b/common/debug/BUILD.bazel index cf5c5d24..1f029839 100644 --- a/common/debug/BUILD.bazel +++ b/common/debug/BUILD.bazel @@ -13,6 +13,6 @@ go_library( importpath = "github.com/google/cel-go/common/debug", deps = [ "//common: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", ], ) diff --git a/common/types/BUILD.bazel b/common/types/BUILD.bazel index f56700de..89c4feac 100644 --- a/common/types/BUILD.bazel +++ b/common/types/BUILD.bazel @@ -39,8 +39,8 @@ go_library( "//common/types/ref:go_default_library", "//common/types/traits:go_default_library", "@com_github_stoewer_go_strcase//: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_rpc//status:go_default_library", "@org_golang_google_protobuf//encoding/protojson:go_default_library", "@org_golang_google_protobuf//proto:go_default_library", "@org_golang_google_protobuf//reflect/protoreflect:go_default_library", @@ -80,7 +80,7 @@ go_test( "//common/types/ref:go_default_library", "//test:go_default_library", "//test/proto3pb:test_all_types_go_proto", - "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library", + "@org_golang_google_genproto_googleapis_api//expr/v1alpha1:go_default_library", "@org_golang_google_protobuf//encoding/protojson:go_default_library", "@org_golang_google_protobuf//types/known/anypb:go_default_library", "@org_golang_google_protobuf//types/known/durationpb:go_default_library", diff --git a/common/types/pb/BUILD.bazel b/common/types/pb/BUILD.bazel index f23ac9c0..e2b9d37b 100644 --- a/common/types/pb/BUILD.bazel +++ b/common/types/pb/BUILD.bazel @@ -17,7 +17,7 @@ go_library( ], importpath = "github.com/google/cel-go/common/types/pb", deps = [ - "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library", + "@org_golang_google_genproto_googleapis_api//expr/v1alpha1:go_default_library", "@org_golang_google_protobuf//encoding/protowire:go_default_library", "@org_golang_google_protobuf//proto:go_default_library", "@org_golang_google_protobuf//reflect/protoreflect:go_default_library", diff --git a/common/types/ref/BUILD.bazel b/common/types/ref/BUILD.bazel index 1d0f4689..79330c33 100644 --- a/common/types/ref/BUILD.bazel +++ b/common/types/ref/BUILD.bazel @@ -13,7 +13,7 @@ go_library( ], importpath = "github.com/google/cel-go/common/types/ref", deps = [ - "@org_golang_google_genproto//googleapis/api/expr/v1alpha1:go_default_library", + "@org_golang_google_genproto_googleapis_api//expr/v1alpha1:go_default_library", "@org_golang_google_protobuf//proto:go_default_library", "@org_golang_google_protobuf//reflect/protoreflect:go_default_library", ], diff --git a/ext/BUILD.bazel b/ext/BUILD.bazel index 7dfbc6f6..4bcf8a28 100644 --- a/ext/BUILD.bazel +++ b/ext/BUILD.bazel @@ -27,7 +27,7 @@ go_library( "//common/types/ref:go_default_library", "//common/types/traits:go_default_library", "//interpreter: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", "@org_golang_google_protobuf//proto:go_default_library", "@org_golang_google_protobuf//reflect/protoreflect:go_default_library", "@org_golang_google_protobuf//types/known/structpb", @@ -60,7 +60,7 @@ go_test( "//test:go_default_library", "//test/proto2pb:go_default_library", "//test/proto3pb: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", "@org_golang_google_protobuf//proto:go_default_library", "@org_golang_google_protobuf//types/known/wrapperspb:go_default_library", "@org_golang_google_protobuf//encoding/protojson:go_default_library", diff --git a/interpreter/BUILD.bazel b/interpreter/BUILD.bazel index 1e50caf0..b6d04e00 100644 --- a/interpreter/BUILD.bazel +++ b/interpreter/BUILD.bazel @@ -32,7 +32,7 @@ go_library( "//common/types/ref:go_default_library", "//common/types/traits:go_default_library", "//interpreter/functions: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", "@org_golang_google_protobuf//proto:go_default_library", "@org_golang_google_protobuf//types/known/durationpb:go_default_library", "@org_golang_google_protobuf//types/known/structpb:go_default_library", @@ -66,7 +66,7 @@ go_test( "//test:go_default_library", "//test/proto2pb:go_default_library", "//test/proto3pb: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", "@org_golang_google_protobuf//proto:go_default_library", "@org_golang_google_protobuf//types/known/anypb:go_default_library", ], diff --git a/parser/BUILD.bazel b/parser/BUILD.bazel index c904ae31..67ecc955 100644 --- a/parser/BUILD.bazel +++ b/parser/BUILD.bazel @@ -24,7 +24,7 @@ go_library( "//common/runes:go_default_library", "//parser/gen:go_default_library", "@com_github_antlr_antlr4_runtime_go_antlr_v4//: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", "@org_golang_google_protobuf//proto:go_default_library", "@org_golang_google_protobuf//types/known/structpb:go_default_library", ], diff --git a/repl/BUILD.bazel b/repl/BUILD.bazel index c52af123..f5c22295 100644 --- a/repl/BUILD.bazel +++ b/repl/BUILD.bazel @@ -37,7 +37,7 @@ go_library( "//interpreter/functions:go_default_library", "//repl/parser:go_default_library", "@com_github_antlr_antlr4_runtime_go_antlr_v4//: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", "@org_golang_google_protobuf//encoding/prototext:go_default_library", "@org_golang_google_protobuf//proto:go_default_library", "@org_golang_google_protobuf//types/descriptorpb:go_default_library", @@ -57,7 +57,7 @@ go_test( deps = [ "//cel:go_default_library", "//test/proto2pb: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", "@org_golang_google_protobuf//proto:go_default_library", ], ) diff --git a/repl/appengine/app/BUILD.bazel b/repl/appengine/app/BUILD.bazel index 27144582..fc96a4f8 100644 --- a/repl/appengine/app/BUILD.bazel +++ b/repl/appengine/app/BUILD.bazel @@ -39,7 +39,7 @@ go_test( deps = [ "//cel:go_default_library", "//test/proto2pb: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", "@org_golang_google_protobuf//proto:go_default_library", ], ) diff --git a/server/BUILD.bazel b/server/BUILD.bazel index e009d899..c5e80977 100644 --- a/server/BUILD.bazel +++ b/server/BUILD.bazel @@ -18,10 +18,10 @@ go_library( "//common/types/ref:go_default_library", "@com_google_cel_spec//proto/test/v1/proto2:test_all_types_go_proto", "@com_google_cel_spec//proto/test/v1/proto3:test_all_types_go_proto", - "@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/rpc/code:go_default_library", - "@org_golang_google_genproto//googleapis/rpc/status: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_rpc//code:go_default_library", + "@org_golang_google_genproto_googleapis_rpc//status:go_default_library", "@org_golang_google_protobuf//proto:go_default_library", "@org_golang_google_protobuf//types/known/anypb:go_default_library", ], @@ -40,8 +40,8 @@ go_test( "//common/operators:go_default_library", "//test:go_default_library", "@com_google_cel_spec//tools/celrpc: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/rpc/status: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_rpc//status:go_default_library", ], ) diff --git a/server/go.mod b/server/go.mod index e06a37db..827eb06e 100644 --- a/server/go.mod +++ b/server/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/google/cel-go v0.13.0 - github.com/google/cel-spec v0.7.1 + github.com/google/cel-spec v0.9.0 google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 google.golang.org/protobuf v1.30.0 @@ -12,7 +12,6 @@ require ( require ( github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect - github.com/bazelbuild/rules_go v0.35.0 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/stoewer/go-strcase v1.2.0 // indirect golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect diff --git a/server/go.sum b/server/go.sum index 90a25003..5c79ac1d 100644 --- a/server/go.sum +++ b/server/go.sum @@ -1,14 +1,13 @@ github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df h1:7RFfzj4SSt6nnvCPbCqijJi1nWCd+TqAT3bYCStRC18= github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM= -github.com/bazelbuild/rules_go v0.35.0 h1:ViPR65vOrg74JKntAUFY6qZkheBKGB6to7wFd8gCRU4= -github.com/bazelbuild/rules_go v0.35.0/go.mod h1:ahciH68Viyxtm/gvCQplaAiu8buhf/b+gWswcPjFixI= +github.com/bazelbuild/rules_go v0.38.1 h1:YGNsLhWe18Ielebav7cClP3GMwBxBE+xEArLHtmXDx8= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/cel-spec v0.7.1 h1:pgdO3FNguUE8//dXkVfRXlNMNDgMQgHJ8nCO43ztsT0= -github.com/google/cel-spec v0.7.1/go.mod h1:cOOYaOu/wF2JV0ZZMRRNYgDZo2AfrCwyORcc3vfu0Es= +github.com/google/cel-spec v0.9.0 h1:bUcDX1brUzs+WfNttSKeQU2FMfVRIdA/GbnwlZ16f3k= +github.com/google/cel-spec v0.9.0/go.mod h1:GzwIsZA6+cbEqROVsEr+iIHWpCEWYd5kwLvar3R68Rg= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= diff --git a/test/BUILD.bazel b/test/BUILD.bazel index bfe3f8fe..59bd9a3d 100644 --- a/test/BUILD.bazel +++ b/test/BUILD.bazel @@ -22,7 +22,7 @@ go_library( importpath = "github.com/google/cel-go/test", deps = [ "//common/operators: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", "@org_golang_google_protobuf//proto:go_default_library", "@org_golang_google_protobuf//types/known/structpb:go_default_library", ],