boring: update the easy test changes

deads2k · deads2k · commit a03cce3bf930 · 2017-12-08T10:55:03.000-05:00
diff --git a/pkg/api/compatibility_test.go b/pkg/api/compatibility_test.go
@@ -12,6 +12,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/validation/field"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	api "k8s.io/kubernetes/pkg/apis/core"
 	"k8s.io/kubernetes/pkg/apis/core/validation"
 )
@@ -57,7 +58,7 @@ func testCompatibility(
 ) {
 
 	// Decode
-	obj, err := runtime.Decode(api.Codecs.UniversalDecoder(), input)
+	obj, err := runtime.Decode(legacyscheme.Codecs.UniversalDecoder(), input)
 	if err != nil {
 		t.Fatalf("Unexpected error: %v", err)
 	}
@@ -69,7 +70,7 @@ func testCompatibility(
 	}
 
 	// Encode
-	output := runtime.EncodeOrDie(api.Codecs.LegacyCodec(schema.GroupVersion{Group: "", Version: version}), obj)
+	output := runtime.EncodeOrDie(legacyscheme.Codecs.LegacyCodec(schema.GroupVersion{Group: "", Version: version}), obj)
 
 	// Validate old and new fields are encoded
 	generic := map[string]interface{}{}
diff --git a/pkg/api/graph/test/runtimeobject_nodebuilder.go b/pkg/api/graph/test/runtimeobject_nodebuilder.go
@@ -5,10 +5,8 @@ import (
 	"path/filepath"
 	"reflect"
 
-	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
-	kapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	"k8s.io/kubernetes/pkg/apis/autoscaling"
 	kapi "k8s.io/kubernetes/pkg/apis/core"
@@ -134,25 +132,24 @@ func BuildGraph(path string) (osgraph.Graph, []runtime.Object, error) {
 	}
 
 	mapper := legacyscheme.Registry.RESTMapper()
-	typer := legacyscheme.Scheme
-	clientMapper := resource.ClientMapperFunc(func(mapping *meta.RESTMapping) (resource.RESTClient, error) {
-		return nil, nil
-	})
 
-	r := resource.NewBuilder(
+	builder := resource.NewBuilder(
 		&resource.Mapper{
 			RESTMapper:   mapper,
-			ObjectTyper:  typer,
-			ClientMapper: clientMapper,
+			ObjectTyper:  legacyscheme.Scheme,
+			ClientMapper: resource.DisabledClientForMapping{},
 			Decoder:      legacyscheme.Codecs.UniversalDecoder(),
 		},
 		&resource.Mapper{
 			RESTMapper:   mapper,
-			ObjectTyper:  typer,
-			ClientMapper: clientMapper,
+			ObjectTyper:  legacyscheme.Scheme,
+			ClientMapper: resource.DisabledClientForMapping{},
 			Decoder:      unstructured.UnstructuredJSONScheme,
 		},
-		categories.SimpleCategoryExpander{}).
+		categories.SimpleCategoryExpander{},
+	)
+
+	r := builder.
 		Internal().
 		FilenameParam(false, &resource.FilenameOptions{Recursive: false, Filenames: []string{abspath}}).
 		Flatten().
diff --git a/pkg/api/validation/register.go b/pkg/api/validation/register.go
@@ -13,7 +13,6 @@ import (
 	securityvalidation "github.com/openshift/origin/pkg/security/apis/security/validation"
 	templatevalidation "github.com/openshift/origin/pkg/template/apis/template/validation"
 	uservalidation "github.com/openshift/origin/pkg/user/apis/user/validation"
-	extvalidation "k8s.io/kubernetes/pkg/apis/extensions/validation"
 
 	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
@@ -27,7 +26,6 @@ import (
 	securityapi "github.com/openshift/origin/pkg/security/apis/security"
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"
 	userapi "github.com/openshift/origin/pkg/user/apis/user"
-	"k8s.io/kubernetes/pkg/apis/extensions"
 
 	// required to be loaded before we register
 	_ "github.com/openshift/origin/pkg/api/install"
@@ -66,7 +64,6 @@ func registerAll() {
 	Validator.MustRegister(&deployapi.DeploymentConfigRollback{}, deployvalidation.ValidateDeploymentConfigRollback, nil)
 	Validator.MustRegister(&deployapi.DeploymentLogOptions{}, deployvalidation.ValidateDeploymentLogOptions, nil)
 	Validator.MustRegister(&deployapi.DeploymentRequest{}, deployvalidation.ValidateDeploymentRequest, nil)
-	Validator.MustRegister(&extensions.Scale{}, extvalidation.ValidateScale, nil)
 
 	Validator.MustRegister(&imageapi.Image{}, imagevalidation.ValidateImage, imagevalidation.ValidateImageUpdate)
 	Validator.MustRegister(&imageapi.ImageSignature{}, imagevalidation.ValidateImageSignature, imagevalidation.ValidateImageSignatureUpdate)
diff --git a/pkg/api/validation/validation.go b/pkg/api/validation/validation.go
@@ -8,7 +8,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
-	"k8s.io/kubernetes/pkg/kubectl/validation"
 )
 
 type RuntimeObjectValidator interface {
@@ -85,7 +84,7 @@ func (v *RuntimeObjectsValidator) ValidateUpdate(obj, old runtime.Object) field.
 		return field.ErrorList{}
 	}
 	if newType, oldType := reflect.TypeOf(obj), reflect.TypeOf(old); newType != oldType {
-		return field.ErrorList{field.Invalid(field.NewPath("kind"), newType.Kind(), validation.NewInvalidTypeError(oldType.Kind(), newType.Kind(), "runtime.Object").Error())}
+		return field.ErrorList{field.Invalid(field.NewPath("kind"), newType.Kind(), fmt.Sprintf("expected type %s, for field %s, got %s", oldType.Kind().String(), "kind", newType.Kind().String()))}
 	}
 
 	allErrs := field.ErrorList{}
diff --git a/test/common/build/controllers.go b/test/common/build/controllers.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/golang/glog"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
diff --git a/test/extended/builds/image_source.go b/test/extended/builds/image_source.go
@@ -5,10 +5,10 @@ import (
 
 	g "github.com/onsi/ginkgo"
 	o "github.com/onsi/gomega"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 
 	kapiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	kapi "k8s.io/kubernetes/pkg/apis/core"
 
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
 	exutil "github.com/openshift/origin/test/extended/util"
diff --git a/test/extended/builds/s2i_quota.go b/test/extended/builds/s2i_quota.go
@@ -5,8 +5,7 @@ import (
 
 	g "github.com/onsi/ginkgo"
 	o "github.com/onsi/gomega"
-
-	kapi "k8s.io/kubernetes/pkg/apis/core"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 
 	buildapi "github.com/openshift/origin/pkg/build/apis/build"
 	exutil "github.com/openshift/origin/test/extended/util"
diff --git a/test/extended/dns/dns.go b/test/extended/dns/dns.go
@@ -16,8 +16,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/apimachinery/pkg/watch"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	api "k8s.io/kubernetes/pkg/apis/core"
-	kapi "k8s.io/kubernetes/pkg/apis/core"
 	e2e "k8s.io/kubernetes/test/e2e/framework"
 )
 
diff --git a/test/extended/networking/util.go b/test/extended/networking/util.go
@@ -13,9 +13,9 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	kapierrs "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apiserver/pkg/storage/names"
 	kclientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/util/retry"
-	kapiv1 "k8s.io/kubernetes/pkg/apis/core/v1"
 	kapiv1pod "k8s.io/kubernetes/pkg/api/v1/pod"
 	e2e "k8s.io/kubernetes/test/e2e/framework"
 
@@ -356,7 +356,7 @@ func checkServiceConnectivity(serverFramework, clientFramework *e2e.Framework, n
 	makeNamespaceScheduleToAllNodes(serverFramework)
 	makeNamespaceScheduleToAllNodes(clientFramework)
 	serverNode, clientNode := findAppropriateNodes(serverFramework, nodeType)
-	podName := kapiv1.SimpleNameGenerator.GenerateName("service-")
+	podName := names.SimpleNameGenerator.GenerateName("service-")
 	defer serverFramework.ClientSet.CoreV1().Pods(serverFramework.Namespace.Name).Delete(podName, nil)
 	defer serverFramework.ClientSet.CoreV1().Services(serverFramework.Namespace.Name).Delete(podName, nil)
 	ip := launchWebserverService(serverFramework, podName, serverNode.Name)
diff --git a/test/extended/templates/templateservicebroker_e2e.go b/test/extended/templates/templateservicebroker_e2e.go
@@ -8,6 +8,7 @@ import (
 	o "github.com/onsi/gomega"
 	"github.com/pborman/uuid"
 	"golang.org/x/net/context"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 
 	"k8s.io/api/core/v1"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
diff --git a/test/extended/util/framework.go b/test/extended/util/framework.go
@@ -15,6 +15,7 @@ import (
 
 	g "github.com/onsi/ginkgo"
 	o "github.com/onsi/gomega"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 
 	batchv1 "k8s.io/api/batch/v1"
 	kapiv1 "k8s.io/api/core/v1"
@@ -29,8 +30,8 @@ import (
 	kclientset "k8s.io/client-go/kubernetes"
 	kbatchclient "k8s.io/client-go/kubernetes/typed/batch/v1"
 	kcoreclient "k8s.io/client-go/kubernetes/typed/core/v1"
-	kapi "k8s.io/kubernetes/pkg/apis/core"
 	"k8s.io/kubernetes/pkg/apis/authorization"
+	kapi "k8s.io/kubernetes/pkg/apis/core"
 	kinternalcoreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
 	"k8s.io/kubernetes/pkg/quota"
 	e2e "k8s.io/kubernetes/test/e2e/framework"
diff --git a/test/integration/admissionconfig_test.go b/test/integration/admissionconfig_test.go
@@ -13,6 +13,7 @@ import (
 	kyaml "k8s.io/apimachinery/pkg/util/yaml"
 	"k8s.io/apiserver/pkg/admission"
 	"k8s.io/client-go/rest"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	kapi "k8s.io/kubernetes/pkg/apis/core"
 	kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 
diff --git a/test/integration/authorization_test.go b/test/integration/authorization_test.go
@@ -15,9 +15,10 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/rest"
-	kapi "k8s.io/kubernetes/pkg/apis/core"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	appsapi "k8s.io/kubernetes/pkg/apis/apps"
 	kubeauthorizationapi "k8s.io/kubernetes/pkg/apis/authorization"
+	kapi "k8s.io/kubernetes/pkg/apis/core"
 	extensionsapi "k8s.io/kubernetes/pkg/apis/extensions"
 	kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/authorization/internalversion"
diff --git a/test/integration/deploy_defaults_test.go b/test/integration/deploy_defaults_test.go
@@ -11,6 +11,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/diff"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	kapi "k8s.io/kubernetes/pkg/apis/core"
 
 	appsapiv1 "github.com/openshift/api/apps/v1"
diff --git a/test/integration/etcd_storage_path_test.go b/test/integration/etcd_storage_path_test.go
@@ -20,6 +20,7 @@ import (
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/util/flowcontrol"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	kapi "k8s.io/kubernetes/pkg/apis/core"
 	kapihelper "k8s.io/kubernetes/pkg/apis/core/helper"
 
diff --git a/test/integration/imagestream_test.go b/test/integration/imagestream_test.go
@@ -9,6 +9,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/diff"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	kapi "k8s.io/kubernetes/pkg/apis/core"
 
 	deployapi "github.com/openshift/origin/pkg/apps/apis/apps"
diff --git a/test/integration/master_routes_test.go b/test/integration/master_routes_test.go
@@ -17,6 +17,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/diff"
 	knet "k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	kapi "k8s.io/kubernetes/pkg/apis/core"
 
 	buildv1 "github.com/openshift/api/build/v1"
diff --git a/test/integration/newapp_test.go b/test/integration/newapp_test.go
@@ -21,6 +21,7 @@ import (
 	"github.com/AaronO/go-git-http/auth"
 	"github.com/elazarl/goproxy"
 	docker "github.com/fsouza/go-dockerclient"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/test/integration/ownerrefs_test.go b/test/integration/ownerrefs_test.go
@@ -6,6 +6,7 @@ import (
 
 	kapierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
 	kapi "k8s.io/kubernetes/pkg/apis/core"
 
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
@@ -64,8 +65,18 @@ func TestOwnerRefRestriction(t *testing.T) {
 
 	_, err = creatorClient.Core().Services("foo").Create(&kapi.Service{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:            "my-service",
-			OwnerReferences: []metav1.OwnerReference{{}},
+			Name: "my-service",
+			OwnerReferences: []metav1.OwnerReference{{
+				APIVersion: "foo",
+				Kind:       "bar",
+				Name:       "baz",
+				UID:        types.UID("baq"),
+			}},
+		},
+		Spec: kapi.ServiceSpec{
+			Ports: []kapi.ServicePort{
+				{Port: 80},
+			},
 		},
 	})
 	if err == nil {
diff --git a/test/integration/storage_versions_test.go b/test/integration/storage_versions_test.go
@@ -8,13 +8,14 @@ import (
 	etcd "github.com/coreos/etcd/client"
 	"github.com/coreos/etcd/clientv3"
 	"golang.org/x/net/context"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 
 	batch_v1 "k8s.io/api/batch/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	kapi "k8s.io/kubernetes/pkg/apis/core"
 	"k8s.io/kubernetes/pkg/apis/batch"
+	kapi "k8s.io/kubernetes/pkg/apis/core"
 	kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	kbatchclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/batch/internalversion"
 
diff --git a/test/integration/template_test.go b/test/integration/template_test.go
@@ -10,7 +10,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	kapi "k8s.io/kubernetes/pkg/apis/core"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"
 	"github.com/openshift/origin/pkg/template/client/internalversion"
diff --git a/test/util/etcd.go b/test/util/etcd.go
@@ -14,7 +14,6 @@ import (
 
 	etcdtest "k8s.io/apiserver/pkg/storage/etcd/testing"
 	"k8s.io/apiserver/pkg/storage/storagebackend"
-	kapi "k8s.io/kubernetes/pkg/apis/core"
 	"k8s.io/kubernetes/pkg/capabilities"
 
 	serveretcd "github.com/openshift/origin/pkg/cmd/server/etcd"
@@ -43,7 +42,7 @@ type EtcdTestServer struct {
 
 // RequireEtcd verifies if the etcd is running and accessible for testing
 func RequireEtcd(t *testing.T) EtcdTestServer {
-	s, _ := etcdtest.NewUnsecuredEtcd3TestClientServer(t, legacyscheme.Scheme)
+	s, _ := etcdtest.NewUnsecuredEtcd3TestClientServer(t)
 	t.Logf("endpoints: %v", s.V3Client.Endpoints())
 	url = s.V3Client.Endpoints()[0]
 	return EtcdTestServer{s}
@@ -58,7 +57,7 @@ func RequireEtcd2(t *testing.T) EtcdTestServer {
 }
 
 func RequireEtcd3(t *testing.T) (*etcdtest.EtcdTestServer, *storagebackend.Config) {
-	s, c := etcdtest.NewUnsecuredEtcd3TestClientServer(t, legacyscheme.Scheme)
+	s, c := etcdtest.NewUnsecuredEtcd3TestClientServer(t)
 	url = s.V3Client.Endpoints()[0]
 	return s, c
 }
diff --git a/test/util/helpers.go b/test/util/helpers.go
@@ -5,7 +5,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/runtime"
 	kyaml "k8s.io/apimachinery/pkg/util/yaml"
-	kapi "k8s.io/kubernetes/pkg/apis/core"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 
 	imageapi "github.com/openshift/origin/pkg/image/apis/image"
 	templateapi "github.com/openshift/origin/pkg/template/apis/template"

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import (`
`8`	`8`	`"k8s.io/apimachinery/pkg/runtime"`
`9`	`9`	`"k8s.io/apimachinery/pkg/util/validation/field"`
`10`	`10`	`"k8s.io/kubernetes/pkg/api/legacyscheme"`
`11`		`- "k8s.io/kubernetes/pkg/kubectl/validation"`
`12`	`11`	`)`
`13`	`12`
`14`	`13`	`type RuntimeObjectValidator interface {`
`@@ -85,7 +84,7 @@ func (v *RuntimeObjectsValidator) ValidateUpdate(obj, old runtime.Object) field.`
`85`	`84`	`return field.ErrorList{}`
`86`	`85`	`}`
`87`	`86`	`if newType, oldType := reflect.TypeOf(obj), reflect.TypeOf(old); newType != oldType {`
`88`		`- return field.ErrorList{field.Invalid(field.NewPath("kind"), newType.Kind(), validation.NewInvalidTypeError(oldType.Kind(), newType.Kind(), "runtime.Object").Error())}`
	`87`	`+ return field.ErrorList{field.Invalid(field.NewPath("kind"), newType.Kind(), fmt.Sprintf("expected type %s, for field %s, got %s", oldType.Kind().String(), "kind", newType.Kind().String()))}`
`89`	`88`	`}`
`90`	`89`
`91`	`90`	`allErrs := field.ErrorList{}`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ import (`
`16`	`16`	`"k8s.io/apimachinery/pkg/util/sets"`
`17`	`17`	`"k8s.io/apimachinery/pkg/util/uuid"`
`18`	`18`	`"k8s.io/apimachinery/pkg/watch"`
	`19`	`+ "k8s.io/kubernetes/pkg/api/legacyscheme"`
`19`	`20`	`api "k8s.io/kubernetes/pkg/apis/core"`
`20`		`- kapi "k8s.io/kubernetes/pkg/apis/core"`
`21`	`21`	`e2e "k8s.io/kubernetes/test/e2e/framework"`
`22`	`22`	`)`
`23`	`23`