github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #129547 from serathius/watchcache-bypass-test-valid

Browse Source 
Only test requests that pass validation
This commit is contained in:
Kubernetes Prow Robot 2025-01-15 06:50:33 -08:00 committed by GitHub
commit ec2e0de35a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 52 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
staging/src/k8s.io/apiserver/pkg/storage/cacher/cacher_whitebox_test.go
View File

@ -31,6 +31,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
"k8s.io/apimachinery/pkg/apis/meta/internalversion"
"k8s.io/apimachinery/pkg/apis/meta/internalversion/validation"
apiequality "k8s.io/apimachinery/pkg/api/equality" apiequality "k8s.io/apimachinery/pkg/api/equality"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"
@ -205,64 +207,71 @@ func TestGetListCacheBypass(t *testing.T) {
Continue string Continue string
} }
testCases := map[opts]bool{} testCases := map[opts]bool{}
for _, rv := range []string{"", "0", "1"} { testCases[opts{}] = false
for _, match := range []metav1.ResourceVersionMatch{"", "Invalid", metav1.ResourceVersionMatchExact, metav1.ResourceVersionMatchNotOlderThan} { testCases[opts{Limit: 100}] = false
for _, c := range []string{"", "continue"} { testCases[opts{Continue: "continue"}] = true
for _, limit := range []int64{0, 100} { testCases[opts{Limit: 100, Continue: "continue"}] = true
testCases[opts{ testCases[opts{ResourceVersion: "0"}] = false
ResourceVersion: rv, testCases[opts{ResourceVersion: "0", Limit: 100}] = false
ResourceVersionMatch: match,
Continue: c,
Limit: limit,
}] = false
}
}
}
}
testCases[opts{ResourceVersion: "0", Continue: "continue"}] = true testCases[opts{ResourceVersion: "0", Continue: "continue"}] = true
testCases[opts{ResourceVersion: "0", Limit: 100, Continue: "continue"}] = true testCases[opts{ResourceVersion: "0", Limit: 100, Continue: "continue"}] = true
testCases[opts{ResourceVersion: "0", ResourceVersionMatch: metav1.ResourceVersionMatchExact}] = true testCases[opts{ResourceVersion: "0", ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan}] = false
testCases[opts{ResourceVersion: "0", ResourceVersionMatch: metav1.ResourceVersionMatchExact, Limit: 100}] = true testCases[opts{ResourceVersion: "0", ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, Limit: 100}] = false
testCases[opts{ResourceVersion: "0", ResourceVersionMatch: metav1.ResourceVersionMatchExact, Continue: "continue"}] = true testCases[opts{ResourceVersion: "1"}] = false
testCases[opts{ResourceVersion: "0", ResourceVersionMatch: metav1.ResourceVersionMatchExact, Limit: 100, Continue: "continue"}] = true
testCases[opts{ResourceVersion: "0", ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, Continue: "continue"}] = true
testCases[opts{ResourceVersion: "0", ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, Limit: 100, Continue: "continue"}] = true
testCases[opts{ResourceVersion: "0", ResourceVersionMatch: "Invalid"}] = true
testCases[opts{ResourceVersion: "0", ResourceVersionMatch: "Invalid", Continue: "continue"}] = true
testCases[opts{ResourceVersion: "0", ResourceVersionMatch: "Invalid", Limit: 100}] = true
testCases[opts{ResourceVersion: "0", ResourceVersionMatch: "Invalid", Limit: 100, Continue: "continue"}] = true
testCases[opts{ResourceVersion: "1", Limit: 100}] = true testCases[opts{ResourceVersion: "1", Limit: 100}] = true
testCases[opts{ResourceVersion: "1", Continue: "continue"}] = true testCases[opts{ResourceVersion: "1", Continue: "continue"}] = true
testCases[opts{ResourceVersion: "1", Limit: 100, Continue: "continue"}] = true testCases[opts{ResourceVersion: "1", Limit: 100, Continue: "continue"}] = true
testCases[opts{ResourceVersion: "1", ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, Continue: "continue"}] = true
testCases[opts{ResourceVersion: "1", ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, Limit: 100, Continue: "continue"}] = true
testCases[opts{ResourceVersion: "1", ResourceVersionMatch: metav1.ResourceVersionMatchExact}] = true testCases[opts{ResourceVersion: "1", ResourceVersionMatch: metav1.ResourceVersionMatchExact}] = true
testCases[opts{ResourceVersion: "1", ResourceVersionMatch: metav1.ResourceVersionMatchExact, Limit: 100}] = true testCases[opts{ResourceVersion: "1", ResourceVersionMatch: metav1.ResourceVersionMatchExact, Limit: 100}] = true
testCases[opts{ResourceVersion: "1", ResourceVersionMatch: metav1.ResourceVersionMatchExact, Continue: "continue"}] = true testCases[opts{ResourceVersion: "1", ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan}] = false
testCases[opts{ResourceVersion: "1", ResourceVersionMatch: metav1.ResourceVersionMatchExact, Limit: 100, Continue: "continue"}] = true testCases[opts{ResourceVersion: "1", ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, Limit: 100}] = false
testCases[opts{ResourceVersion: "1", ResourceVersionMatch: "Invalid"}] = true
testCases[opts{ResourceVersion: "1", ResourceVersionMatch: "Invalid", Continue: "continue"}] = true for _, rv := range []string{"", "0", "1"} {
testCases[opts{ResourceVersion: "1", ResourceVersionMatch: "Invalid", Limit: 100}] = true for _, match := range []metav1.ResourceVersionMatch{"", metav1.ResourceVersionMatchExact, metav1.ResourceVersionMatchNotOlderThan} {
testCases[opts{ResourceVersion: "1", ResourceVersionMatch: "Invalid", Limit: 100, Continue: "continue"}] = true for _, c := range []string{"", "continue"} {
testCases[opts{ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, Limit: 100}] = true for _, limit := range []int64{0, 100} {
testCases[opts{ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, Continue: "continue"}] = true errs := validation.ValidateListOptions(&internalversion.ListOptions{
testCases[opts{ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, Limit: 100, Continue: "continue"}] = true ResourceVersion: rv,
testCases[opts{ResourceVersionMatch: metav1.ResourceVersionMatchExact}] = true ResourceVersionMatch: match,
testCases[opts{ResourceVersionMatch: metav1.ResourceVersionMatchExact, Continue: "continue"}] = true Limit: limit,
testCases[opts{ResourceVersionMatch: metav1.ResourceVersionMatchExact, Limit: 100, Continue: "continue"}] = true Continue: c,
testCases[opts{ResourceVersionMatch: "Invalid"}] = true }, false)
testCases[opts{ResourceVersionMatch: "Invalid", Continue: "continue"}] = true if len(errs) != 0 {
testCases[opts{ResourceVersionMatch: "Invalid", Limit: 100}] = true continue
testCases[opts{ResourceVersionMatch: "Invalid", Limit: 100, Continue: "continue"}] = true }
testCases[opts{Limit: 100, Continue: "continue"}] = true opt := opts{
testCases[opts{Continue: "continue"}] = true ResourceVersion: rv,
ResourceVersionMatch: match,
Limit: limit,
Continue: c,
}
_, found := testCases[opt]
if !found {
t.Errorf("Test case not covered, but passes validation: %+v", opt)
}
}
}
}
}
for opt := range testCases {
errs := validation.ValidateListOptions(&internalversion.ListOptions{
ResourceVersion: opt.ResourceVersion,
ResourceVersionMatch: opt.ResourceVersionMatch,
Limit: opt.Limit,
Continue: opt.Continue,
}, false)
if len(errs) != 0 {
t.Errorf("Invalid LIST request that should not be tested %+v", opt)
continue
}
}
t.Run("ConsistentListFromStorage", func(t *testing.T) { t.Run("ConsistentListFromStorage", func(t *testing.T) {
featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ConsistentListFromCache, false) featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ConsistentListFromCache, false)
testCases[opts{}] = true testCases[opts{}] = true
testCases[opts{Limit: 100}] = true testCases[opts{Limit: 100}] = true
testCases[opts{ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan}] = true
testCases[opts{ResourceVersionMatch: metav1.ResourceVersionMatchExact, Limit: 100}] = true
for opt, expectBypass := range testCases { for opt, expectBypass := range testCases {
testGetListCacheBypass(t, storage.ListOptions{ testGetListCacheBypass(t, storage.ListOptions{
ResourceVersion: opt.ResourceVersion, ResourceVersion: opt.ResourceVersion,
@ -288,8 +297,6 @@ func TestGetListCacheBypass(t *testing.T) {
testCases[opts{}] = false testCases[opts{}] = false
testCases[opts{Limit: 100}] = false testCases[opts{Limit: 100}] = false
testCases[opts{ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan}] = false
testCases[opts{ResourceVersionMatch: metav1.ResourceVersionMatchNotOlderThan, Limit: 100}] = false
for opt, expectBypass := range testCases { for opt, expectBypass := range testCases {
testGetListCacheBypass(t, storage.ListOptions{ testGetListCacheBypass(t, storage.ListOptions{
ResourceVersion: opt.ResourceVersion, ResourceVersion: opt.ResourceVersion,