From 7d0b085f71f1db4545ef25efb0d1bb9ac00a188d Mon Sep 17 00:00:00 2001 From: Sokwhan Huh Date: Wed, 20 Mar 2024 00:22:41 +0000 Subject: [PATCH 1/2] Update cel-spec dep version to 0.14.0 --- WORKSPACE | 2 +- conformance/BUILD.bazel | 1 + repl/appengine/go.mod | 2 +- repl/go.mod | 2 +- server/go.mod | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index ced0ae79..53664717 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -119,7 +119,7 @@ go_repository( # CEL Spec deps go_repository( name = "com_google_cel_spec", - commit = "dd5373cc157f6325421470139b5d55baed09935a", + commit = "910da5b5d08378a9a1f3ea3ba1979e16e6c6dbc1", # v 0.14.0 importpath = "github.com/google/cel-spec", ) diff --git a/conformance/BUILD.bazel b/conformance/BUILD.bazel index 51d200d9..a89771a9 100644 --- a/conformance/BUILD.bazel +++ b/conformance/BUILD.bazel @@ -35,6 +35,7 @@ sh_test( # Failing conformance tests. "--skip_test=fields/qualified_identifier_resolution/map_key_float,map_key_null,map_value_repeat_key", + "--skip_test=fields/qualified_identifier_resolution/map_value_repeat_key_heterogeneous", "--skip_test=timestamps/duration_converters/get_milliseconds", # Future enhancments. diff --git a/repl/appengine/go.mod b/repl/appengine/go.mod index d34badc4..f5d0faa6 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.13.0 // indirect + github.com/google/cel-spec 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.9.0 // indirect diff --git a/repl/go.mod b/repl/go.mod index c0922776..f1b6756e 100644 --- a/repl/go.mod +++ b/repl/go.mod @@ -6,7 +6,7 @@ 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.13.0 + 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 diff --git a/server/go.mod b/server/go.mod index 36a0f99c..8e5611df 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.12.0 + 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 From 4540664fd38e56bc939aaa916a7e66f6c42073b5 Mon Sep 17 00:00:00 2001 From: Sokwhan Huh Date: Wed, 20 Mar 2024 00:26:50 +0000 Subject: [PATCH 2/2] Run go mod tidy --- repl/appengine/go.mod | 2 +- repl/appengine/go.sum | 8 ++++---- repl/go.mod | 4 ++-- repl/go.sum | 12 ++++++------ server/go.sum | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/repl/appengine/go.mod b/repl/appengine/go.mod index f5d0faa6..88c1c03a 100644 --- a/repl/appengine/go.mod +++ b/repl/appengine/go.mod @@ -10,7 +10,7 @@ require ( github.com/google/cel-spec 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.9.0 // indirect + golang.org/x/text v0.13.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 // indirect google.golang.org/protobuf v1.33.0 // indirect diff --git a/repl/appengine/go.sum b/repl/appengine/go.sum index 658d67d4..02b24e19 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.13.0 h1:5nfThDaiEQjx9cv+uB9DpDyWsP9j1gsSGWubZRHc4rg= -github.com/google/cel-spec v0.13.0/go.mod h1:kml2o4+MolVRtnyfTn6uTN+694OYIxnyIX1ARTkAYzM= +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/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= @@ -19,8 +19,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU= golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 h1:nIgk/EEq3/YlnmVVXVnm14rC2oxgs1o0ong4sD/rd44= google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5/go.mod h1:5DZzOUPCLYL3mNkQ0ms0F3EuUNZ7py1Bqeq6sxzI7/Q= google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 h1:eSaPbMR4T7WfH9FvABk36NBMacoTUKdWCvV0dx+KfOg= diff --git a/repl/go.mod b/repl/go.mod index f1b6756e..b62767d5 100644 --- a/repl/go.mod +++ b/repl/go.mod @@ -15,8 +15,8 @@ require ( require ( github.com/stoewer/go-strcase v1.3.0 // indirect golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect - golang.org/x/sys v0.8.0 // indirect - golang.org/x/text v0.9.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect ) replace github.com/google/cel-go => ../. diff --git a/repl/go.sum b/repl/go.sum index be5f3b48..880057f2 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.13.0 h1:5nfThDaiEQjx9cv+uB9DpDyWsP9j1gsSGWubZRHc4rg= -github.com/google/cel-spec v0.13.0/go.mod h1:kml2o4+MolVRtnyfTn6uTN+694OYIxnyIX1ARTkAYzM= +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/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= @@ -26,10 +26,10 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU= golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 h1:nIgk/EEq3/YlnmVVXVnm14rC2oxgs1o0ong4sD/rd44= google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5/go.mod h1:5DZzOUPCLYL3mNkQ0ms0F3EuUNZ7py1Bqeq6sxzI7/Q= google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 h1:eSaPbMR4T7WfH9FvABk36NBMacoTUKdWCvV0dx+KfOg= diff --git a/server/go.sum b/server/go.sum index e031528b..8a5c619c 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.12.0 h1:mcg2HvGvGvGZybMMNDcrD3JRBbsOhxImuOIK0zRnbK0= -github.com/google/cel-spec v0.12.0/go.mod h1:kml2o4+MolVRtnyfTn6uTN+694OYIxnyIX1ARTkAYzM= +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/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=