From 2ee3dfe415a617c369660365ae98f64889575574 Mon Sep 17 00:00:00 2001 From: deads2k Date: Mon, 30 Nov 2015 15:28:48 -0500 Subject: [PATCH] update testapi to eliminate redundant fields --- contrib/mesos/pkg/executor/executor_test.go | 2 +- .../scheduler/integration/integration_test.go | 2 +- pkg/api/conversion_test.go | 12 +- pkg/api/copy_test.go | 2 +- pkg/api/serialization_test.go | 2 +- pkg/api/testapi/testapi.go | 130 +++++++----------- pkg/api/testapi/testapi_test.go | 20 +-- pkg/api/unversioned/register.go | 7 + pkg/api/validation/schema_test.go | 5 +- pkg/api/validation/validation_test.go | 10 +- pkg/client/cache/listwatch_test.go | 4 +- pkg/client/unversioned/client_test.go | 4 +- .../clientcmd/client_config_test.go | 6 +- pkg/client/unversioned/events_test.go | 6 +- .../unversioned/helper_blackbox_test.go | 18 +-- pkg/client/unversioned/helper_test.go | 18 +-- pkg/client/unversioned/nodes_test.go | 2 +- pkg/client/unversioned/pods_test.go | 2 +- pkg/client/unversioned/request_test.go | 4 +- pkg/client/unversioned/restclient_test.go | 4 +- pkg/client/unversioned/services_test.go | 2 +- pkg/controller/controller_utils_test.go | 2 +- pkg/controller/daemon/controller_test.go | 6 +- .../endpoint/endpoints_controller_test.go | 2 +- .../replication_controller_test.go | 2 +- pkg/kubectl/cmd/attach_test.go | 4 +- pkg/kubectl/cmd/cmd_test.go | 2 +- pkg/kubectl/cmd/config/config_test.go | 4 +- pkg/kubectl/cmd/delete_test.go | 4 +- pkg/kubectl/cmd/exec_test.go | 2 +- pkg/kubectl/cmd/get_test.go | 26 ++-- pkg/kubectl/cmd/portforward_test.go | 4 +- pkg/kubectl/cmd/util/factory_test.go | 2 +- pkg/kubectl/cmd/util/helpers_test.go | 10 +- pkg/kubectl/resource/builder_test.go | 6 +- pkg/kubectl/resource/helper_test.go | 4 +- pkg/kubectl/resource_printer_test.go | 2 +- pkg/kubelet/config/http_test.go | 10 +- pkg/kubelet/container/ref_test.go | 14 +- pkg/kubelet/kubelet_test.go | 8 +- pkg/master/master_test.go | 8 +- pkg/registry/event/strategy_test.go | 4 +- pkg/runtime/helper_test.go | 2 +- pkg/runtime/unstructured_test.go | 8 +- pkg/storage/etcd/etcd_helper_test.go | 2 +- test/e2e/persistent_volumes.go | 2 +- test/e2e/proxy.go | 2 +- test/integration/auth_test.go | 16 +-- test/integration/extender_test.go | 2 +- test/integration/framework/master_utils.go | 4 +- test/integration/secret_test.go | 4 +- 51 files changed, 203 insertions(+), 227 deletions(-) diff --git a/contrib/mesos/pkg/executor/executor_test.go b/contrib/mesos/pkg/executor/executor_test.go index 1a1acb6f1bd..27f1654f69e 100644 --- a/contrib/mesos/pkg/executor/executor_test.go +++ b/contrib/mesos/pkg/executor/executor_test.go @@ -456,7 +456,7 @@ func TestExecutorFrameworkMessage(t *testing.T) { func NewTestPod(i int) *api.Pod { name := fmt.Sprintf("pod%d", i) return &api.Pod{ - TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.Version()}, + TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.GroupVersion().String()}, ObjectMeta: api.ObjectMeta{ Name: name, Namespace: api.NamespaceDefault, diff --git a/contrib/mesos/pkg/scheduler/integration/integration_test.go b/contrib/mesos/pkg/scheduler/integration/integration_test.go index 2cf4902c774..dfdb39934b7 100644 --- a/contrib/mesos/pkg/scheduler/integration/integration_test.go +++ b/contrib/mesos/pkg/scheduler/integration/integration_test.go @@ -264,7 +264,7 @@ func NewTestPod() (*api.Pod, int) { currentPodNum = currentPodNum + 1 name := fmt.Sprintf("pod%d", currentPodNum) return &api.Pod{ - TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.Version()}, + TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.GroupVersion().String()}, ObjectMeta: api.ObjectMeta{ Name: name, Namespace: api.NamespaceDefault, diff --git a/pkg/api/conversion_test.go b/pkg/api/conversion_test.go index ecbd3867fc9..5ac3fac91d1 100644 --- a/pkg/api/conversion_test.go +++ b/pkg/api/conversion_test.go @@ -37,11 +37,11 @@ func BenchmarkPodConversion(b *testing.B) { scheme := api.Scheme.Raw() var result *api.Pod for i := 0; i < b.N; i++ { - versionedObj, err := scheme.ConvertToVersion(&pod, testapi.Default.Version()) + versionedObj, err := scheme.ConvertToVersion(&pod, testapi.Default.GroupVersion().String()) if err != nil { b.Fatalf("Conversion error: %v", err) } - obj, err := scheme.ConvertToVersion(versionedObj, scheme.InternalVersions[testapi.Default.Group].String()) + obj, err := scheme.ConvertToVersion(versionedObj, scheme.InternalVersions[testapi.Default.GroupVersion().Group].String()) if err != nil { b.Fatalf("Conversion error: %v", err) } @@ -65,11 +65,11 @@ func BenchmarkNodeConversion(b *testing.B) { scheme := api.Scheme.Raw() var result *api.Node for i := 0; i < b.N; i++ { - versionedObj, err := scheme.ConvertToVersion(&node, testapi.Default.Version()) + versionedObj, err := scheme.ConvertToVersion(&node, testapi.Default.GroupVersion().String()) if err != nil { b.Fatalf("Conversion error: %v", err) } - obj, err := scheme.ConvertToVersion(versionedObj, scheme.InternalVersions[testapi.Default.Group].String()) + obj, err := scheme.ConvertToVersion(versionedObj, scheme.InternalVersions[testapi.Default.GroupVersion().Group].String()) if err != nil { b.Fatalf("Conversion error: %v", err) } @@ -93,11 +93,11 @@ func BenchmarkReplicationControllerConversion(b *testing.B) { scheme := api.Scheme.Raw() var result *api.ReplicationController for i := 0; i < b.N; i++ { - versionedObj, err := scheme.ConvertToVersion(&replicationController, testapi.Default.Version()) + versionedObj, err := scheme.ConvertToVersion(&replicationController, testapi.Default.GroupVersion().String()) if err != nil { b.Fatalf("Conversion error: %v", err) } - obj, err := scheme.ConvertToVersion(versionedObj, scheme.InternalVersions[testapi.Default.Group].String()) + obj, err := scheme.ConvertToVersion(versionedObj, scheme.InternalVersions[testapi.Default.GroupVersion().Group].String()) if err != nil { b.Fatalf("Conversion error: %v", err) } diff --git a/pkg/api/copy_test.go b/pkg/api/copy_test.go index b5abf9864e8..efd055e40dc 100644 --- a/pkg/api/copy_test.go +++ b/pkg/api/copy_test.go @@ -60,7 +60,7 @@ func doDeepCopyTest(t *testing.T, version, kind string, f *fuzz.Fuzzer) { func TestDeepCopySingleType(t *testing.T) { for i := 0; i < *fuzzIters; i++ { - for _, version := range []string{"", testapi.Default.Version()} { + for _, version := range []string{"", testapi.Default.GroupVersion().String()} { f := apitesting.FuzzerFor(t, version, rand.NewSource(rand.Int63())) doDeepCopyTest(t, version, "Pod", f) } diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go index 40f0cb3cef8..7bcf597ebef 100644 --- a/pkg/api/serialization_test.go +++ b/pkg/api/serialization_test.go @@ -101,7 +101,7 @@ func roundTripSame(t *testing.T, item runtime.Object, except ...string) { seed := rand.Int63() fuzzInternalObject(t, testapi.Default.InternalGroupVersion().String(), item, seed) - version := testapi.Default.VersionUnderTest + version := testapi.Default.GroupVersion().String() codecs := []runtime.Codec{} for _, fn := range codecsToTest { codec, err := fn(version, item) diff --git a/pkg/api/testapi/testapi.go b/pkg/api/testapi/testapi.go index f08bb667362..af3cf209761 100644 --- a/pkg/api/testapi/testapi.go +++ b/pkg/api/testapi/testapi.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/unversioned" - apiutil "k8s.io/kubernetes/pkg/api/util" + "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/runtime" ) @@ -41,68 +41,57 @@ var ( ) type TestGroup struct { - // Name of the group - Group string - // Version of the group Group under test - VersionUnderTest string - // Group and Version. In most cases equals to Group + "/" + VersionUnverTest - GroupVersionUnderTest string + externalGroupVersion unversioned.GroupVersion + internalGroupVersion unversioned.GroupVersion } func init() { kubeTestAPI := os.Getenv("KUBE_TEST_API") if kubeTestAPI != "" { testGroupVersions := strings.Split(kubeTestAPI, ",") - for _, groupVersion := range testGroupVersions { - // TODO: caesarxuchao: the apiutil package is hacky, it will be replaced - // by a following PR. - Groups[apiutil.GetGroup(groupVersion)] = - TestGroup{apiutil.GetGroup(groupVersion), apiutil.GetVersion(groupVersion), groupVersion} + for _, gvString := range testGroupVersions { + groupVersion := unversioned.ParseGroupVersionOrDie(gvString) + + Groups[groupVersion.Group] = TestGroup{ + externalGroupVersion: groupVersion, + internalGroupVersion: unversioned.GroupVersion{Group: groupVersion.Group}, + } } } - // TODO: caesarxuchao: we need a central place to store all available API - // groups and their metadata. - if _, ok := Groups[""]; !ok { - // TODO: The second latest.GroupOrDie("").GroupVersion.Version will be latest.GroupVersion after we - // have multiple group support - Groups[""] = TestGroup{"", latest.GroupOrDie("").GroupVersion.Version, latest.GroupOrDie("").GroupVersion.String()} + if _, ok := Groups[api.SchemeGroupVersion.Group]; !ok { + Groups[api.SchemeGroupVersion.Group] = TestGroup{ + externalGroupVersion: unversioned.GroupVersion{Group: api.SchemeGroupVersion.Group, Version: latest.GroupOrDie(api.SchemeGroupVersion.Group).GroupVersion.Version}, + internalGroupVersion: api.SchemeGroupVersion, + } } - if _, ok := Groups["extensions"]; !ok { - Groups["extensions"] = TestGroup{"extensions", latest.GroupOrDie("extensions").GroupVersion.Version, latest.GroupOrDie("extensions").GroupVersion.String()} + if _, ok := Groups[extensions.SchemeGroupVersion.Group]; !ok { + Groups[extensions.SchemeGroupVersion.Group] = TestGroup{ + externalGroupVersion: unversioned.GroupVersion{Group: extensions.SchemeGroupVersion.Group, Version: latest.GroupOrDie(extensions.SchemeGroupVersion.Group).GroupVersion.Version}, + internalGroupVersion: extensions.SchemeGroupVersion, + } } - Default = Groups[""] - Extensions = Groups["extensions"] -} - -// Version returns the API version to test against, as set by the KUBE_TEST_API env var. -func (g TestGroup) Version() string { - return g.VersionUnderTest -} - -// GroupAndVersion returns the API version to test against for a group, as set -// by the KUBE_TEST_API env var. -// Return value is in the form of "group/version". -func (g TestGroup) GroupAndVersion() string { - return g.GroupVersionUnderTest + Default = Groups[api.SchemeGroupVersion.Group] + Extensions = Groups[extensions.SchemeGroupVersion.Group] } func (g TestGroup) GroupVersion() *unversioned.GroupVersion { - return &unversioned.GroupVersion{Group: g.Group, Version: g.VersionUnderTest} + copyOfGroupVersion := g.externalGroupVersion + return ©OfGroupVersion } // InternalGroupVersion returns the group,version used to identify the internal // types for this API func (g TestGroup) InternalGroupVersion() unversioned.GroupVersion { - return unversioned.GroupVersion{Group: g.Group} + return g.internalGroupVersion } // Codec returns the codec for the API version to test against, as set by the // KUBE_TEST_API env var. func (g TestGroup) Codec() runtime.Codec { // TODO: caesarxuchao: Restructure the body once we have a central `latest`. - interfaces, err := latest.GroupOrDie(g.Group).InterfacesFor(g.GroupVersionUnderTest) + interfaces, err := latest.GroupOrDie(g.externalGroupVersion.Group).InterfacesFor(g.externalGroupVersion.String()) if err != nil { panic(err) } @@ -112,62 +101,39 @@ func (g TestGroup) Codec() runtime.Codec { // Converter returns the api.Scheme for the API version to test against, as set by the // KUBE_TEST_API env var. func (g TestGroup) Converter() runtime.ObjectConvertor { - // TODO: caesarxuchao: Restructure the body once we have a central `latest`. - if g.Group == "" { - interfaces, err := latest.GroupOrDie("").InterfacesFor(g.VersionUnderTest) - if err != nil { - panic(err) - } - return interfaces.ObjectConvertor + interfaces, err := latest.GroupOrDie(g.externalGroupVersion.Group).InterfacesFor(g.externalGroupVersion.String()) + if err != nil { + panic(err) } - if g.Group == "extensions" { - interfaces, err := latest.GroupOrDie("extensions").InterfacesFor(g.VersionUnderTest) - if err != nil { - panic(err) - } - return interfaces.ObjectConvertor - } - panic(fmt.Errorf("cannot test group %s", g.Group)) - + return interfaces.ObjectConvertor } // MetadataAccessor returns the MetadataAccessor for the API version to test against, // as set by the KUBE_TEST_API env var. func (g TestGroup) MetadataAccessor() meta.MetadataAccessor { - // TODO: caesarxuchao: Restructure the body once we have a central `latest`. - if g.Group == "" { - interfaces, err := latest.GroupOrDie("").InterfacesFor(g.VersionUnderTest) - if err != nil { - panic(err) - } - return interfaces.MetadataAccessor + interfaces, err := latest.GroupOrDie(g.externalGroupVersion.Group).InterfacesFor(g.externalGroupVersion.String()) + if err != nil { + panic(err) } - if g.Group == "extensions" { - interfaces, err := latest.GroupOrDie("extensions").InterfacesFor(g.VersionUnderTest) - if err != nil { - panic(err) - } - return interfaces.MetadataAccessor - } - panic(fmt.Errorf("cannot test group %s", g.Group)) + return interfaces.MetadataAccessor } // SelfLink returns a self link that will appear to be for the version Version(). // 'resource' should be the resource path, e.g. "pods" for the Pod type. 'name' should be // empty for lists. func (g TestGroup) SelfLink(resource, name string) string { - if g.Group == "" { + if g.externalGroupVersion.Group == api.SchemeGroupVersion.Group { if name == "" { - return fmt.Sprintf("/api/%s/%s", g.Version(), resource) + return fmt.Sprintf("/api/%s/%s", g.externalGroupVersion.Version, resource) } - return fmt.Sprintf("/api/%s/%s/%s", g.Version(), resource, name) + return fmt.Sprintf("/api/%s/%s/%s", g.externalGroupVersion.Version, resource, name) } else { // TODO: will need a /apis prefix once we have proper multi-group // support if name == "" { - return fmt.Sprintf("/apis/%s/%s/%s", g.Group, g.Version(), resource) + return fmt.Sprintf("/apis/%s/%s/%s", g.externalGroupVersion.Group, g.externalGroupVersion.Version, resource) } - return fmt.Sprintf("/apis/%s/%s/%s/%s", g.Group, g.Version(), resource, name) + return fmt.Sprintf("/apis/%s/%s/%s/%s", g.externalGroupVersion.Group, g.externalGroupVersion.Version, resource, name) } } @@ -176,12 +142,12 @@ func (g TestGroup) SelfLink(resource, name string) string { // /api/v1/watch/namespaces/foo/pods/pod0 for v1. func (g TestGroup) ResourcePathWithPrefix(prefix, resource, namespace, name string) string { var path string - if len(g.Group) == 0 { - path = "/api/" + g.Version() + if g.externalGroupVersion.Group == api.SchemeGroupVersion.Group { + path = "/api/" + g.externalGroupVersion.Version } else { // TODO: switch back once we have proper multiple group support // path = "/apis/" + g.Group + "/" + Version(group...) - path = "/apis/" + g.Group + "/" + g.Version() + path = "/apis/" + g.externalGroupVersion.Group + "/" + g.externalGroupVersion.Version } if prefix != "" { @@ -209,28 +175,28 @@ func (g TestGroup) ResourcePath(resource, namespace, name string) string { } func (g TestGroup) RESTMapper() meta.RESTMapper { - return latest.GroupOrDie(g.Group).RESTMapper + return latest.GroupOrDie(g.externalGroupVersion.Group).RESTMapper } // Get codec based on runtime.Object func GetCodecForObject(obj runtime.Object) (runtime.Codec, error) { - gvk, err := api.Scheme.ObjectKind(obj) + kind, err := api.Scheme.ObjectKind(obj) if err != nil { return nil, fmt.Errorf("unexpected encoding error: %v", err) } for _, group := range Groups { - if group.GroupVersion().Group != gvk.Group { + if group.GroupVersion().Group != kind.Group { continue } - if api.Scheme.Recognizes(gvk) { + if api.Scheme.Recognizes(kind) { return group.Codec(), nil } } // Codec used for unversioned types - if api.Scheme.Recognizes(gvk) { + if api.Scheme.Recognizes(kind) { return api.Codec, nil } - return nil, fmt.Errorf("unexpected kind: %v", gvk) + return nil, fmt.Errorf("unexpected kind: %v", kind) } diff --git a/pkg/api/testapi/testapi_test.go b/pkg/api/testapi/testapi_test.go index 056c769709e..b90ea579ab6 100644 --- a/pkg/api/testapi/testapi_test.go +++ b/pkg/api/testapi/testapi_test.go @@ -20,6 +20,8 @@ import ( "testing" ) +// TODO these tests don't add much value for testing things that have groups + func TestResourcePathWithPrefix(t *testing.T) { testCases := []struct { prefix string @@ -28,11 +30,11 @@ func TestResourcePathWithPrefix(t *testing.T) { name string expected string }{ - {"prefix", "resource", "mynamespace", "myresource", "/api/" + Default.Version() + "/prefix/namespaces/mynamespace/resource/myresource"}, - {"prefix", "resource", "", "myresource", "/api/" + Default.Version() + "/prefix/resource/myresource"}, - {"prefix", "resource", "mynamespace", "", "/api/" + Default.Version() + "/prefix/namespaces/mynamespace/resource"}, - {"prefix", "resource", "", "", "/api/" + Default.Version() + "/prefix/resource"}, - {"", "resource", "mynamespace", "myresource", "/api/" + Default.Version() + "/namespaces/mynamespace/resource/myresource"}, + {"prefix", "resource", "mynamespace", "myresource", "/api/" + Default.GroupVersion().Version + "/prefix/namespaces/mynamespace/resource/myresource"}, + {"prefix", "resource", "", "myresource", "/api/" + Default.GroupVersion().Version + "/prefix/resource/myresource"}, + {"prefix", "resource", "mynamespace", "", "/api/" + Default.GroupVersion().Version + "/prefix/namespaces/mynamespace/resource"}, + {"prefix", "resource", "", "", "/api/" + Default.GroupVersion().Version + "/prefix/resource"}, + {"", "resource", "mynamespace", "myresource", "/api/" + Default.GroupVersion().Version + "/namespaces/mynamespace/resource/myresource"}, } for _, item := range testCases { if actual := Default.ResourcePathWithPrefix(item.prefix, item.resource, item.namespace, item.name); actual != item.expected { @@ -48,10 +50,10 @@ func TestResourcePath(t *testing.T) { name string expected string }{ - {"resource", "mynamespace", "myresource", "/api/" + Default.Version() + "/namespaces/mynamespace/resource/myresource"}, - {"resource", "", "myresource", "/api/" + Default.Version() + "/resource/myresource"}, - {"resource", "mynamespace", "", "/api/" + Default.Version() + "/namespaces/mynamespace/resource"}, - {"resource", "", "", "/api/" + Default.Version() + "/resource"}, + {"resource", "mynamespace", "myresource", "/api/" + Default.GroupVersion().Version + "/namespaces/mynamespace/resource/myresource"}, + {"resource", "", "myresource", "/api/" + Default.GroupVersion().Version + "/resource/myresource"}, + {"resource", "mynamespace", "", "/api/" + Default.GroupVersion().Version + "/namespaces/mynamespace/resource"}, + {"resource", "", "", "/api/" + Default.GroupVersion().Version + "/resource"}, } for _, item := range testCases { if actual := Default.ResourcePath(item.resource, item.namespace, item.name); actual != item.expected { diff --git a/pkg/api/unversioned/register.go b/pkg/api/unversioned/register.go index 51045521b22..a5389f2b2ee 100644 --- a/pkg/api/unversioned/register.go +++ b/pkg/api/unversioned/register.go @@ -18,3 +18,10 @@ package unversioned // SchemeGroupVersion is group version used to register these objects var SchemeGroupVersion = GroupVersion{Group: "", Version: ""} + +// Kind takes an unqualified kind and returns back a Group qualified GroupKind +func Kind(kind string) GroupKind { + return SchemeGroupVersion.WithKind(kind).GroupKind() +} + +// TODO this doesn't actually register them right now due to cycles. diff --git a/pkg/api/validation/schema_test.go b/pkg/api/validation/schema_test.go index b2b5ea1a665..14b365bd82f 100644 --- a/pkg/api/validation/schema_test.go +++ b/pkg/api/validation/schema_test.go @@ -28,7 +28,7 @@ import ( ) func readPod(filename string) (string, error) { - data, err := ioutil.ReadFile("testdata/" + testapi.Default.Version() + "/" + filename) + data, err := ioutil.ReadFile("testdata/" + testapi.Default.GroupVersion().Version + "/" + filename) if err != nil { return "", err } @@ -36,7 +36,8 @@ func readPod(filename string) (string, error) { } func loadSchemaForTest() (Schema, error) { - pathToSwaggerSpec := "../../../api/swagger-spec/" + testapi.Default.Version() + ".json" + // TODO this path is broken + pathToSwaggerSpec := "../../../api/swagger-spec/" + testapi.Default.GroupVersion().Version + ".json" data, err := ioutil.ReadFile(pathToSwaggerSpec) if err != nil { return nil, err diff --git a/pkg/api/validation/validation_test.go b/pkg/api/validation/validation_test.go index aba29176524..246f26f0a7f 100644 --- a/pkg/api/validation/validation_test.go +++ b/pkg/api/validation/validation_test.go @@ -806,7 +806,7 @@ func TestValidateEnv(t *testing.T) { Name: "abc", ValueFrom: &api.EnvVarSource{ FieldRef: &api.ObjectFieldSelector{ - APIVersion: testapi.Default.Version(), + APIVersion: testapi.Default.GroupVersion().String(), FieldPath: "metadata.name", }, }, @@ -838,7 +838,7 @@ func TestValidateEnv(t *testing.T) { Value: "foo", ValueFrom: &api.EnvVarSource{ FieldRef: &api.ObjectFieldSelector{ - APIVersion: testapi.Default.Version(), + APIVersion: testapi.Default.GroupVersion().String(), FieldPath: "metadata.name", }, }, @@ -851,7 +851,7 @@ func TestValidateEnv(t *testing.T) { Name: "abc", ValueFrom: &api.EnvVarSource{ FieldRef: &api.ObjectFieldSelector{ - APIVersion: testapi.Default.Version(), + APIVersion: testapi.Default.GroupVersion().String(), }, }, }}, @@ -876,7 +876,7 @@ func TestValidateEnv(t *testing.T) { ValueFrom: &api.EnvVarSource{ FieldRef: &api.ObjectFieldSelector{ FieldPath: "metadata.whoops", - APIVersion: testapi.Default.Version(), + APIVersion: testapi.Default.GroupVersion().String(), }, }, }}, @@ -915,7 +915,7 @@ func TestValidateEnv(t *testing.T) { ValueFrom: &api.EnvVarSource{ FieldRef: &api.ObjectFieldSelector{ FieldPath: "status.phase", - APIVersion: testapi.Default.Version(), + APIVersion: testapi.Default.GroupVersion().String(), }, }, }}, diff --git a/pkg/client/cache/listwatch_test.go b/pkg/client/cache/listwatch_test.go index 716e56cfdc8..f850fd7d3aa 100644 --- a/pkg/client/cache/listwatch_test.go +++ b/pkg/client/cache/listwatch_test.go @@ -55,7 +55,7 @@ func buildLocation(resourcePath string, query url.Values) string { } func TestListWatchesCanList(t *testing.T) { - fieldSelectorQueryParamName := unversioned.FieldSelectorQueryParam(testapi.Default.Version()) + fieldSelectorQueryParamName := unversioned.FieldSelectorQueryParam(testapi.Default.GroupVersion().String()) table := []struct { location string resource string @@ -105,7 +105,7 @@ func TestListWatchesCanList(t *testing.T) { } func TestListWatchesCanWatch(t *testing.T) { - fieldSelectorQueryParamName := unversioned.FieldSelectorQueryParam(testapi.Default.Version()) + fieldSelectorQueryParamName := unversioned.FieldSelectorQueryParam(testapi.Default.GroupVersion().String()) table := []struct { rv string location string diff --git a/pkg/client/unversioned/client_test.go b/pkg/client/unversioned/client_test.go index 6732602d44c..e130aa9e70f 100644 --- a/pkg/client/unversioned/client_test.go +++ b/pkg/client/unversioned/client_test.go @@ -142,9 +142,9 @@ func (c *testClient) ValidateCommon(t *testing.T, err error) { validator, ok := c.QueryValidator[key] if !ok { switch key { - case unversioned.LabelSelectorQueryParam(testapi.Default.Version()): + case unversioned.LabelSelectorQueryParam(testapi.Default.GroupVersion().String()): validator = validateLabels - case unversioned.FieldSelectorQueryParam(testapi.Default.Version()): + case unversioned.FieldSelectorQueryParam(testapi.Default.GroupVersion().String()): validator = validateFields default: validator = func(a, b string) bool { return a == b } diff --git a/pkg/client/unversioned/clientcmd/client_config_test.go b/pkg/client/unversioned/clientcmd/client_config_test.go index 7cc2766f91a..0822d384004 100644 --- a/pkg/client/unversioned/clientcmd/client_config_test.go +++ b/pkg/client/unversioned/clientcmd/client_config_test.go @@ -34,7 +34,7 @@ func createValidTestConfig() *clientcmdapi.Config { config := clientcmdapi.NewConfig() config.Clusters["clean"] = &clientcmdapi.Cluster{ Server: server, - APIVersion: testapi.Default.Version(), + APIVersion: testapi.Default.GroupVersion().String(), } config.AuthInfos["clean"] = &clientcmdapi.AuthInfo{ Token: token, @@ -89,7 +89,7 @@ func TestCertificateData(t *testing.T) { config := clientcmdapi.NewConfig() config.Clusters["clean"] = &clientcmdapi.Cluster{ Server: "https://localhost:8443", - APIVersion: testapi.Default.Version(), + APIVersion: testapi.Default.GroupVersion().String(), CertificateAuthorityData: caData, } config.AuthInfos["clean"] = &clientcmdapi.AuthInfo{ @@ -122,7 +122,7 @@ func TestBasicAuthData(t *testing.T) { config := clientcmdapi.NewConfig() config.Clusters["clean"] = &clientcmdapi.Cluster{ Server: "https://localhost:8443", - APIVersion: testapi.Default.Version(), + APIVersion: testapi.Default.GroupVersion().String(), } config.AuthInfos["clean"] = &clientcmdapi.AuthInfo{ Username: username, diff --git a/pkg/client/unversioned/events_test.go b/pkg/client/unversioned/events_test.go index a0f0b1a41c6..53f74467afe 100644 --- a/pkg/client/unversioned/events_test.go +++ b/pkg/client/unversioned/events_test.go @@ -32,12 +32,12 @@ func TestEventSearch(t *testing.T) { Method: "GET", Path: testapi.Default.ResourcePath("events", "baz", ""), Query: url.Values{ - unversioned.FieldSelectorQueryParam(testapi.Default.Version()): []string{ - getInvolvedObjectNameFieldLabel(testapi.Default.Version()) + "=foo,", + unversioned.FieldSelectorQueryParam(testapi.Default.GroupVersion().String()): []string{ + getInvolvedObjectNameFieldLabel(testapi.Default.GroupVersion().String()) + "=foo,", "involvedObject.namespace=baz,", "involvedObject.kind=Pod", }, - unversioned.LabelSelectorQueryParam(testapi.Default.Version()): []string{}, + unversioned.LabelSelectorQueryParam(testapi.Default.GroupVersion().String()): []string{}, }, }, Response: Response{StatusCode: 200, Body: &api.EventList{}}, diff --git a/pkg/client/unversioned/helper_blackbox_test.go b/pkg/client/unversioned/helper_blackbox_test.go index f87b90d0849..1175cf0dc05 100644 --- a/pkg/client/unversioned/helper_blackbox_test.go +++ b/pkg/client/unversioned/helper_blackbox_test.go @@ -56,37 +56,37 @@ func TestNegotiateVersion(t *testing.T) { name: "server supports client default", version: &uapi.GroupVersion{Version: "version1"}, config: &unversioned.Config{}, - serverVersions: []string{"/version1", testapi.Default.Version()}, - clientVersions: []uapi.GroupVersion{{Version: "version1"}, {Version: testapi.Default.Version()}}, + serverVersions: []string{"/version1", testapi.Default.GroupVersion().String()}, + clientVersions: []uapi.GroupVersion{{Version: "version1"}, *testapi.Default.GroupVersion()}, expectedVersion: &uapi.GroupVersion{Version: "version1"}, }, { name: "server falls back to client supported", - version: &uapi.GroupVersion{Version: testapi.Default.Version()}, + version: testapi.Default.GroupVersion(), config: &unversioned.Config{}, serverVersions: []string{"/version1"}, - clientVersions: []uapi.GroupVersion{{Version: "version1"}, {Version: testapi.Default.Version()}}, + clientVersions: []uapi.GroupVersion{{Version: "version1"}, *testapi.Default.GroupVersion()}, expectedVersion: &uapi.GroupVersion{Version: "version1"}, }, { name: "explicit version supported", config: &unversioned.Config{GroupVersion: testapi.Default.GroupVersion()}, - serverVersions: []string{"/version1", testapi.Default.Version()}, - clientVersions: []uapi.GroupVersion{{Version: "version1"}, {Version: testapi.Default.Version()}}, - expectedVersion: &uapi.GroupVersion{Version: testapi.Default.Version()}, + serverVersions: []string{"/version1", testapi.Default.GroupVersion().String()}, + clientVersions: []uapi.GroupVersion{{Version: "version1"}, *testapi.Default.GroupVersion()}, + expectedVersion: testapi.Default.GroupVersion(), }, { name: "explicit version not supported", config: &unversioned.Config{GroupVersion: testapi.Default.GroupVersion()}, serverVersions: []string{"/version1"}, - clientVersions: []uapi.GroupVersion{{Version: "version1"}, {Version: testapi.Default.Version()}}, + clientVersions: []uapi.GroupVersion{{Version: "version1"}, *testapi.Default.GroupVersion()}, expectErr: func(err error) bool { return strings.Contains(err.Error(), `server does not support API version "v1"`) }, }, { name: "connection refused error", config: &unversioned.Config{GroupVersion: testapi.Default.GroupVersion()}, serverVersions: []string{"/version1"}, - clientVersions: []uapi.GroupVersion{{Version: "version1"}, {Version: testapi.Default.Version()}}, + clientVersions: []uapi.GroupVersion{{Version: "version1"}, *testapi.Default.GroupVersion()}, sendErr: errors.New("connection refused"), expectErr: func(err error) bool { return strings.Contains(err.Error(), "connection refused") }, }, diff --git a/pkg/client/unversioned/helper_test.go b/pkg/client/unversioned/helper_test.go index 9788203ea4b..db479f47d3c 100644 --- a/pkg/client/unversioned/helper_test.go +++ b/pkg/client/unversioned/helper_test.go @@ -199,8 +199,8 @@ func TestSetsCodec(t *testing.T) { Prefix string Codec runtime.Codec }{ - testapi.Default.Version(): {false, "/api/" + testapi.Default.Version() + "/", testapi.Default.Codec()}, - "invalidVersion": {true, "", nil}, + testapi.Default.GroupVersion().Version: {false, "/api/" + testapi.Default.GroupVersion().Version + "/", testapi.Default.Codec()}, + "invalidVersion": {true, "", nil}, } for version, expected := range testCases { client, err := New(&Config{Host: "127.0.0.1", GroupVersion: &unversioned.GroupVersion{Version: version}}) @@ -243,13 +243,13 @@ func TestValidatesHostParameter(t *testing.T) { URL string Err bool }{ - {"127.0.0.1", "", "http://127.0.0.1/" + testapi.Default.Version(), false}, - {"127.0.0.1:8080", "", "http://127.0.0.1:8080/" + testapi.Default.Version(), false}, - {"foo.bar.com", "", "http://foo.bar.com/" + testapi.Default.Version(), false}, - {"http://host/prefix", "", "http://host/prefix/" + testapi.Default.Version(), false}, - {"http://host", "", "http://host/" + testapi.Default.Version(), false}, - {"http://host", "/", "http://host/" + testapi.Default.Version(), false}, - {"http://host", "/other", "http://host/other/" + testapi.Default.Version(), false}, + {"127.0.0.1", "", "http://127.0.0.1/" + testapi.Default.GroupVersion().Version, false}, + {"127.0.0.1:8080", "", "http://127.0.0.1:8080/" + testapi.Default.GroupVersion().Version, false}, + {"foo.bar.com", "", "http://foo.bar.com/" + testapi.Default.GroupVersion().Version, false}, + {"http://host/prefix", "", "http://host/prefix/" + testapi.Default.GroupVersion().Version, false}, + {"http://host", "", "http://host/" + testapi.Default.GroupVersion().Version, false}, + {"http://host", "/", "http://host/" + testapi.Default.GroupVersion().Version, false}, + {"http://host", "/other", "http://host/other/" + testapi.Default.GroupVersion().Version, false}, {"host/server", "", "", true}, } for i, testCase := range testCases { diff --git a/pkg/client/unversioned/nodes_test.go b/pkg/client/unversioned/nodes_test.go index b9f2d211ad2..db304f174c9 100644 --- a/pkg/client/unversioned/nodes_test.go +++ b/pkg/client/unversioned/nodes_test.go @@ -44,7 +44,7 @@ func TestListNodes(t *testing.T) { } func TestListNodesLabels(t *testing.T) { - labelSelectorQueryParamName := unversioned.LabelSelectorQueryParam(testapi.Default.Version()) + labelSelectorQueryParamName := unversioned.LabelSelectorQueryParam(testapi.Default.GroupVersion().String()) c := &testClient{ Request: testRequest{ Method: "GET", diff --git a/pkg/client/unversioned/pods_test.go b/pkg/client/unversioned/pods_test.go index 31e36e911c3..f7fa7e34585 100644 --- a/pkg/client/unversioned/pods_test.go +++ b/pkg/client/unversioned/pods_test.go @@ -65,7 +65,7 @@ func TestListPods(t *testing.T) { func TestListPodsLabels(t *testing.T) { ns := api.NamespaceDefault - labelSelectorQueryParamName := unversioned.LabelSelectorQueryParam(testapi.Default.Version()) + labelSelectorQueryParamName := unversioned.LabelSelectorQueryParam(testapi.Default.GroupVersion().String()) c := &testClient{ Request: testRequest{ Method: "GET", diff --git a/pkg/client/unversioned/request_test.go b/pkg/client/unversioned/request_test.go index 9b02b8e09e3..bc0e02062c0 100644 --- a/pkg/client/unversioned/request_test.go +++ b/pkg/client/unversioned/request_test.go @@ -847,7 +847,7 @@ func TestDoRequestNewWayReader(t *testing.T) { } tmpStr := string(reqBodyExpected) requestURL := testapi.Default.ResourcePathWithPrefix("foo", "bar", "", "baz") - requestURL += "?" + unversioned.LabelSelectorQueryParam(testapi.Default.Version()) + "=name%3Dfoo&timeout=1s" + requestURL += "?" + unversioned.LabelSelectorQueryParam(testapi.Default.GroupVersion().String()) + "=name%3Dfoo&timeout=1s" fakeHandler.ValidateRequest(t, requestURL, "POST", &tmpStr) } @@ -887,7 +887,7 @@ func TestDoRequestNewWayObj(t *testing.T) { } tmpStr := string(reqBodyExpected) requestURL := testapi.Default.ResourcePath("foo", "", "bar/baz") - requestURL += "?" + unversioned.LabelSelectorQueryParam(testapi.Default.Version()) + "=name%3Dfoo&timeout=1s" + requestURL += "?" + unversioned.LabelSelectorQueryParam(testapi.Default.GroupVersion().String()) + "=name%3Dfoo&timeout=1s" fakeHandler.ValidateRequest(t, requestURL, "POST", &tmpStr) } diff --git a/pkg/client/unversioned/restclient_test.go b/pkg/client/unversioned/restclient_test.go index b0f66458f5f..d2f19080ea8 100644 --- a/pkg/client/unversioned/restclient_test.go +++ b/pkg/client/unversioned/restclient_test.go @@ -61,7 +61,7 @@ func TestDoRequestSuccess(t *testing.T) { if !reflect.DeepEqual(status, statusOut) { t.Errorf("Unexpected mis-match. Expected %#v. Saw %#v", status, statusOut) } - fakeHandler.ValidateRequest(t, "/"+testapi.Default.Version()+"/test", "GET", nil) + fakeHandler.ValidateRequest(t, "/"+testapi.Default.GroupVersion().String()+"/test", "GET", nil) } func TestDoRequestFailed(t *testing.T) { @@ -137,5 +137,5 @@ func TestDoRequestCreated(t *testing.T) { if !reflect.DeepEqual(status, statusOut) { t.Errorf("Unexpected mis-match. Expected %#v. Saw %#v", status, statusOut) } - fakeHandler.ValidateRequest(t, "/"+testapi.Default.Version()+"/test", "GET", nil) + fakeHandler.ValidateRequest(t, "/"+testapi.Default.GroupVersion().String()+"/test", "GET", nil) } diff --git a/pkg/client/unversioned/services_test.go b/pkg/client/unversioned/services_test.go index 998dcb1e6f3..49ca70c2872 100644 --- a/pkg/client/unversioned/services_test.go +++ b/pkg/client/unversioned/services_test.go @@ -61,7 +61,7 @@ func TestListServices(t *testing.T) { func TestListServicesLabels(t *testing.T) { ns := api.NamespaceDefault - labelSelectorQueryParamName := unversioned.LabelSelectorQueryParam(testapi.Default.Version()) + labelSelectorQueryParamName := unversioned.LabelSelectorQueryParam(testapi.Default.GroupVersion().String()) c := &testClient{ Request: testRequest{ Method: "GET", diff --git a/pkg/controller/controller_utils_test.go b/pkg/controller/controller_utils_test.go index 8e863590f58..22609c73c1f 100644 --- a/pkg/controller/controller_utils_test.go +++ b/pkg/controller/controller_utils_test.go @@ -50,7 +50,7 @@ func NewFakeControllerExpectationsLookup(ttl time.Duration) (*ControllerExpectat func newReplicationController(replicas int) *api.ReplicationController { rc := &api.ReplicationController{ - TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.Version()}, + TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.GroupVersion().String()}, ObjectMeta: api.ObjectMeta{ UID: util.NewUUID(), Name: "foobar", diff --git a/pkg/controller/daemon/controller_test.go b/pkg/controller/daemon/controller_test.go index 66a151a3c68..d86505c8ef5 100644 --- a/pkg/controller/daemon/controller_test.go +++ b/pkg/controller/daemon/controller_test.go @@ -49,7 +49,7 @@ func getKey(ds *extensions.DaemonSet, t *testing.T) string { func newDaemonSet(name string) *extensions.DaemonSet { return &extensions.DaemonSet{ - TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Extensions.Version()}, + TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Extensions.GroupVersion().String()}, ObjectMeta: api.ObjectMeta{ Name: name, Namespace: api.NamespaceDefault, @@ -78,7 +78,7 @@ func newDaemonSet(name string) *extensions.DaemonSet { func newNode(name string, label map[string]string) *api.Node { return &api.Node{ - TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.Version()}, + TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.GroupVersion().String()}, ObjectMeta: api.ObjectMeta{ Name: name, Labels: label, @@ -100,7 +100,7 @@ func addNodes(nodeStore cache.Store, startIndex, numNodes int, label map[string] func newPod(podName string, nodeName string, label map[string]string) *api.Pod { pod := &api.Pod{ - TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.Version()}, + TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.GroupVersion().String()}, ObjectMeta: api.ObjectMeta{ GenerateName: podName, Labels: label, diff --git a/pkg/controller/endpoint/endpoints_controller_test.go b/pkg/controller/endpoint/endpoints_controller_test.go index 21ccd937d69..1c5d38e52d9 100644 --- a/pkg/controller/endpoint/endpoints_controller_test.go +++ b/pkg/controller/endpoint/endpoints_controller_test.go @@ -38,7 +38,7 @@ import ( func addPods(store cache.Store, namespace string, nPods int, nPorts int, nNotReady int) { for i := 0; i < nPods+nNotReady; i++ { p := &api.Pod{ - TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.Version()}, + TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.GroupVersion().String()}, ObjectMeta: api.ObjectMeta{ Namespace: namespace, Name: fmt.Sprintf("pod%d", i), diff --git a/pkg/controller/replication/replication_controller_test.go b/pkg/controller/replication/replication_controller_test.go index cd8654ca7a4..7c77a0362e5 100644 --- a/pkg/controller/replication/replication_controller_test.go +++ b/pkg/controller/replication/replication_controller_test.go @@ -50,7 +50,7 @@ func getKey(rc *api.ReplicationController, t *testing.T) string { func newReplicationController(replicas int) *api.ReplicationController { rc := &api.ReplicationController{ - TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.Version()}, + TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.GroupVersion().String()}, ObjectMeta: api.ObjectMeta{ UID: util.NewUUID(), Name: "foobar", diff --git a/pkg/kubectl/cmd/attach_test.go b/pkg/kubectl/cmd/attach_test.go index abc22a73d77..1f4fd09f9dd 100644 --- a/pkg/kubectl/cmd/attach_test.go +++ b/pkg/kubectl/cmd/attach_test.go @@ -111,7 +111,7 @@ func TestPodAndContainerAttach(t *testing.T) { } func TestAttach(t *testing.T) { - version := testapi.Default.Version() + version := testapi.Default.GroupVersion().Version tests := []struct { name, version, podPath, attachPath, container string pod *api.Pod @@ -195,7 +195,7 @@ func TestAttach(t *testing.T) { } func TestAttachWarnings(t *testing.T) { - version := testapi.Default.Version() + version := testapi.Default.GroupVersion().Version tests := []struct { name, container, version, podPath, expectedErr, expectedOut string pod *api.Pod diff --git a/pkg/kubectl/cmd/cmd_test.go b/pkg/kubectl/cmd/cmd_test.go index 41ba600467e..68396ec3b10 100644 --- a/pkg/kubectl/cmd/cmd_test.go +++ b/pkg/kubectl/cmd/cmd_test.go @@ -77,7 +77,7 @@ func versionErrIfFalse(b bool) error { return versionErr } -var validVersion = testapi.Default.Version() +var validVersion = testapi.Default.GroupVersion().Version var internalGV = unversioned.GroupVersion{Group: "apitest", Version: ""} var unlikelyGV = unversioned.GroupVersion{Group: "apitest", Version: "unlikelyversion"} var validVersionGV = unversioned.GroupVersion{Group: "apitest", Version: validVersion} diff --git a/pkg/kubectl/cmd/config/config_test.go b/pkg/kubectl/cmd/config/config_test.go index eb7401fa8f8..1f98633fa47 100644 --- a/pkg/kubectl/cmd/config/config_test.go +++ b/pkg/kubectl/cmd/config/config_test.go @@ -577,13 +577,13 @@ func TestNewEmptyCluster(t *testing.T) { func TestAdditionalCluster(t *testing.T) { expectedConfig := newRedFederalCowHammerConfig() cluster := clientcmdapi.NewCluster() - cluster.APIVersion = testapi.Default.Version() + cluster.APIVersion = testapi.Default.GroupVersion().String() cluster.CertificateAuthority = "/ca-location" cluster.InsecureSkipTLSVerify = false cluster.Server = "serverlocation" expectedConfig.Clusters["different-cluster"] = cluster test := configCommandTest{ - args: []string{"set-cluster", "different-cluster", "--" + clientcmd.FlagAPIServer + "=serverlocation", "--" + clientcmd.FlagInsecure + "=false", "--" + clientcmd.FlagCAFile + "=/ca-location", "--" + clientcmd.FlagAPIVersion + "=" + testapi.Default.Version()}, + args: []string{"set-cluster", "different-cluster", "--" + clientcmd.FlagAPIServer + "=serverlocation", "--" + clientcmd.FlagInsecure + "=false", "--" + clientcmd.FlagCAFile + "=/ca-location", "--" + clientcmd.FlagAPIVersion + "=" + testapi.Default.GroupVersion().String()}, startingConfig: newRedFederalCowHammerConfig(), expectedConfig: expectedConfig, } diff --git a/pkg/kubectl/cmd/delete_test.go b/pkg/kubectl/cmd/delete_test.go index df9687814fc..e02bee4c433 100644 --- a/pkg/kubectl/cmd/delete_test.go +++ b/pkg/kubectl/cmd/delete_test.go @@ -417,12 +417,12 @@ func TestDeleteMultipleSelector(t *testing.T) { Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { switch p, m := req.URL.Path, req.Method; { case p == "/namespaces/test/pods" && m == "GET": - if req.URL.Query().Get(unversioned.LabelSelectorQueryParam(testapi.Default.Version())) != "a=b" { + if req.URL.Query().Get(unversioned.LabelSelectorQueryParam(testapi.Default.GroupVersion().String())) != "a=b" { t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) } return &http.Response{StatusCode: 200, Body: objBody(codec, pods)}, nil case p == "/namespaces/test/services" && m == "GET": - if req.URL.Query().Get(unversioned.LabelSelectorQueryParam(testapi.Default.Version())) != "a=b" { + if req.URL.Query().Get(unversioned.LabelSelectorQueryParam(testapi.Default.GroupVersion().String())) != "a=b" { t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) } return &http.Response{StatusCode: 200, Body: objBody(codec, svc)}, nil diff --git a/pkg/kubectl/cmd/exec_test.go b/pkg/kubectl/cmd/exec_test.go index fb432f94ebd..627cbca03b8 100644 --- a/pkg/kubectl/cmd/exec_test.go +++ b/pkg/kubectl/cmd/exec_test.go @@ -157,7 +157,7 @@ func TestPodAndContainer(t *testing.T) { } func TestExec(t *testing.T) { - version := testapi.Default.Version() + version := testapi.Default.GroupVersion().Version tests := []struct { name, version, podPath, execPath, container string pod *api.Pod diff --git a/pkg/kubectl/cmd/get_test.go b/pkg/kubectl/cmd/get_test.go index 340506f8157..6b6b74963da 100644 --- a/pkg/kubectl/cmd/get_test.go +++ b/pkg/kubectl/cmd/get_test.go @@ -147,9 +147,9 @@ func TestGetUnknownSchemaObject(t *testing.T) { // // The expected behavior of the `kubectl get` command is: // 1. objects using unrecognized schemes will always be returned using that scheme/version, "unlikelyversion" in this test; -// 2. if the specified output-version is a recognized, valid Scheme, then the list should use that scheme, and otherwise it will default to the client version, testapi.Default.Version() in this test; +// 2. if the specified output-version is a recognized, valid Scheme, then the list should use that scheme, and otherwise it will default to the client version, testapi.Default.GroupVersion().String() in this test; // 3a. if the specified output-version is a recognized, valid Scheme, in which the requested object (replicationcontroller) can be represented, then the object should be returned using that version; -// 3b. otherwise if the specified output-version is unrecognized, but the requested object (replicationcontroller) is recognized by the client's codec, then it will be converted to the client version, testapi.Default.Version() in this test. +// 3b. otherwise if the specified output-version is unrecognized, but the requested object (replicationcontroller) is recognized by the client's codec, then it will be converted to the client version, testapi.Default.GroupVersion().String() in this test. func TestGetUnknownSchemaObjectListGeneric(t *testing.T) { testCases := map[string]struct { outputVersion string @@ -158,26 +158,26 @@ func TestGetUnknownSchemaObjectListGeneric(t *testing.T) { rcVersion string }{ "handles specific version": { - outputVersion: testapi.Default.Version(), - listVersion: testapi.Default.Version(), + outputVersion: testapi.Default.GroupVersion().String(), + listVersion: testapi.Default.GroupVersion().String(), testtypeVersion: unlikelyGV.String(), - rcVersion: testapi.Default.Version(), + rcVersion: testapi.Default.GroupVersion().String(), }, "handles second specific version": { outputVersion: "unlikely.group/unlikelyversion", - listVersion: testapi.Default.Version(), + listVersion: testapi.Default.GroupVersion().String(), testtypeVersion: unlikelyGV.String(), - rcVersion: testapi.Default.Version(), // see expected behavior 3b + rcVersion: testapi.Default.GroupVersion().String(), // see expected behavior 3b }, "handles common version": { - outputVersion: testapi.Default.Version(), - listVersion: testapi.Default.Version(), + outputVersion: testapi.Default.GroupVersion().String(), + listVersion: testapi.Default.GroupVersion().String(), testtypeVersion: unlikelyGV.String(), - rcVersion: testapi.Default.Version(), + rcVersion: testapi.Default.GroupVersion().String(), }, } for k, test := range testCases { - apiCodec := runtime.CodecFor(api.Scheme, testapi.Default.Version()) + apiCodec := runtime.CodecFor(api.Scheme, testapi.Default.GroupVersion().String()) regularClient := &fake.RESTClient{ Codec: apiCodec, Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { @@ -509,7 +509,7 @@ func TestGetMultipleTypeObjectsWithSelector(t *testing.T) { tf.Client = &fake.RESTClient{ Codec: codec, Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { - if req.URL.Query().Get(unversioned.LabelSelectorQueryParam(testapi.Default.Version())) != "a=b" { + if req.URL.Query().Get(unversioned.LabelSelectorQueryParam(testapi.Default.GroupVersion().String())) != "a=b" { t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) } switch req.URL.Path { @@ -635,7 +635,7 @@ func TestWatchSelector(t *testing.T) { tf.Client = &fake.RESTClient{ Codec: codec, Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { - if req.URL.Query().Get(unversioned.LabelSelectorQueryParam(testapi.Default.Version())) != "a=b" { + if req.URL.Query().Get(unversioned.LabelSelectorQueryParam(testapi.Default.GroupVersion().String())) != "a=b" { t.Fatalf("unexpected request: %#v\n%#v", req.URL, req) } switch req.URL.Path { diff --git a/pkg/kubectl/cmd/portforward_test.go b/pkg/kubectl/cmd/portforward_test.go index 10b776779b4..9bcb2a995f0 100644 --- a/pkg/kubectl/cmd/portforward_test.go +++ b/pkg/kubectl/cmd/portforward_test.go @@ -44,7 +44,7 @@ func (f *fakePortForwarder) ForwardPorts(method string, url *url.URL, config *cl } func TestPortForward(t *testing.T) { - version := testapi.Default.Version() + version := testapi.Default.GroupVersion().Version tests := []struct { name, version, podPath, pfPath, container string @@ -114,7 +114,7 @@ func TestPortForward(t *testing.T) { } func TestPortForwardWithPFlag(t *testing.T) { - version := testapi.Default.Version() + version := testapi.Default.GroupVersion().Version tests := []struct { name, version, podPath, pfPath, container string diff --git a/pkg/kubectl/cmd/util/factory_test.go b/pkg/kubectl/cmd/util/factory_test.go index ee905276613..7818e7b9049 100644 --- a/pkg/kubectl/cmd/util/factory_test.go +++ b/pkg/kubectl/cmd/util/factory_test.go @@ -207,7 +207,7 @@ func TestFlagUnderscoreRenaming(t *testing.T) { } func loadSchemaForTest() (validation.Schema, error) { - pathToSwaggerSpec := "../../../../api/swagger-spec/" + testapi.Default.Version() + ".json" + pathToSwaggerSpec := "../../../../api/swagger-spec/" + testapi.Default.GroupVersion().Version + ".json" data, err := ioutil.ReadFile(pathToSwaggerSpec) if err != nil { return nil, err diff --git a/pkg/kubectl/cmd/util/helpers_test.go b/pkg/kubectl/cmd/util/helpers_test.go index d069a92a808..84536b615b2 100644 --- a/pkg/kubectl/cmd/util/helpers_test.go +++ b/pkg/kubectl/cmd/util/helpers_test.go @@ -50,7 +50,7 @@ func TestMerge(t *testing.T) { Name: "foo", }, }, - fragment: fmt.Sprintf(`{ "apiVersion": "%s" }`, testapi.Default.Version()), + fragment: fmt.Sprintf(`{ "apiVersion": "%s" }`, testapi.Default.GroupVersion().String()), expected: &api.Pod{ ObjectMeta: api.ObjectMeta{ Name: "foo", @@ -79,7 +79,7 @@ func TestMerge(t *testing.T) { }, }, }, - fragment: fmt.Sprintf(`{ "apiVersion": "%s", "spec": { "containers": [ { "name": "c1", "image": "green-image" } ] } }`, testapi.Default.Version()), + fragment: fmt.Sprintf(`{ "apiVersion": "%s", "spec": { "containers": [ { "name": "c1", "image": "green-image" } ] } }`, testapi.Default.GroupVersion().String()), expected: &api.Pod{ ObjectMeta: api.ObjectMeta{ Name: "foo", @@ -105,7 +105,7 @@ func TestMerge(t *testing.T) { Name: "foo", }, }, - fragment: fmt.Sprintf(`{ "apiVersion": "%s", "spec": { "volumes": [ {"name": "v1"}, {"name": "v2"} ] } }`, testapi.Default.Version()), + fragment: fmt.Sprintf(`{ "apiVersion": "%s", "spec": { "volumes": [ {"name": "v1"}, {"name": "v2"} ] } }`, testapi.Default.GroupVersion().String()), expected: &api.Pod{ ObjectMeta: api.ObjectMeta{ Name: "foo", @@ -146,7 +146,7 @@ func TestMerge(t *testing.T) { obj: &api.Service{ Spec: api.ServiceSpec{}, }, - fragment: fmt.Sprintf(`{ "apiVersion": "%s", "spec": { "ports": [ { "port": 0 } ] } }`, testapi.Default.Version()), + fragment: fmt.Sprintf(`{ "apiVersion": "%s", "spec": { "ports": [ { "port": 0 } ] } }`, testapi.Default.GroupVersion().String()), expected: &api.Service{ Spec: api.ServiceSpec{ SessionAffinity: "None", @@ -169,7 +169,7 @@ func TestMerge(t *testing.T) { }, }, }, - fragment: fmt.Sprintf(`{ "apiVersion": "%s", "spec": { "selector": { "version": "v2" } } }`, testapi.Default.Version()), + fragment: fmt.Sprintf(`{ "apiVersion": "%s", "spec": { "selector": { "version": "v2" } } }`, testapi.Default.GroupVersion().String()), expected: &api.Service{ Spec: api.ServiceSpec{ SessionAffinity: "None", diff --git a/pkg/kubectl/resource/builder_test.go b/pkg/kubectl/resource/builder_test.go index c98592df666..daed6445ad5 100644 --- a/pkg/kubectl/resource/builder_test.go +++ b/pkg/kubectl/resource/builder_test.go @@ -504,7 +504,7 @@ func TestResourceByNameAndEmptySelector(t *testing.T) { func TestSelector(t *testing.T) { pods, svc := testData() - labelKey := unversioned.LabelSelectorQueryParam(testapi.Default.Version()) + labelKey := unversioned.LabelSelectorQueryParam(testapi.Default.GroupVersion().String()) b := NewBuilder(testapi.Default.RESTMapper(), api.Scheme, fakeClientWith("", t, map[string]string{ "/namespaces/test/pods?" + labelKey + "=a%3Db": runtime.EncodeOrDie(testapi.Default.Codec(), pods), "/namespaces/test/services?" + labelKey + "=a%3Db": runtime.EncodeOrDie(testapi.Default.Codec(), svc), @@ -799,7 +799,7 @@ func TestSingularRootScopedObject(t *testing.T) { func TestListObject(t *testing.T) { pods, _ := testData() - labelKey := unversioned.LabelSelectorQueryParam(testapi.Default.Version()) + labelKey := unversioned.LabelSelectorQueryParam(testapi.Default.GroupVersion().String()) b := NewBuilder(testapi.Default.RESTMapper(), api.Scheme, fakeClientWith("", t, map[string]string{ "/namespaces/test/pods?" + labelKey + "=a%3Db": runtime.EncodeOrDie(testapi.Default.Codec(), pods), })). @@ -832,7 +832,7 @@ func TestListObject(t *testing.T) { func TestListObjectWithDifferentVersions(t *testing.T) { pods, svc := testData() - labelKey := unversioned.LabelSelectorQueryParam(testapi.Default.Version()) + labelKey := unversioned.LabelSelectorQueryParam(testapi.Default.GroupVersion().String()) obj, err := NewBuilder(testapi.Default.RESTMapper(), api.Scheme, fakeClientWith("", t, map[string]string{ "/namespaces/test/pods?" + labelKey + "=a%3Db": runtime.EncodeOrDie(testapi.Default.Codec(), pods), "/namespaces/test/services?" + labelKey + "=a%3Db": runtime.EncodeOrDie(testapi.Default.Codec(), svc), diff --git a/pkg/kubectl/resource/helper_test.go b/pkg/kubectl/resource/helper_test.go index 711be667053..7d7007236a0 100644 --- a/pkg/kubectl/resource/helper_test.go +++ b/pkg/kubectl/resource/helper_test.go @@ -323,7 +323,7 @@ func TestHelperList(t *testing.T) { t.Errorf("url doesn't contain name: %#v", req.URL) return false } - if req.URL.Query().Get(unversioned.LabelSelectorQueryParam(testapi.Default.Version())) != labels.SelectorFromSet(labels.Set{"foo": "baz"}).String() { + if req.URL.Query().Get(unversioned.LabelSelectorQueryParam(testapi.Default.GroupVersion().String())) != labels.SelectorFromSet(labels.Set{"foo": "baz"}).String() { t.Errorf("url doesn't contain query parameters: %#v", req.URL) return false } @@ -341,7 +341,7 @@ func TestHelperList(t *testing.T) { RESTClient: client, NamespaceScoped: true, } - obj, err := modifier.List("bar", testapi.Default.Version(), labels.SelectorFromSet(labels.Set{"foo": "baz"})) + obj, err := modifier.List("bar", testapi.Default.GroupVersion().String(), labels.SelectorFromSet(labels.Set{"foo": "baz"})) if (err != nil) != test.Err { t.Errorf("unexpected error: %t %v", test.Err, err) } diff --git a/pkg/kubectl/resource_printer_test.go b/pkg/kubectl/resource_printer_test.go index 324813d708c..c8d85a497a2 100644 --- a/pkg/kubectl/resource_printer_test.go +++ b/pkg/kubectl/resource_printer_test.go @@ -102,7 +102,7 @@ func TestPrinter(t *testing.T) { }, } emptyListTest := &api.PodList{} - testapi, err := api.Scheme.ConvertToVersion(podTest, testapi.Default.Version()) + testapi, err := api.Scheme.ConvertToVersion(podTest, testapi.Default.GroupVersion().String()) if err != nil { t.Fatalf("unexpected error: %v", err) } diff --git a/pkg/kubelet/config/http_test.go b/pkg/kubelet/config/http_test.go index 7a40140c127..084f256b105 100644 --- a/pkg/kubelet/config/http_test.go +++ b/pkg/kubelet/config/http_test.go @@ -67,7 +67,7 @@ func TestExtractInvalidPods(t *testing.T) { { desc: "Invalid volume name", pod: &api.Pod{ - TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.Version()}, + TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.GroupVersion().String()}, Spec: api.PodSpec{ Volumes: []api.Volume{{Name: "_INVALID_"}}, }, @@ -76,7 +76,7 @@ func TestExtractInvalidPods(t *testing.T) { { desc: "Duplicate volume names", pod: &api.Pod{ - TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.Version()}, + TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.GroupVersion().String()}, Spec: api.PodSpec{ Volumes: []api.Volume{{Name: "repeated"}, {Name: "repeated"}}, }, @@ -85,7 +85,7 @@ func TestExtractInvalidPods(t *testing.T) { { desc: "Unspecified container name", pod: &api.Pod{ - TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.Version()}, + TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.GroupVersion().String()}, Spec: api.PodSpec{ Containers: []api.Container{{Name: ""}}, }, @@ -94,7 +94,7 @@ func TestExtractInvalidPods(t *testing.T) { { desc: "Invalid container name", pod: &api.Pod{ - TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.Version()}, + TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Default.GroupVersion().String()}, Spec: api.PodSpec{ Containers: []api.Container{{Name: "_INVALID_"}}, }, @@ -294,7 +294,7 @@ func TestExtractPodsFromHTTP(t *testing.T) { func TestURLWithHeader(t *testing.T) { pod := &api.Pod{ TypeMeta: unversioned.TypeMeta{ - APIVersion: testapi.Default.Version(), + APIVersion: testapi.Default.GroupVersion().String(), Kind: "Pod", }, ObjectMeta: api.ObjectMeta{ diff --git a/pkg/kubelet/container/ref_test.go b/pkg/kubelet/container/ref_test.go index a2ed3a65187..18cc6672e92 100644 --- a/pkg/kubelet/container/ref_test.go +++ b/pkg/kubelet/container/ref_test.go @@ -67,14 +67,14 @@ func TestGenerateContainerRef(t *testing.T) { okPod = api.Pod{ TypeMeta: unversioned.TypeMeta{ Kind: "Pod", - APIVersion: testapi.Default.Version(), + APIVersion: testapi.Default.GroupVersion().String(), }, ObjectMeta: api.ObjectMeta{ Name: "ok", Namespace: "test-ns", UID: "bar", ResourceVersion: "42", - SelfLink: "/api/" + testapi.Default.Version() + "/pods/foo", + SelfLink: "/api/" + testapi.Default.GroupVersion().String() + "/pods/foo", }, Spec: api.PodSpec{ Containers: []api.Container{ @@ -91,7 +91,7 @@ func TestGenerateContainerRef(t *testing.T) { noSelfLinkPod.Kind = "" noSelfLinkPod.APIVersion = "" noSelfLinkPod.ObjectMeta.SelfLink = "" - defaultedSelfLinkPod.ObjectMeta.SelfLink = "/api/" + testapi.Default.Version() + "/pods/ok" + defaultedSelfLinkPod.ObjectMeta.SelfLink = "/api/" + testapi.Default.GroupVersion().String() + "/pods/ok" cases := []struct { name string @@ -108,7 +108,7 @@ func TestGenerateContainerRef(t *testing.T) { }, expected: &api.ObjectReference{ Kind: "Pod", - APIVersion: testapi.Default.Version(), + APIVersion: testapi.Default.GroupVersion().String(), Name: "ok", Namespace: "test-ns", UID: "bar", @@ -123,7 +123,7 @@ func TestGenerateContainerRef(t *testing.T) { container: &api.Container{}, expected: &api.ObjectReference{ Kind: "Pod", - APIVersion: testapi.Default.Version(), + APIVersion: testapi.Default.GroupVersion().String(), Name: "ok", Namespace: "test-ns", UID: "bar", @@ -147,7 +147,7 @@ func TestGenerateContainerRef(t *testing.T) { }, expected: &api.ObjectReference{ Kind: "Pod", - APIVersion: testapi.Default.Version(), + APIVersion: testapi.Default.GroupVersion().String(), Name: "ok", Namespace: "test-ns", UID: "bar", @@ -164,7 +164,7 @@ func TestGenerateContainerRef(t *testing.T) { }, expected: &api.ObjectReference{ Kind: "Pod", - APIVersion: testapi.Default.Version(), + APIVersion: testapi.Default.GroupVersion().String(), Name: "ok", Namespace: "test-ns", UID: "bar", diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index 2350574b83f..967a42828a6 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -1337,7 +1337,7 @@ func TestMakeEnvironmentVariables(t *testing.T) { Name: "POD_NAME", ValueFrom: &api.EnvVarSource{ FieldRef: &api.ObjectFieldSelector{ - APIVersion: testapi.Default.Version(), + APIVersion: testapi.Default.GroupVersion().String(), FieldPath: "metadata.name", }, }, @@ -1346,7 +1346,7 @@ func TestMakeEnvironmentVariables(t *testing.T) { Name: "POD_NAMESPACE", ValueFrom: &api.EnvVarSource{ FieldRef: &api.ObjectFieldSelector{ - APIVersion: testapi.Default.Version(), + APIVersion: testapi.Default.GroupVersion().String(), FieldPath: "metadata.namespace", }, }, @@ -1355,7 +1355,7 @@ func TestMakeEnvironmentVariables(t *testing.T) { Name: "POD_IP", ValueFrom: &api.EnvVarSource{ FieldRef: &api.ObjectFieldSelector{ - APIVersion: testapi.Default.Version(), + APIVersion: testapi.Default.GroupVersion().String(), FieldPath: "status.podIP", }, }, @@ -1383,7 +1383,7 @@ func TestMakeEnvironmentVariables(t *testing.T) { Name: "POD_NAME", ValueFrom: &api.EnvVarSource{ FieldRef: &api.ObjectFieldSelector{ - APIVersion: testapi.Default.Version(), + APIVersion: testapi.Default.GroupVersion().String(), FieldPath: "metadata.name", }, }, diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index 580fc725d41..24c213aa0d0 100644 --- a/pkg/master/master_test.go +++ b/pkg/master/master_test.go @@ -69,8 +69,8 @@ func setUp(t *testing.T) (Master, *etcdtesting.EtcdTestServer, Config, *assert.A storageDestinations.AddAPIGroup( "extensions", etcdstorage.NewEtcdStorage(server.Client, testapi.Extensions.Codec(), etcdtest.PathPrefix())) config.StorageDestinations = storageDestinations - storageVersions[""] = testapi.Default.Version() - storageVersions["extensions"] = testapi.Extensions.GroupAndVersion() + storageVersions[""] = testapi.Default.GroupVersion().String() + storageVersions["extensions"] = testapi.Extensions.GroupVersion().String() config.StorageVersions = storageVersions config.PublicAddress = net.ParseIP("192.168.10.4") master.nodeRegistry = registrytest.NewNodeRegistry([]string{"node1", "node2"}, api.NodeResources{}) @@ -413,8 +413,8 @@ func TestDiscoveryAtAPIS(t *testing.T) { expectGroupName := "extensions" expectVersions := []unversioned.GroupVersionForDiscovery{ { - GroupVersion: testapi.Extensions.GroupAndVersion(), - Version: testapi.Extensions.Version(), + GroupVersion: testapi.Extensions.GroupVersion().String(), + Version: testapi.Extensions.GroupVersion().Version, }, } expectPreferredVersion := unversioned.GroupVersionForDiscovery{ diff --git a/pkg/registry/event/strategy_test.go b/pkg/registry/event/strategy_test.go index da5eebd0314..0e7ddc551ff 100644 --- a/pkg/registry/event/strategy_test.go +++ b/pkg/registry/event/strategy_test.go @@ -51,7 +51,7 @@ func TestGetAttrs(t *testing.T) { Name: "foo", Namespace: "baz", UID: "long uid string", - APIVersion: testapi.Default.Version(), + APIVersion: testapi.Default.GroupVersion().String(), ResourceVersion: "0", FieldPath: "", }, @@ -73,7 +73,7 @@ func TestGetAttrs(t *testing.T) { "involvedObject.name": "foo", "involvedObject.namespace": "baz", "involvedObject.uid": "long uid string", - "involvedObject.apiVersion": testapi.Default.Version(), + "involvedObject.apiVersion": testapi.Default.GroupVersion().String(), "involvedObject.resourceVersion": "0", "involvedObject.fieldPath": "", "reason": "ForTesting", diff --git a/pkg/runtime/helper_test.go b/pkg/runtime/helper_test.go index 8afa0c6f90d..36434054cde 100644 --- a/pkg/runtime/helper_test.go +++ b/pkg/runtime/helper_test.go @@ -28,7 +28,7 @@ func TestDecodeList(t *testing.T) { pl := &api.List{ Items: []runtime.Object{ &api.Pod{ObjectMeta: api.ObjectMeta{Name: "1"}}, - &runtime.Unknown{TypeMeta: runtime.TypeMeta{Kind: "Pod", APIVersion: testapi.Default.Version()}, RawJSON: []byte(`{"kind":"Pod","apiVersion":"` + testapi.Default.Version() + `","metadata":{"name":"test"}}`)}, + &runtime.Unknown{TypeMeta: runtime.TypeMeta{Kind: "Pod", APIVersion: testapi.Default.GroupVersion().String()}, RawJSON: []byte(`{"kind":"Pod","apiVersion":"` + testapi.Default.GroupVersion().String() + `","metadata":{"name":"test"}}`)}, &runtime.Unstructured{TypeMeta: runtime.TypeMeta{Kind: "Foo", APIVersion: "Bar"}, Object: map[string]interface{}{"test": "value"}}, }, } diff --git a/pkg/runtime/unstructured_test.go b/pkg/runtime/unstructured_test.go index 8780ea29a6c..120e3ff80a5 100644 --- a/pkg/runtime/unstructured_test.go +++ b/pkg/runtime/unstructured_test.go @@ -26,13 +26,13 @@ import ( ) func TestDecodeUnstructured(t *testing.T) { - version := testapi.Default.Version() - rawJson := fmt.Sprintf(`{"kind":"Pod","apiVersion":"%s","metadata":{"name":"test"}}`, version) + groupVersionString := testapi.Default.GroupVersion().String() + rawJson := fmt.Sprintf(`{"kind":"Pod","apiVersion":"%s","metadata":{"name":"test"}}`, groupVersionString) pl := &api.List{ Items: []runtime.Object{ &api.Pod{ObjectMeta: api.ObjectMeta{Name: "1"}}, - &runtime.Unknown{TypeMeta: runtime.TypeMeta{Kind: "Pod", APIVersion: version}, RawJSON: []byte(rawJson)}, - &runtime.Unknown{TypeMeta: runtime.TypeMeta{Kind: "", APIVersion: version}, RawJSON: []byte(rawJson)}, + &runtime.Unknown{TypeMeta: runtime.TypeMeta{Kind: "Pod", APIVersion: groupVersionString}, RawJSON: []byte(rawJson)}, + &runtime.Unknown{TypeMeta: runtime.TypeMeta{Kind: "", APIVersion: groupVersionString}, RawJSON: []byte(rawJson)}, &runtime.Unstructured{TypeMeta: runtime.TypeMeta{Kind: "Foo", APIVersion: "Bar"}, Object: map[string]interface{}{"test": "value"}}, }, } diff --git a/pkg/storage/etcd/etcd_helper_test.go b/pkg/storage/etcd/etcd_helper_test.go index 41319b2dd84..2b0eb5d4684 100644 --- a/pkg/storage/etcd/etcd_helper_test.go +++ b/pkg/storage/etcd/etcd_helper_test.go @@ -49,7 +49,7 @@ func init() { scheme = runtime.NewScheme() scheme.AddKnownTypes(testapi.Default.InternalGroupVersion(), &storagetesting.TestResource{}) scheme.AddKnownTypes(*testapi.Default.GroupVersion(), &storagetesting.TestResource{}) - codec = runtime.CodecFor(scheme, testapi.Default.Version()) + codec = runtime.CodecFor(scheme, testapi.Default.GroupVersion().String()) scheme.AddConversionFuncs( func(in *storagetesting.TestResource, out *storagetesting.TestResource, s conversion.Scope) error { *out = *in diff --git a/test/e2e/persistent_volumes.go b/test/e2e/persistent_volumes.go index 7239f0dbc6e..4744b8ff959 100644 --- a/test/e2e/persistent_volumes.go +++ b/test/e2e/persistent_volumes.go @@ -153,7 +153,7 @@ func makeCheckPod(ns string, nfsserver string) *api.Pod { return &api.Pod{ TypeMeta: unversioned.TypeMeta{ Kind: "Pod", - APIVersion: testapi.Default.Version(), + APIVersion: testapi.Default.GroupVersion().String(), }, ObjectMeta: api.ObjectMeta{ GenerateName: "checker-", diff --git a/test/e2e/proxy.go b/test/e2e/proxy.go index c597e914a13..21520b3209a 100644 --- a/test/e2e/proxy.go +++ b/test/e2e/proxy.go @@ -36,7 +36,7 @@ import ( ) var _ = Describe("Proxy", func() { - version := testapi.Default.Version() + version := testapi.Default.GroupVersion().Version Context("version "+version, func() { proxyContext(version) }) }) diff --git a/test/integration/auth_test.go b/test/integration/auth_test.go index f3da822a93b..812547847ff 100644 --- a/test/integration/auth_test.go +++ b/test/integration/auth_test.go @@ -79,7 +79,7 @@ func timeoutPath(resource, namespace, name string) string { var aPod string = ` { "kind": "Pod", - "apiVersion": "` + testapi.Default.Version() + `", + "apiVersion": "` + testapi.Default.GroupVersion().String() + `", "metadata": { "name": "a", "creationTimestamp": null%s @@ -97,7 +97,7 @@ var aPod string = ` var aRC string = ` { "kind": "ReplicationController", - "apiVersion": "` + testapi.Default.Version() + `", + "apiVersion": "` + testapi.Default.GroupVersion().String() + `", "metadata": { "name": "a", "labels": { @@ -130,7 +130,7 @@ var aRC string = ` var aService string = ` { "kind": "Service", - "apiVersion": "` + testapi.Default.Version() + `", + "apiVersion": "` + testapi.Default.GroupVersion().String() + `", "metadata": { "name": "a", "labels": { @@ -154,7 +154,7 @@ var aService string = ` var aNode string = ` { "kind": "Node", - "apiVersion": "` + testapi.Default.Version() + `", + "apiVersion": "` + testapi.Default.GroupVersion().String() + `", "metadata": { "name": "a"%s }, @@ -166,7 +166,7 @@ var aNode string = ` var aEvent string = ` { "kind": "Event", - "apiVersion": "` + testapi.Default.Version() + `", + "apiVersion": "` + testapi.Default.GroupVersion().String() + `", "metadata": { "name": "a"%s }, @@ -182,7 +182,7 @@ var aEvent string = ` var aBinding string = ` { "kind": "Binding", - "apiVersion": "` + testapi.Default.Version() + `", + "apiVersion": "` + testapi.Default.GroupVersion().String() + `", "metadata": { "name": "a"%s }, @@ -205,7 +205,7 @@ var emptyEndpoints string = ` var aEndpoints string = ` { "kind": "Endpoints", - "apiVersion": "` + testapi.Default.Version() + `", + "apiVersion": "` + testapi.Default.GroupVersion().String() + `", "metadata": { "name": "a"%s }, @@ -230,7 +230,7 @@ var aEndpoints string = ` var deleteNow string = ` { "kind": "DeleteOptions", - "apiVersion": "` + testapi.Default.Version() + `", + "apiVersion": "` + testapi.Default.GroupVersion().String() + `", "gracePeriodSeconds": 0%s } ` diff --git a/test/integration/extender_test.go b/test/integration/extender_test.go index 240cc90e4f6..c6f56ca0f1f 100644 --- a/test/integration/extender_test.go +++ b/test/integration/extender_test.go @@ -236,7 +236,7 @@ func TestSchedulerExtender(t *testing.T) { }, }, } - policy.APIVersion = testapi.Default.Version() + policy.APIVersion = testapi.Default.GroupVersion().String() schedulerConfigFactory := factory.NewConfigFactory(restClient, nil) schedulerConfig, err := schedulerConfigFactory.CreateFromConfig(policy) diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index 5eb5994bd31..815d1728b50 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -139,9 +139,9 @@ func NewMasterConfig() *master.Config { etcdClient := NewEtcdClient() storageVersions := make(map[string]string) etcdStorage := etcdstorage.NewEtcdStorage(etcdClient, testapi.Default.Codec(), etcdtest.PathPrefix()) - storageVersions[""] = testapi.Default.GroupAndVersion() + storageVersions[""] = testapi.Default.GroupVersion().String() expEtcdStorage := NewExtensionsEtcdStorage(etcdClient) - storageVersions["extensions"] = testapi.Extensions.GroupAndVersion() + storageVersions["extensions"] = testapi.Extensions.GroupVersion().String() storageDestinations := master.NewStorageDestinations() storageDestinations.AddAPIGroup("", etcdStorage) storageDestinations.AddAPIGroup("extensions", expEtcdStorage) diff --git a/test/integration/secret_test.go b/test/integration/secret_test.go index 617b0e6cd5a..a0b53a65b79 100644 --- a/test/integration/secret_test.go +++ b/test/integration/secret_test.go @@ -56,11 +56,11 @@ func TestSecrets(t *testing.T) { framework.DeleteAllEtcdKeys() client := client.NewOrDie(&client.Config{Host: s.URL, GroupVersion: testapi.Default.GroupVersion()}) - DoTestSecrets(t, client, testapi.Default.Version()) + DoTestSecrets(t, client) } // DoTestSecrets test secrets for one api version. -func DoTestSecrets(t *testing.T, client *client.Client, apiVersion string) { +func DoTestSecrets(t *testing.T, client *client.Client) { // Make a secret object. ns := "ns" s := api.Secret{