github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 15:58:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #121307 from cici37/celUpdate

Browse Source 
Add cel new validator into Kubernetes
This commit is contained in:
Kubernetes Prow Robot 2023-10-30 20:02:55 +01:00 committed by GitHub
commit 16fc00493b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/validation_test.go
View File

@ -275,7 +275,7 @@ func TestValidationExpressions(t *testing.T) {
}, },
errors: map[string]string{ errors: map[string]string{
// Invalid regex with a string constant regex pattern is compile time error // Invalid regex with a string constant regex pattern is compile time error
"self.val1.matches(')')": "compile error: program instantiation failed: error parsing regexp: unexpected ): `)`", "self.val1.matches(')')": "compile error: compilation failed: ERROR: <input>:1:19: invalid matches argument",
}, },
}, },
{name: "escaped strings", {name: "escaped strings",
@ -320,6 +320,11 @@ func TestValidationExpressions(t *testing.T) {
"self.val1.getMilliseconds() == 3723004", "self.val1.getMilliseconds() == 3723004",
"type(self.val1) == google.protobuf.Duration", "type(self.val1) == google.protobuf.Duration",
}, },
errors: map[string]string{
"duration('1')": "invalid duration argument",
"duration('1d')": "invalid duration argument",
"duration('1us') < duration('1nns')": "invalid duration argument",
},
}, },
{name: "date format", {name: "date format",
obj: objs("1997-07-16", "1997-07-16"), obj: objs("1997-07-16", "1997-07-16"),
@ -348,6 +353,11 @@ func TestValidationExpressions(t *testing.T) {
"self.val1.getHours('UTC') == 18", // TZ in string is 1hr off of UTC "self.val1.getHours('UTC') == 18", // TZ in string is 1hr off of UTC
"type(self.val1) == google.protobuf.Timestamp", "type(self.val1) == google.protobuf.Timestamp",
}, },
errors: map[string]string{
"timestamp('1000-00-00T00:00:00Z')": "invalid timestamp",
"timestamp('1000-01-01T00:00:00ZZ')": "invalid timestamp",
"timestamp(-62135596801)": "invalid timestamp",
},
}, },
{name: "enums", {name: "enums",
obj: map[string]interface{}{"enumStr": "Pending"}, obj: map[string]interface{}{"enumStr": "Pending"},
@ -1748,6 +1758,7 @@ func TestValidationExpressions(t *testing.T) {
"self.str.find(')') == ''": "compile error: program instantiation failed: error parsing regexp: unexpected ): `)`", "self.str.find(')') == ''": "compile error: program instantiation failed: error parsing regexp: unexpected ): `)`",
"self.str.findAll(')') == []": "compile error: program instantiation failed: error parsing regexp: unexpected ): `)`", "self.str.findAll(')') == []": "compile error: program instantiation failed: error parsing regexp: unexpected ): `)`",
"self.str.findAll(')', 1) == []": "compile error: program instantiation failed: error parsing regexp: unexpected ): `)`", "self.str.findAll(')', 1) == []": "compile error: program instantiation failed: error parsing regexp: unexpected ): `)`",
"self.str.matches('x++')": "invalid matches argument",
}, },
}, },
{name: "URL parsing", {name: "URL parsing",

13
staging/src/k8s.io/apiserver/pkg/cel/environment/base.go
View File

@ -80,7 +80,18 @@ var baseOpts = []VersionedOptions{
library.Quantity(), library.Quantity(),
}, },
}, },
// add the new validator in 1.29
{
IntroducedVersion: version.MajorMinor(1, 29),
EnvOptions: []cel.EnvOption{
cel.ASTValidators(
cel.ValidateDurationLiterals(),
cel.ValidateTimestampLiterals(),
cel.ValidateRegexLiterals(),
cel.ValidateHomogeneousAggregateLiterals(),
),
},
},
// String library // String library
{ {
IntroducedVersion: version.MajorMinor(1, 0), IntroducedVersion: version.MajorMinor(1, 0),