Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0e9679d

Browse files
authored
Merge pull request#131700 from cici37/celList
Add support for CEL ext lists library
2 parents6281a07 +8a42f4c commit0e9679d

File tree

3 files changed

+90
-0
lines changed

3 files changed

+90
-0
lines changed

‎staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/celcoststability_test.go

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,6 +1195,43 @@ func TestCelCostStability(t *testing.T) {
11951195
`quantity(self.val1).isInteger()`:4,
11961196
},
11971197
},
1198+
{name:"ext lists version 3",
1199+
obj:objs([]interface{}{1,2,3}, []interface{}{1,2,3}),
1200+
schema:schemas(listType(&integerType),listType(&integerType)),
1201+
expectCost:map[string]int64{
1202+
`lists.range(4) == [0,1,2,3]`:16,
1203+
`lists.range(0) == []`:11,
1204+
`[5,1,2,3].reverse() == [3,2,1,5]`:16,
1205+
`[].reverse() == []`:11,
1206+
`[1].reverse() == [1]`:13,
1207+
`['are', 'you', 'as', 'bored', 'as', 'I', 'am'].reverse() == ['am', 'I', 'as', 'bored', 'as', 'you', 'are']`:19,
1208+
`[false, true, true].reverse().reverse() == [false, true, true]`:29,
1209+
`[1,2,3,4].slice(0, 4) == [1,2,3,4]`:16,
1210+
`[1,2,3,4].slice(0, 0) == []`:11,
1211+
`[1,2,3,4].slice(1, 1) == []`:11,
1212+
`[1,2,3,4].slice(4, 4) == []`:11,
1213+
`[1,2,3,4].slice(1, 3) == [2, 3]`:14,
1214+
`dyn([]).flatten() == []`:11,
1215+
`dyn([1,2,3,4]).flatten() == [1,2,3,4]`:16,
1216+
`[].sort() == []`:11,
1217+
`[1].sort() == [1]`:14,
1218+
`[4, 3, 2, 1].sort() == [1, 2, 3, 4]`:44,
1219+
`["d", "a", "b", "c"].sort() == ["a", "b", "c", "d"]`:45,
1220+
`[].sortBy(e, e) == []`:14,
1221+
`["a"].sortBy(e, e) == ["a"]`:30,
1222+
`[-3, 1, -5, -2, 4].sortBy(e, -(e * e)) == [-5, 4, -3, -2, 1]`:145,
1223+
`[-3, 1, -5, -2, 4].map(e, e * 2).sortBy(e, -(e * e)) == [-10, 8, -6, -4, 2]`:216,
1224+
`lists.range(3).sortBy(e, -e) == [2, 1, 0]`:89,
1225+
`["a", "c", "b", "first"].sortBy(e, e == "first" ? "" : e) == ["first", "a", "b", "c"]`:104,
1226+
`[{'name': 'foo'}, {'name': 'bar'}, {'name': 'baz'}].sortBy(e, e.name) == [{'name': 'bar'}, {'name': 'baz'}, {'name': 'foo'}]`:75,
1227+
`[].distinct() == []`:11,
1228+
`[1].distinct() == [1]`:14,
1229+
`[-2, 5, -2, 1, 1, 5, -2, 1].distinct() == [-2, 5, 1]`:140,
1230+
`['c', 'a', 'a', 'b', 'a', 'b', 'c', 'c'].distinct() == ['c', 'a', 'b']`:146,
1231+
`[[1], [1], [2]].distinct() == [[1], [2]]`:30,
1232+
`[{'name': 'a'}, {'name': 'b'}, {'name': 'a'}].distinct() == [{'name': 'a'}, {'name': 'b'}]`:30,
1233+
},
1234+
},
11981235
}
11991236

12001237
for_,tt:=rangecases {

‎staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/validation_test.go

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,52 @@ func TestValidationExpressions(t *testing.T) {
429429
"[1, 'a', false].filter(x, string(x) == 'a')":"compilation failed: ERROR: <input>:1:5: expected type 'int' but found 'string'",
430430
},
431431
},
432+
{name:"ext lists version 3",
433+
obj:objs([]interface{}{1,2,3}, []interface{}{1,2,3}),
434+
schema:schemas(listType(&integerType),listType(&integerType)),
435+
valid: []string{
436+
`lists.range(4) == [0,1,2,3]`,
437+
`lists.range(0) == []`,
438+
`[5,1,2,3].reverse() == [3,2,1,5]`,
439+
`[].reverse() == []`,
440+
`[1].reverse() == [1]`,
441+
`['are', 'you', 'as', 'bored', 'as', 'I', 'am'].reverse() == ['am', 'I', 'as', 'bored', 'as', 'you', 'are']`,
442+
`[false, true, true].reverse().reverse() == [false, true, true]`,
443+
`[1,2,3,4].slice(0, 4) == [1,2,3,4]`,
444+
`[1,2,3,4].slice(0, 0) == []`,
445+
`[1,2,3,4].slice(1, 1) == []`,
446+
`[1,2,3,4].slice(4, 4) == []`,
447+
`[1,2,3,4].slice(1, 3) == [2, 3]`,
448+
`dyn([]).flatten() == []`,
449+
`dyn([1,2,3,4]).flatten() == [1,2,3,4]`,
450+
`[].sort() == []`,
451+
`[1].sort() == [1]`,
452+
`[4, 3, 2, 1].sort() == [1, 2, 3, 4]`,
453+
`["d", "a", "b", "c"].sort() == ["a", "b", "c", "d"]`,
454+
`[].sortBy(e, e) == []`,
455+
`["a"].sortBy(e, e) == ["a"]`,
456+
`[-3, 1, -5, -2, 4].sortBy(e, -(e * e)) == [-5, 4, -3, -2, 1]`,
457+
`[-3, 1, -5, -2, 4].map(e, e * 2).sortBy(e, -(e * e)) == [-10, 8, -6, -4, 2]`,
458+
`lists.range(3).sortBy(e, -e) == [2, 1, 0]`,
459+
`["a", "c", "b", "first"].sortBy(e, e == "first" ? "" : e) == ["first", "a", "b", "c"]`,
460+
`[{'name': 'foo'}, {'name': 'bar'}, {'name': 'baz'}].sortBy(e, e.name) == [{'name': 'bar'}, {'name': 'baz'}, {'name': 'foo'}]`,
461+
`[].distinct() == []`,
462+
`[1].distinct() == [1]`,
463+
`[-2, 5, -2, 1, 1, 5, -2, 1].distinct() == [-2, 5, 1]`,
464+
`['c', 'a', 'a', 'b', 'a', 'b', 'c', 'c'].distinct() == ['c', 'a', 'b']`,
465+
`[[1], [1], [2]].distinct() == [[1], [2]]`,
466+
`[{'name': 'a'}, {'name': 'b'}, {'name': 'a'}].distinct() == [{'name': 'a'}, {'name': 'b'}]`,
467+
`[[1],[2],[3,4]].flatten() == [1,2,3,4]`,
468+
},
469+
errors:map[string]string{
470+
`[1,2,3,4].slice(3, 0) != [1,2]`:"cannot slice(3, 0), start index must be less than or equal to end index",
471+
`[1,2,3,4].slice(0, 10) != [1,2]`:"cannot slice(0, 10), list is length 4",
472+
`[1,2,3,4].slice(-5, 10) != [1,2]`:"cannot slice(-5, 10), negative indexes not supported",
473+
`[1,2,3,4].slice(-5, -3) != [1,2]`:"cannot slice(-5, -3), negative indexes not supported",
474+
`[[1],[2],[3,4]].flatten(-1) == [1,2,3,4]`:"level must be non-negative evaluating rule: [[1],[2],[3,4]].flatten(-1) == [1,2,3,4]",
475+
`["d", 3, 2, "c"].sort() == ["a", "b", "c", "d"]`:"expected type 'string' but found 'int'",
476+
},
477+
},
432478
{name:"string lists",
433479
obj:objs([]interface{}{"a","b","c"}),
434480
schema:schemas(listType(&stringType)),

‎staging/src/k8s.io/apiserver/pkg/cel/environment/base.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,13 @@ var baseOptsWithoutStrictCost = []VersionedOptions{
183183
library.SemverLib(library.SemverVersion(1)),
184184
},
185185
},
186+
// List library
187+
{
188+
IntroducedVersion:version.MajorMinor(1,34),
189+
EnvOptions: []cel.EnvOption{
190+
ext.Lists(ext.ListsVersion(3)),
191+
},
192+
},
186193
}
187194

188195
var (

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp