Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

apimachinery: remove unneeded GetObjectKind() impls #48608

Merged
merged 1 commit into from
Jul 8, 2017
Merged

apimachinery: remove unneeded GetObjectKind() impls #48608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions cmd/libs/go2idl/client-gen/test_apis/testgroup/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion)
return nil
}

func (obj *TestType) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *TestTypeList) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
3 changes: 0 additions & 3 deletions cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}

func (obj *TestType) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *TestTypeList) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
2 changes: 0 additions & 2 deletions pkg/api/ref/ref_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ type ExtensionAPIObject struct {
metav1.ObjectMeta
}

func (obj *ExtensionAPIObject) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

func TestGetReference(t *testing.T) {

// when vendoring kube, if you don't force the set of registered versions (like make test does)
Expand Down
2 changes: 0 additions & 2 deletions pkg/apis/abac/v0/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
)
return nil
}

func (obj *Policy) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
2 changes: 0 additions & 2 deletions pkg/apis/abac/v1beta1/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,3 @@ func addKnownTypes(scheme *runtime.Scheme) error {
)
return nil
}

func (obj *Policy) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
3 changes: 0 additions & 3 deletions pkg/controller/garbagecollector/metaonly/metaonly.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ import (
"k8s.io/kubernetes/pkg/api"
)

func (obj *MetadataOnlyObject) GetObjectKind() schema.ObjectKind { return obj }
func (obj *MetadataOnlyObjectList) GetObjectKind() schema.ObjectKind { return obj }

type metaOnlyJSONScheme struct{}

// This function can be extended to mapping different gvk to different MetadataOnlyObject,
Expand Down
1 change: 0 additions & 1 deletion pkg/kubectl/testing/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ go_library(
deps = [
"//vendor/github.com/ugorji/go/codec:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
],
)
Expand Down
3 changes: 0 additions & 3 deletions pkg/kubectl/testing/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package testing

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
)

type TestStruct struct {
Expand All @@ -30,5 +29,3 @@ type TestStruct struct {
StringList []string `json:"StringList"`
IntList []int `json:"IntList"`
}

func (obj *TestStruct) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
2 changes: 1 addition & 1 deletion staging/src/k8s.io/apimachinery/pkg/runtime/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func (obj *TypeMeta) GroupVersionKind() schema.GroupVersionKind {
return schema.FromAPIVersionAndKind(obj.APIVersion, obj.Kind)
}

func (obj *Unknown) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

didn't expect this change

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It embeds runtime.TypeMeta.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In fact, they are unrelated and only happen to be at the same location. Unknown embeds runtime.TypeMeta, and the whole point of the PR is to add GetObjectKind also to runtime.TypeMeta (in analogy to metav1.TypeMeta).

func (obj *TypeMeta) GetObjectKind() schema.ObjectKind { return obj }

// GetObjectKind implements Object for VersionedObjects, returning an empty ObjectKind
// interface if no objects are provided, or the ObjectKind interface of the object in the
Expand Down
9 changes: 2 additions & 7 deletions staging/src/k8s.io/apimachinery/pkg/runtime/scheme_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,15 +441,10 @@ func TestAddKnownTypesIdemPotent(t *testing.T) {
}
}

// EmbeddableTypeMeta passes GetObjectKind to the type which embeds it.
type EmbeddableTypeMeta runtime.TypeMeta

func (tm *EmbeddableTypeMeta) GetObjectKind() schema.ObjectKind { return (*runtime.TypeMeta)(tm) }

// redefine InternalSimple with the same name, but obviously as a different type than in runtimetesting
type InternalSimple struct {
EmbeddableTypeMeta `json:",inline"`
TestString string `json:"testString"`
runtime.TypeMeta `json:",inline"`
TestString string `json:"testString"`
}

func (s *InternalSimple) DeepCopyObject() runtime.Object { return nil }
Expand Down
22 changes: 2 additions & 20 deletions staging/src/k8s.io/apimachinery/pkg/runtime/testing/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,23 +190,5 @@ func (obj *MyWeirdCustomEmbeddedVersionKindField) GroupVersionKind() schema.Grou
return schema.FromAPIVersionAndKind(obj.APIVersion, obj.ObjectKind)
}

func (obj *TestType2) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind }
func (obj *ExternalTestType2) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind }
func (obj *InternalComplex) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *ExternalComplex) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *EmbeddedTest) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *EmbeddedTestExternal) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *InternalSimple) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *ExternalSimple) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *InternalOptionalExtensionType) GetObjectKind() schema.ObjectKind {
return &obj.TypeMeta
}
func (obj *ObjectTestExternal) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *ObjectTest) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *ExternalOptionalExtensionType) GetObjectKind() schema.ObjectKind {
return &obj.TypeMeta
}
func (obj *InternalExtensionType) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *ExternalExtensionType) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *ExtensionA) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *ExtensionB) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
func (obj *TestType2) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind }
func (obj *ExternalTestType2) GetObjectKind() schema.ObjectKind { return schema.EmptyObjectKind }
2 changes: 0 additions & 2 deletions staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ type TestPatchSubType struct {
StringField string `json:"theField"`
}

func (obj *testPatchType) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

func TestPatchAnonymousField(t *testing.T) {
testGV := schema.GroupVersion{Group: "", Version: "v"}
scheme.AddKnownTypes(testGV, &testPatchType{})
Expand Down
1 change: 0 additions & 1 deletion staging/src/k8s.io/apiserver/pkg/endpoints/testing/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ go_library(
"//vendor/github.com/ugorji/go/codec:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
],
)
11 changes: 0 additions & 11 deletions staging/src/k8s.io/apiserver/pkg/endpoints/testing/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package testing

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
)

type Simple struct {
Expand All @@ -30,8 +29,6 @@ type Simple struct {
Labels map[string]string `json:"labels,omitempty"`
}

func (obj *Simple) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

type SimpleRoot struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata"`
Expand All @@ -41,8 +38,6 @@ type SimpleRoot struct {
Labels map[string]string `json:"labels,omitempty"`
}

func (obj *SimpleRoot) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

type SimpleGetOptions struct {
metav1.TypeMeta `json:",inline"`
Param1 string `json:"param1"`
Expand All @@ -57,17 +52,13 @@ func (SimpleGetOptions) SwaggerDoc() map[string]string {
}
}

func (obj *SimpleGetOptions) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

type SimpleList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,inline"`
// +optional
Items []Simple `json:"items,omitempty"`
}

func (obj *SimpleList) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }

// SimpleXGSubresource is a cross group subresource, i.e. the subresource does not belong to the
// same group as its parent resource.
type SimpleXGSubresource struct {
Expand All @@ -76,5 +67,3 @@ type SimpleXGSubresource struct {
SubresourceInfo string `json:"subresourceInfo,omitempty"`
Labels map[string]string `json:"labels,omitempty"`
}

func (obj *SimpleXGSubresource) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
1 change: 0 additions & 1 deletion staging/src/k8s.io/apiserver/pkg/storage/testing/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
"//vendor/k8s.io/apiserver/pkg/storage:go_default_library",
],
Expand Down
3 changes: 0 additions & 3 deletions staging/src/k8s.io/apiserver/pkg/storage/testing/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,10 @@ package testing

import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
)

type TestResource struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata"`
Value int `json:"value"`
}

func (obj *TestResource) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }