published by bot

(https://github.com/kubernetes/contrib/tree/master/mungegithub) copied from https://github.com/kubernetes/kubernetes.git, branch master, last commit is abed7461722c195f8c77b4c502743e012d19d095
2025-09-25 06:24:59 +00:00 · 2017-01-27 15:19:42 +00:00
parent f427d46f91
commit fb6075f2e0
94 changed files with 138 additions and 14430 deletions
--- a/rest/client_test.go
+++ b/rest/client_test.go
@@ -34,8 +34,10 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/diff"
 	"k8s.io/client-go/pkg/api"
-	"k8s.io/client-go/pkg/api/testapi"
+	"k8s.io/client-go/pkg/api/v1"
 	utiltesting "k8s.io/client-go/util/testing"
+
+	_ "k8s.io/client-go/pkg/api/install"
 )

 type TestParam struct {
@@ -91,7 +93,7 @@ func TestDoRequestFailed(t *testing.T) {
 		Message: " \"\" not found",
 		Details: &metav1.StatusDetails{},
 	}
-	expectedBody, _ := runtime.Encode(testapi.Default.Codec(), status)
+	expectedBody, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), status)
 	fakeHandler := utiltesting.FakeHandler{
 		StatusCode:   404,
 		ResponseBody: string(expectedBody),
@@ -130,7 +132,7 @@ func TestDoRawRequestFailed(t *testing.T) {
 			},
 		},
 	}
-	expectedBody, _ := runtime.Encode(testapi.Default.Codec(), status)
+	expectedBody, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), status)
 	fakeHandler := utiltesting.FakeHandler{
 		StatusCode:   404,
 		ResponseBody: string(expectedBody),
@@ -229,7 +231,7 @@ func validate(testParam TestParam, t *testing.T, body []byte, fakeHandler *utilt
 			t.Errorf("Expected object not to be created")
 		}
 	}
-	statusOut, err := runtime.Decode(testapi.Default.Codec(), body)
+	statusOut, err := runtime.Decode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), body)
 	if testParam.testBody {
 		if testParam.testBodyErrorIsNotNil {
 			if err == nil {
@@ -316,7 +318,7 @@ func TestCreateBackoffManager(t *testing.T) {

 func testServerEnv(t *testing.T, statusCode int) (*httptest.Server, *utiltesting.FakeHandler, *metav1.Status) {
 	status := &metav1.Status{Status: fmt.Sprintf("%s", metav1.StatusSuccess)}
-	expectedBody, _ := runtime.Encode(testapi.Default.Codec(), status)
+	expectedBody, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), status)
 	fakeHandler := utiltesting.FakeHandler{
 		StatusCode:   statusCode,
 		ResponseBody: string(expectedBody),
@@ -331,7 +333,7 @@ func restClient(testServer *httptest.Server) (*RESTClient, error) {
 		Host: testServer.URL,
 		ContentConfig: ContentConfig{
 			GroupVersion:         &api.Registry.GroupOrDie(api.GroupName).GroupVersion,
-			NegotiatedSerializer: testapi.Default.NegotiatedSerializer(),
+			NegotiatedSerializer: api.Codecs,
 		},
 		Username: "user",
 		Password: "pass",
--- a/rest/config_test.go
+++ b/rest/config_test.go
@@ -29,9 +29,10 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/diff"
 	"k8s.io/client-go/pkg/api"
-	"k8s.io/client-go/pkg/api/testapi"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
 	"k8s.io/client-go/util/flowcontrol"
+
+	_ "k8s.io/client-go/pkg/api/install"
 )

 func TestIsConfigTransportTLS(t *testing.T) {
@@ -98,13 +99,13 @@ func TestSetKubernetesDefaultsUserAgent(t *testing.T) {
 }

 func TestRESTClientRequires(t *testing.T) {
-	if _, err := RESTClientFor(&Config{Host: "127.0.0.1", ContentConfig: ContentConfig{NegotiatedSerializer: testapi.Default.NegotiatedSerializer()}}); err == nil {
+	if _, err := RESTClientFor(&Config{Host: "127.0.0.1", ContentConfig: ContentConfig{NegotiatedSerializer: api.Codecs}}); err == nil {
 		t.Errorf("unexpected non-error")
 	}
 	if _, err := RESTClientFor(&Config{Host: "127.0.0.1", ContentConfig: ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion}}); err == nil {
 		t.Errorf("unexpected non-error")
 	}
-	if _, err := RESTClientFor(&Config{Host: "127.0.0.1", ContentConfig: ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion, NegotiatedSerializer: testapi.Default.NegotiatedSerializer()}}); err != nil {
+	if _, err := RESTClientFor(&Config{Host: "127.0.0.1", ContentConfig: ContentConfig{GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion, NegotiatedSerializer: api.Codecs}}); err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}
 }
--- a/rest/request_test.go
+++ b/rest/request_test.go
@@ -43,7 +43,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/diff"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/pkg/api"
-	"k8s.io/client-go/pkg/api/testapi"
 	"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/pkg/util/httpstream"
 	"k8s.io/client-go/pkg/util/intstr"
@@ -51,6 +50,8 @@ import (
 	"k8s.io/client-go/util/clock"
 	"k8s.io/client-go/util/flowcontrol"
 	utiltesting "k8s.io/client-go/util/testing"
+
+	_ "k8s.io/client-go/pkg/api/install"
 )

 func TestNewRequestSetsAccept(t *testing.T) {
@@ -279,18 +280,18 @@ func (obj NotAnAPIObject) SetGroupVersionKind(gvk *schema.GroupVersionKind) {}
 func defaultContentConfig() ContentConfig {
 	return ContentConfig{
 		GroupVersion:         &api.Registry.GroupOrDie(api.GroupName).GroupVersion,
-		NegotiatedSerializer: testapi.Default.NegotiatedSerializer(),
+		NegotiatedSerializer: api.Codecs,
 	}
 }

 func defaultSerializers() Serializers {
 	return Serializers{
-		Encoder:             testapi.Default.Codec(),
-		Decoder:             testapi.Default.Codec(),
-		StreamingSerializer: testapi.Default.Codec(),
+		Encoder:             api.Codecs.LegacyCodec(v1.SchemeGroupVersion),
+		Decoder:             api.Codecs.LegacyCodec(v1.SchemeGroupVersion),
+		StreamingSerializer: api.Codecs.LegacyCodec(v1.SchemeGroupVersion),
 		Framer:              runtime.DefaultFramer,
 		RenegotiatedDecoder: func(contentType string, params map[string]string) (runtime.Decoder, error) {
-			return testapi.Default.Codec(), nil
+			return api.Codecs.LegacyCodec(v1.SchemeGroupVersion), nil
 		},
 	}
 }
@@ -473,7 +474,7 @@ func TestTransformResponseNegotiate(t *testing.T) {
 				Header:     http.Header{"Content-Type": []string{"application/protobuf"}},
 				Body:       ioutil.NopCloser(bytes.NewReader(invalid)),
 			},
-			Decoder: testapi.Default.Codec(),
+			Decoder: api.Codecs.LegacyCodec(v1.SchemeGroupVersion),

 			Called:            true,
 			ExpectContentType: "application/protobuf",
@@ -489,7 +490,7 @@ func TestTransformResponseNegotiate(t *testing.T) {
 				StatusCode: 500,
 				Header:     http.Header{"Content-Type": []string{"application/,others"}},
 			},
-			Decoder: testapi.Default.Codec(),
+			Decoder: api.Codecs.LegacyCodec(v1.SchemeGroupVersion),

 			Error: true,
 			ErrFn: func(err error) bool {
@@ -503,7 +504,7 @@ func TestTransformResponseNegotiate(t *testing.T) {
 				Header:     http.Header{"Content-Type": []string{"text/any"}},
 				Body:       ioutil.NopCloser(bytes.NewReader(invalid)),
 			},
-			Decoder: testapi.Default.Codec(),
+			Decoder: api.Codecs.LegacyCodec(v1.SchemeGroupVersion),
 		},
 		{
 			// no negotiation when no response content type specified
@@ -512,7 +513,7 @@ func TestTransformResponseNegotiate(t *testing.T) {
 				StatusCode: 200,
 				Body:       ioutil.NopCloser(bytes.NewReader(invalid)),
 			},
-			Decoder: testapi.Default.Codec(),
+			Decoder: api.Codecs.LegacyCodec(v1.SchemeGroupVersion),
 		},
 		{
 			// unrecognized content type is not handled
@@ -522,7 +523,7 @@ func TestTransformResponseNegotiate(t *testing.T) {
 				Header:     http.Header{"Content-Type": []string{"application/unrecognized"}},
 				Body:       ioutil.NopCloser(bytes.NewReader(invalid)),
 			},
-			Decoder: testapi.Default.Codec(),
+			Decoder: api.Codecs.LegacyCodec(v1.SchemeGroupVersion),

 			NegotiateErr:      fmt.Errorf("aaaa"),
 			Called:            true,
@@ -785,7 +786,7 @@ func TestRequestWatch(t *testing.T) {
 				client: clientFunc(func(req *http.Request) (*http.Response, error) {
 					return &http.Response{
 						StatusCode: http.StatusUnauthorized,
-						Body: ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(testapi.Default.Codec(), &metav1.Status{
+						Body: ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), &metav1.Status{
 							Status: metav1.StatusFailure,
 							Reason: metav1.StatusReasonUnauthorized,
 						})))),
@@ -892,7 +893,7 @@ func TestRequestStream(t *testing.T) {
 				client: clientFunc(func(req *http.Request) (*http.Response, error) {
 					return &http.Response{
 						StatusCode: http.StatusUnauthorized,
-						Body: ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(testapi.Default.Codec(), &metav1.Status{
+						Body: ioutil.NopCloser(bytes.NewReader([]byte(runtime.EncodeOrDie(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), &metav1.Status{
 							Status: metav1.StatusFailure,
 							Reason: metav1.StatusReasonUnauthorized,
 						})))),
@@ -1021,7 +1022,7 @@ func TestDoRequestNewWay(t *testing.T) {
 		Port:       12345,
 		TargetPort: intstr.FromInt(12345),
 	}}}}
-	expectedBody, _ := runtime.Encode(testapi.Default.Codec(), expectedObj)
+	expectedBody, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), expectedObj)
 	fakeHandler := utiltesting.FakeHandler{
 		StatusCode:   200,
 		ResponseBody: string(expectedBody),
@@ -1045,7 +1046,7 @@ func TestDoRequestNewWay(t *testing.T) {
 	} else if !api.Semantic.DeepDerivative(expectedObj, obj) {
 		t.Errorf("Expected: %#v, got %#v", expectedObj, obj)
 	}
-	requestURL := testapi.Default.ResourcePathWithPrefix("foo/bar", "", "", "baz")
+	requestURL := defaultResourcePathWithPrefix("foo/bar", "", "", "baz")
 	requestURL += "?timeout=1s"
 	fakeHandler.ValidateRequest(t, requestURL, "POST", &reqBody)
 }
@@ -1246,13 +1247,13 @@ func BenchmarkCheckRetryClosesBody(b *testing.B) {

 func TestDoRequestNewWayReader(t *testing.T) {
 	reqObj := &api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}}
-	reqBodyExpected, _ := runtime.Encode(testapi.Default.Codec(), reqObj)
+	reqBodyExpected, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), reqObj)
 	expectedObj := &api.Service{Spec: api.ServiceSpec{Ports: []api.ServicePort{{
 		Protocol:   "TCP",
 		Port:       12345,
 		TargetPort: intstr.FromInt(12345),
 	}}}}
-	expectedBody, _ := runtime.Encode(testapi.Default.Codec(), expectedObj)
+	expectedBody, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), expectedObj)
 	fakeHandler := utiltesting.FakeHandler{
 		StatusCode:   200,
 		ResponseBody: string(expectedBody),
@@ -1279,20 +1280,20 @@ func TestDoRequestNewWayReader(t *testing.T) {
 		t.Errorf("Expected: %#v, got %#v", expectedObj, obj)
 	}
 	tmpStr := string(reqBodyExpected)
-	requestURL := testapi.Default.ResourcePathWithPrefix("foo", "bar", "", "baz")
+	requestURL := defaultResourcePathWithPrefix("foo", "bar", "", "baz")
 	requestURL += "?" + metav1.LabelSelectorQueryParam(api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()) + "=name%3Dfoo&timeout=1s"
 	fakeHandler.ValidateRequest(t, requestURL, "POST", &tmpStr)
 }

 func TestDoRequestNewWayObj(t *testing.T) {
 	reqObj := &api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}}
-	reqBodyExpected, _ := runtime.Encode(testapi.Default.Codec(), reqObj)
+	reqBodyExpected, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), reqObj)
 	expectedObj := &api.Service{Spec: api.ServiceSpec{Ports: []api.ServicePort{{
 		Protocol:   "TCP",
 		Port:       12345,
 		TargetPort: intstr.FromInt(12345),
 	}}}}
-	expectedBody, _ := runtime.Encode(testapi.Default.Codec(), expectedObj)
+	expectedBody, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), expectedObj)
 	fakeHandler := utiltesting.FakeHandler{
 		StatusCode:   200,
 		ResponseBody: string(expectedBody),
@@ -1319,14 +1320,14 @@ func TestDoRequestNewWayObj(t *testing.T) {
 		t.Errorf("Expected: %#v, got %#v", expectedObj, obj)
 	}
 	tmpStr := string(reqBodyExpected)
-	requestURL := testapi.Default.ResourcePath("foo", "", "bar/baz")
+	requestURL := defaultResourcePathWithPrefix("", "foo", "", "bar/baz")
 	requestURL += "?" + metav1.LabelSelectorQueryParam(api.Registry.GroupOrDie(api.GroupName).GroupVersion.String()) + "=name%3Dfoo&timeout=1s"
 	fakeHandler.ValidateRequest(t, requestURL, "POST", &tmpStr)
 }

 func TestDoRequestNewWayFile(t *testing.T) {
 	reqObj := &api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}}
-	reqBodyExpected, err := runtime.Encode(testapi.Default.Codec(), reqObj)
+	reqBodyExpected, err := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), reqObj)
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}
@@ -1348,7 +1349,7 @@ func TestDoRequestNewWayFile(t *testing.T) {
 		Port:       12345,
 		TargetPort: intstr.FromInt(12345),
 	}}}}
-	expectedBody, _ := runtime.Encode(testapi.Default.Codec(), expectedObj)
+	expectedBody, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), expectedObj)
 	fakeHandler := utiltesting.FakeHandler{
 		StatusCode:   200,
 		ResponseBody: string(expectedBody),
@@ -1376,14 +1377,14 @@ func TestDoRequestNewWayFile(t *testing.T) {
 		t.Errorf("expected object was created")
 	}
 	tmpStr := string(reqBodyExpected)
-	requestURL := testapi.Default.ResourcePathWithPrefix("foo/bar/baz", "", "", "")
+	requestURL := defaultResourcePathWithPrefix("foo/bar/baz", "", "", "")
 	requestURL += "?timeout=1s"
 	fakeHandler.ValidateRequest(t, requestURL, "POST", &tmpStr)
 }

 func TestWasCreated(t *testing.T) {
 	reqObj := &api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}}
-	reqBodyExpected, err := runtime.Encode(testapi.Default.Codec(), reqObj)
+	reqBodyExpected, err := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), reqObj)
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}
@@ -1393,7 +1394,7 @@ func TestWasCreated(t *testing.T) {
 		Port:       12345,
 		TargetPort: intstr.FromInt(12345),
 	}}}}
-	expectedBody, _ := runtime.Encode(testapi.Default.Codec(), expectedObj)
+	expectedBody, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), expectedObj)
 	fakeHandler := utiltesting.FakeHandler{
 		StatusCode:   201,
 		ResponseBody: string(expectedBody),
@@ -1422,7 +1423,7 @@ func TestWasCreated(t *testing.T) {
 	}

 	tmpStr := string(reqBodyExpected)
-	requestURL := testapi.Default.ResourcePathWithPrefix("foo/bar/baz", "", "", "")
+	requestURL := defaultResourcePathWithPrefix("foo/bar/baz", "", "", "")
 	requestURL += "?timeout=1s"
 	fakeHandler.ValidateRequest(t, requestURL, "PUT", &tmpStr)
 }
@@ -1520,7 +1521,7 @@ func TestBody(t *testing.T) {
 	const data = "test payload"

 	obj := &api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}}
-	bodyExpected, _ := runtime.Encode(testapi.Default.Codec(), obj)
+	bodyExpected, _ := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), obj)

 	f, err := ioutil.TempFile("", "test_body")
 	if err != nil {
@@ -1598,7 +1599,7 @@ func TestWatch(t *testing.T) {
 		w.WriteHeader(http.StatusOK)
 		flusher.Flush()

-		encoder := restclientwatch.NewEncoder(streaming.NewEncoder(w, testapi.Default.Codec()), testapi.Default.Codec())
+		encoder := restclientwatch.NewEncoder(streaming.NewEncoder(w, api.Codecs.LegacyCodec(v1.SchemeGroupVersion)), api.Codecs.LegacyCodec(v1.SchemeGroupVersion))
 		for _, item := range table {
 			if err := encoder.Encode(&watch.Event{Type: item.t, Object: item.obj}); err != nil {
 				panic(err)
@@ -1672,7 +1673,7 @@ func testRESTClient(t testing.TB, srv *httptest.Server) *RESTClient {
 			t.Fatalf("failed to parse test URL: %v", err)
 		}
 	}
-	versionedAPIPath := testapi.Default.ResourcePath("", "", "")
+	versionedAPIPath := defaultResourcePathWithPrefix("", "", "", "")
 	client, err := NewRESTClient(baseURL, versionedAPIPath, defaultContentConfig(), 0, 0, nil, nil)
 	if err != nil {
 		t.Fatalf("failed to create a client: %v", err)
@@ -1708,3 +1709,24 @@ func TestDoContext(t *testing.T) {
 		t.Fatal("Expected context cancellation error")
 	}
 }
+
+func defaultResourcePathWithPrefix(prefix, resource, namespace, name string) string {
+	var path string
+	path = "/api/" + v1.SchemeGroupVersion.Version
+
+	if prefix != "" {
+		path = path + "/" + prefix
+	}
+	if namespace != "" {
+		path = path + "/namespaces/" + namespace
+	}
+	// Resource names are lower case.
+	resource = strings.ToLower(resource)
+	if resource != "" {
+		path = path + "/" + resource
+	}
+	if name != "" {
+		path = path + "/" + name
+	}
+	return path
+}
--- a/rest/watch/decoder_test.go
+++ b/rest/watch/decoder_test.go
@@ -28,8 +28,10 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/pkg/api"
-	"k8s.io/client-go/pkg/api/testapi"
+	"k8s.io/client-go/pkg/api/v1"
 	restclientwatch "k8s.io/client-go/rest/watch"
+
+	_ "k8s.io/client-go/pkg/api/install"
 )

 func TestDecoder(t *testing.T) {
@@ -37,13 +39,13 @@ func TestDecoder(t *testing.T) {

 	for _, eventType := range table {
 		out, in := io.Pipe()
-		codec := testapi.Default.Codec()
+		codec := api.Codecs.LegacyCodec(v1.SchemeGroupVersion)
 		decoder := restclientwatch.NewDecoder(streaming.NewDecoder(out, codec), codec)

 		expect := &api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}}
 		encoder := json.NewEncoder(in)
 		go func() {
-			data, err := runtime.Encode(testapi.Default.Codec(), expect)
+			data, err := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion), expect)
 			if err != nil {
 				t.Fatalf("Unexpected error %v", err)
 			}
@@ -90,7 +92,7 @@ func TestDecoder(t *testing.T) {

 func TestDecoder_SourceClose(t *testing.T) {
 	out, in := io.Pipe()
-	codec := testapi.Default.Codec()
+	codec := api.Codecs.LegacyCodec(v1.SchemeGroupVersion)
 	decoder := restclientwatch.NewDecoder(streaming.NewDecoder(out, codec), codec)

 	done := make(chan struct{})
--- a/rest/watch/encoder_test.go
+++ b/rest/watch/encoder_test.go
@@ -26,8 +26,10 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/pkg/api"
-	"k8s.io/client-go/pkg/api/testapi"
+	"k8s.io/client-go/pkg/api/v1"
 	restclientwatch "k8s.io/client-go/rest/watch"
+
+	_ "k8s.io/client-go/pkg/api/install"
 )

 func TestEncodeDecodeRoundTrip(t *testing.T) {
@@ -39,17 +41,17 @@ func TestEncodeDecodeRoundTrip(t *testing.T) {
 		{
 			watch.Added,
 			&api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}},
-			testapi.Default.Codec(),
+			api.Codecs.LegacyCodec(v1.SchemeGroupVersion),
 		},
 		{
 			watch.Modified,
 			&api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}},
-			testapi.Default.Codec(),
+			api.Codecs.LegacyCodec(v1.SchemeGroupVersion),
 		},
 		{
 			watch.Deleted,
 			&api.Pod{ObjectMeta: metav1.ObjectMeta{Name: "foo"}},
-			testapi.Default.Codec(),
+			api.Codecs.LegacyCodec(v1.SchemeGroupVersion),
 		},
 	}
 	for i, testCase := range testCases {