From fce7e8627b25676834ec809a666a49a4c994a41c Mon Sep 17 00:00:00 2001 From: Sokwhan Huh Date: Wed, 20 Mar 2024 18:46:59 +0000 Subject: [PATCH 1/2] Use tests submodule --- WORKSPACE | 4 ++-- repl/appengine/go.mod | 4 +++- repl/go.mod | 2 ++ server/go.mod | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 53664717..f768f8ef 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -119,8 +119,8 @@ go_repository( # CEL Spec deps go_repository( name = "com_google_cel_spec", - commit = "910da5b5d08378a9a1f3ea3ba1979e16e6c6dbc1", # v 0.14.0 - importpath = "github.com/google/cel-spec", + commit = "95c1c0162adaa53d6884cfa64845091239f20100", + importpath = "github.com/l46kok/cel-spec", ) # strcase deps diff --git a/repl/appengine/go.mod b/repl/appengine/go.mod index 88c1c03a..459c6a7c 100644 --- a/repl/appengine/go.mod +++ b/repl/appengine/go.mod @@ -7,7 +7,7 @@ require github.com/google/cel-go/repl v0.0.0-20230406155237-b081aea03865 require ( github.com/antlr4-go/antlr/v4 v4.13.0 // indirect github.com/google/cel-go v0.18.1 // indirect - github.com/google/cel-spec v0.14.0 // indirect + github.com/google/cel-spec/tests v0.14.0 // indirect github.com/stoewer/go-strcase v1.3.0 // indirect golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect golang.org/x/text v0.13.0 // indirect @@ -19,3 +19,5 @@ require ( replace github.com/google/cel-go => ../../. replace github.com/google/cel-go/repl => ../. + +replace github.com/google/cel-spec/tests v0.14.0 => github.com/l46kok/cel-spec/tests v0.0.0-20240319231845-95c1c0162ada diff --git a/repl/go.mod b/repl/go.mod index b62767d5..f97fca8f 100644 --- a/repl/go.mod +++ b/repl/go.mod @@ -20,3 +20,5 @@ require ( ) replace github.com/google/cel-go => ../. + +replace github.com/google/cel-spec/tests v0.14.0 => github.com/l46kok/cel-spec/tests v0.0.0-20240319231845-95c1c0162ada diff --git a/server/go.mod b/server/go.mod index 8e5611df..3e5b4d58 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.14.0 + github.com/google/cel-spec/tests v0.14.0 google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 google.golang.org/protobuf v1.33.0 @@ -23,3 +23,5 @@ require ( ) replace github.com/google/cel-go => ./.. + +replace github.com/google/cel-spec/tests v0.14.0 => github.com/l46kok/cel-spec/tests v0.0.0-20240319231845-95c1c0162ada From ce9318cef35d709c7b6f3a49ae9c60c1b18631b8 Mon Sep 17 00:00:00 2001 From: Sokwhan Huh Date: Wed, 27 Mar 2024 20:51:32 +0000 Subject: [PATCH 2/2] Update tests proto to latest cel spec release --- WORKSPACE | 10 +++++----- repl/appengine/go.mod | 4 +--- repl/appengine/go.sum | 4 ++-- repl/go.mod | 4 +--- repl/go.sum | 4 ++-- server/go.mod | 4 +--- server/go.sum | 4 ++-- 7 files changed, 14 insertions(+), 20 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index f768f8ef..c6c478da 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -48,11 +48,11 @@ http_archive( urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.21.5.zip"], ) -load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language") -load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains") load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") +load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies") +load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains") switched_rules_by_language( name = "com_google_googleapis_imports", @@ -116,11 +116,11 @@ go_repository( version = "v4.13.0", ) -# CEL Spec deps +# CEL Spec deps v0.15.0 go_repository( name = "com_google_cel_spec", - commit = "95c1c0162adaa53d6884cfa64845091239f20100", - importpath = "github.com/l46kok/cel-spec", + commit = "ae15d293dc49482180e967942612fb85e33bcde9", + importpath = "github.com/google/cel-spec", ) # strcase deps diff --git a/repl/appengine/go.mod b/repl/appengine/go.mod index 459c6a7c..1056fe4c 100644 --- a/repl/appengine/go.mod +++ b/repl/appengine/go.mod @@ -7,7 +7,7 @@ require github.com/google/cel-go/repl v0.0.0-20230406155237-b081aea03865 require ( github.com/antlr4-go/antlr/v4 v4.13.0 // indirect github.com/google/cel-go v0.18.1 // indirect - github.com/google/cel-spec/tests v0.14.0 // indirect + github.com/google/cel-spec/tests v0.0.0-20240326213136-ae15d293dc49 // indirect github.com/stoewer/go-strcase v1.3.0 // indirect golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect golang.org/x/text v0.13.0 // indirect @@ -19,5 +19,3 @@ require ( replace github.com/google/cel-go => ../../. replace github.com/google/cel-go/repl => ../. - -replace github.com/google/cel-spec/tests v0.14.0 => github.com/l46kok/cel-spec/tests v0.0.0-20240319231845-95c1c0162ada diff --git a/repl/appengine/go.sum b/repl/appengine/go.sum index 02b24e19..c6bc35f1 100644 --- a/repl/appengine/go.sum +++ b/repl/appengine/go.sum @@ -3,8 +3,8 @@ github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/cel-spec v0.14.0 h1:vVw8oKDC6TTksmM5qwOxx2r+PLDUDV16eqLzeMWVenk= -github.com/google/cel-spec v0.14.0/go.mod h1:sBeqYG7I0bX68Z49T0ydlXLxJK1+TBX8musTpcSjMcY= +github.com/google/cel-spec/tests v0.0.0-20240326213136-ae15d293dc49 h1:wah55a0+fkelFlU9Y3PdzR1ocFc6zSpt7AINt2rH7Os= +github.com/google/cel-spec/tests v0.0.0-20240326213136-ae15d293dc49/go.mod h1:GbU6gMXFr+sJ94kaZQtIEPRUhpDsju7N6WOY/GwWw8U= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/repl/go.mod b/repl/go.mod index f97fca8f..dc3d6764 100644 --- a/repl/go.mod +++ b/repl/go.mod @@ -6,13 +6,13 @@ require ( github.com/antlr4-go/antlr/v4 v4.13.0 github.com/chzyer/readline v1.5.1 github.com/google/cel-go v0.18.1 - github.com/google/cel-spec v0.14.0 google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 google.golang.org/protobuf v1.33.0 ) require ( + github.com/google/cel-spec/tests v0.0.0-20240326213136-ae15d293dc49 // indirect github.com/stoewer/go-strcase v1.3.0 // indirect golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect golang.org/x/sys v0.13.0 // indirect @@ -20,5 +20,3 @@ require ( ) replace github.com/google/cel-go => ../. - -replace github.com/google/cel-spec/tests v0.14.0 => github.com/l46kok/cel-spec/tests v0.0.0-20240319231845-95c1c0162ada diff --git a/repl/go.sum b/repl/go.sum index 880057f2..840ddf9b 100644 --- a/repl/go.sum +++ b/repl/go.sum @@ -9,8 +9,8 @@ github.com/chzyer/test v1.0.0/go.mod h1:2JlltgoNkt4TW/z9V/IzDdFaMTM2JPIi26O1pF38 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/google/cel-spec v0.14.0 h1:vVw8oKDC6TTksmM5qwOxx2r+PLDUDV16eqLzeMWVenk= -github.com/google/cel-spec v0.14.0/go.mod h1:sBeqYG7I0bX68Z49T0ydlXLxJK1+TBX8musTpcSjMcY= +github.com/google/cel-spec/tests v0.0.0-20240326213136-ae15d293dc49 h1:wah55a0+fkelFlU9Y3PdzR1ocFc6zSpt7AINt2rH7Os= +github.com/google/cel-spec/tests v0.0.0-20240326213136-ae15d293dc49/go.mod h1:GbU6gMXFr+sJ94kaZQtIEPRUhpDsju7N6WOY/GwWw8U= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/server/go.mod b/server/go.mod index 3e5b4d58..3097f3d9 100644 --- a/server/go.mod +++ b/server/go.mod @@ -4,7 +4,6 @@ go 1.18 require ( github.com/google/cel-go v0.13.0 - github.com/google/cel-spec/tests v0.14.0 google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 google.golang.org/protobuf v1.33.0 @@ -13,6 +12,7 @@ require ( require ( github.com/antlr4-go/antlr/v4 v4.13.0 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/cel-spec/tests v0.0.0-20240326213136-ae15d293dc49 // indirect github.com/stoewer/go-strcase v1.2.0 // indirect golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect golang.org/x/net v0.17.0 // indirect @@ -23,5 +23,3 @@ require ( ) replace github.com/google/cel-go => ./.. - -replace github.com/google/cel-spec/tests v0.14.0 => github.com/l46kok/cel-spec/tests v0.0.0-20240319231845-95c1c0162ada diff --git a/server/go.sum b/server/go.sum index 8a5c619c..cedc01b7 100644 --- a/server/go.sum +++ b/server/go.sum @@ -6,8 +6,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs 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.14.0 h1:vVw8oKDC6TTksmM5qwOxx2r+PLDUDV16eqLzeMWVenk= -github.com/google/cel-spec v0.14.0/go.mod h1:sBeqYG7I0bX68Z49T0ydlXLxJK1+TBX8musTpcSjMcY= +github.com/google/cel-spec/tests v0.0.0-20240326213136-ae15d293dc49 h1:wah55a0+fkelFlU9Y3PdzR1ocFc6zSpt7AINt2rH7Os= +github.com/google/cel-spec/tests v0.0.0-20240326213136-ae15d293dc49/go.mod h1:GbU6gMXFr+sJ94kaZQtIEPRUhpDsju7N6WOY/GwWw8U= 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=