mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-07-19 07:25:19 +00:00
Merge pull request #133419 from Xdynix/fix-label-selector-consecutive-commas
Fix label selector parsing for consecutive commas
This commit is contained in:
@@ -848,7 +848,6 @@ func (p *Parser) parseIdentifiersList() (sets.String, error) {
|
||||
return s, nil
|
||||
}
|
||||
if tok2 == CommaToken {
|
||||
p.consume(Values)
|
||||
s.Insert("") // to handle ,, Double "" removed by StringSet
|
||||
}
|
||||
default: // it can be operator
|
||||
|
||||
@@ -636,9 +636,24 @@ func TestSetSelectorParser(t *testing.T) {
|
||||
{"x in (abc,)", internalSelector{
|
||||
getRequirement("x", selection.In, sets.NewString("abc", ""), t),
|
||||
}, true, true},
|
||||
{"x in (abc,abc)", internalSelector{
|
||||
getRequirement("x", selection.In, sets.NewString("abc"), t),
|
||||
}, true, true},
|
||||
{"x in ()", internalSelector{
|
||||
getRequirement("x", selection.In, sets.NewString(""), t),
|
||||
}, true, true},
|
||||
{"x in (a,,)", internalSelector{
|
||||
getRequirement("x", selection.In, sets.NewString("a", ""), t),
|
||||
}, true, true},
|
||||
{"x in (a,,,)", internalSelector{
|
||||
getRequirement("x", selection.In, sets.NewString("a", ""), t),
|
||||
}, true, true},
|
||||
{"x in (a,,,,,,)", internalSelector{
|
||||
getRequirement("x", selection.In, sets.NewString("a", ""), t),
|
||||
}, true, true},
|
||||
{"x in (a,,a,,a,,a,,)", internalSelector{
|
||||
getRequirement("x", selection.In, sets.NewString("a", ""), t),
|
||||
}, true, true},
|
||||
{"x notin (abc,,def),bar,z in (),w", internalSelector{
|
||||
getRequirement("bar", selection.Exists, nil, t),
|
||||
getRequirement("w", selection.Exists, nil, t),
|
||||
|
||||
Reference in New Issue
Block a user