mirror of
https://github.com/kubernetes/client-go.git
synced 2025-09-25 22:48:22 +00:00
client-go/dynamic: rm watchlist
Kubernetes-commit: 3038f3530d1b35d896826673acdae0bd55bd769c
This commit is contained in:
Lukasz Szaszkiewicz
committed by
Kubernetes Publisher
Kubernetes Publisher
parent
c828854c20
commit
6708db95c9
@@ -19,7 +19,6 @@ package dynamic
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/base64"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
@@ -28,8 +27,6 @@ import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/google/go-cmp/cmp"
|
||||
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
@@ -37,8 +34,6 @@ import (
|
||||
"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
"k8s.io/apimachinery/pkg/watch"
|
||||
clientfeatures "k8s.io/client-go/features"
|
||||
clientfeaturestesting "k8s.io/client-go/features/testing"
|
||||
restclient "k8s.io/client-go/rest"
|
||||
restclientwatch "k8s.io/client-go/rest/watch"
|
||||
)
|
||||
@@ -159,179 +154,6 @@ func TestList(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestWatchList(t *testing.T) {
|
||||
clientfeaturestesting.SetFeatureDuringTest(t, clientfeatures.WatchListClient, true)
|
||||
|
||||
type requestParam struct {
|
||||
Path string
|
||||
Query string
|
||||
}
|
||||
|
||||
scenarios := []struct {
|
||||
name string
|
||||
namespace string
|
||||
watchResponse []watch.Event
|
||||
listResponse []byte
|
||||
|
||||
expectedRequestParams []requestParam
|
||||
expectedList *unstructured.UnstructuredList
|
||||
}{
|
||||
{
|
||||
name: "watch-list request for cluster wide resource",
|
||||
watchResponse: []watch.Event{
|
||||
{Type: watch.Added, Object: getObject("gtest/vTest", "rTest", "item1")},
|
||||
{Type: watch.Added, Object: getObject("gtest/vTest", "rTest", "item2")},
|
||||
{Type: watch.Bookmark, Object: func() runtime.Object {
|
||||
obj := getObject("gtest/vTest", "rTest", "item2")
|
||||
obj.SetResourceVersion("10")
|
||||
obj.SetAnnotations(map[string]string{
|
||||
metav1.InitialEventsAnnotationKey: "true",
|
||||
metav1.InitialEventsListBlueprintAnnotationKey: base64.StdEncoding.EncodeToString(getJSON("vTest", "rTests", "")),
|
||||
})
|
||||
return obj
|
||||
}()},
|
||||
},
|
||||
expectedRequestParams: []requestParam{
|
||||
{
|
||||
Path: "/apis/gtest/vtest/rtest",
|
||||
Query: "allowWatchBookmarks=true&resourceVersionMatch=NotOlderThan&sendInitialEvents=true&watch=true",
|
||||
},
|
||||
},
|
||||
expectedList: &unstructured.UnstructuredList{
|
||||
Object: map[string]interface{}{
|
||||
"apiVersion": "vTest",
|
||||
"kind": "rTests",
|
||||
"metadata": map[string]interface{}{
|
||||
"name": "",
|
||||
"resourceVersion": "10",
|
||||
},
|
||||
},
|
||||
Items: []unstructured.Unstructured{
|
||||
*getObject("gtest/vTest", "rTest", "item1"),
|
||||
*getObject("gtest/vTest", "rTest", "item2"),
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "watch-list request for namespaced watch resource",
|
||||
namespace: "nstest",
|
||||
watchResponse: []watch.Event{
|
||||
{Type: watch.Added, Object: getObject("gtest/vTest", "rTest", "item1")},
|
||||
{Type: watch.Bookmark, Object: func() runtime.Object {
|
||||
obj := getObject("gtest/vTest", "rTest", "item2")
|
||||
obj.SetResourceVersion("39")
|
||||
obj.SetAnnotations(map[string]string{
|
||||
metav1.InitialEventsAnnotationKey: "true",
|
||||
metav1.InitialEventsListBlueprintAnnotationKey: base64.StdEncoding.EncodeToString(getJSON("vTest", "rTests", "")),
|
||||
})
|
||||
return obj
|
||||
}()},
|
||||
},
|
||||
expectedRequestParams: []requestParam{
|
||||
{
|
||||
Path: "/apis/gtest/vtest/namespaces/nstest/rtest",
|
||||
Query: "allowWatchBookmarks=true&resourceVersionMatch=NotOlderThan&sendInitialEvents=true&watch=true",
|
||||
},
|
||||
},
|
||||
expectedList: &unstructured.UnstructuredList{
|
||||
Object: map[string]interface{}{
|
||||
"apiVersion": "vTest",
|
||||
"kind": "rTests",
|
||||
"metadata": map[string]interface{}{
|
||||
"name": "",
|
||||
"resourceVersion": "39",
|
||||
},
|
||||
},
|
||||
Items: []unstructured.Unstructured{
|
||||
*getObject("gtest/vTest", "rTest", "item1"),
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "watch-list request falls back to standard list on any error",
|
||||
namespace: "nstest",
|
||||
// watchList method in client-go expect only watch.Add and watch.Bookmark events
|
||||
// receiving watch.Error will cause this method to report an error which will
|
||||
// trigger the fallback logic
|
||||
watchResponse: []watch.Event{
|
||||
{Type: watch.Error, Object: getObject("gtest/vTest", "rTest", "item1")},
|
||||
},
|
||||
listResponse: getListJSON("vTest", "UnstructuredList",
|
||||
getJSON("gtest/vTest", "rTest", "item1"),
|
||||
getJSON("gtest/vTest", "rTest", "item2")),
|
||||
expectedRequestParams: []requestParam{
|
||||
// a watch-list request first
|
||||
{
|
||||
Path: "/apis/gtest/vtest/namespaces/nstest/rtest",
|
||||
Query: "allowWatchBookmarks=true&resourceVersionMatch=NotOlderThan&sendInitialEvents=true&watch=true",
|
||||
},
|
||||
// a standard list request second
|
||||
{
|
||||
Path: "/apis/gtest/vtest/namespaces/nstest/rtest",
|
||||
},
|
||||
},
|
||||
expectedList: &unstructured.UnstructuredList{
|
||||
Object: map[string]interface{}{
|
||||
"apiVersion": "vTest",
|
||||
"kind": "UnstructuredList",
|
||||
},
|
||||
Items: []unstructured.Unstructured{
|
||||
*getObject("gtest/vTest", "rTest", "item1"),
|
||||
*getObject("gtest/vTest", "rTest", "item2"),
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
for _, scenario := range scenarios {
|
||||
t.Run(scenario.name, func(t *testing.T) {
|
||||
var actualRequestParams []requestParam
|
||||
resource := schema.GroupVersionResource{Group: "gtest", Version: "vtest", Resource: "rtest"}
|
||||
cl, srv, err := getClientServer(func(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != "GET" {
|
||||
t.Errorf("unexpected HTTP method %s. expected GET", r.Method)
|
||||
}
|
||||
actualRequestParams = append(actualRequestParams, requestParam{
|
||||
Path: r.URL.Path,
|
||||
Query: r.URL.RawQuery,
|
||||
})
|
||||
|
||||
w.Header().Set("Content-Type", runtime.ContentTypeJSON)
|
||||
// handle LIST response
|
||||
if len(scenario.listResponse) > 0 {
|
||||
if _, err := w.Write(scenario.listResponse); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// handle WATCH response
|
||||
enc := restclientwatch.NewEncoder(streaming.NewEncoder(w, unstructured.UnstructuredJSONScheme), unstructured.UnstructuredJSONScheme)
|
||||
for _, e := range scenario.watchResponse {
|
||||
if err := enc.Encode(&e); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error when creating test client and server: %v", err)
|
||||
}
|
||||
defer srv.Close()
|
||||
|
||||
actualList, err := cl.Resource(resource).Namespace(scenario.namespace).List(context.TODO(), metav1.ListOptions{})
|
||||
if err != nil {
|
||||
t.Fatalf("unexpected error: %v", err)
|
||||
}
|
||||
|
||||
if !cmp.Equal(scenario.expectedRequestParams, actualRequestParams) {
|
||||
t.Fatalf("unexpected request params: %v", cmp.Diff(scenario.expectedRequestParams, actualRequestParams))
|
||||
}
|
||||
if !cmp.Equal(scenario.expectedList, actualList) {
|
||||
t.Errorf("received expected list, diff: %s", cmp.Diff(scenario.expectedList, actualList))
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestGet(t *testing.T) {
|
||||
tcs := []struct {
|
||||
resource string
|
||||
|
||||
Reference in New Issue
Block a user