diff --git a/pkg/api/errors/errors.go b/pkg/api/errors/errors.go index a51fe941469..432bbed8559 100644 --- a/pkg/api/errors/errors.go +++ b/pkg/api/errors/errors.go @@ -329,9 +329,9 @@ func NewGenericServerResponse(code int, verb string, qualifiedResource unversion } } switch { - case !qualifiedResource.IsEmpty() && len(name) > 0: + case !qualifiedResource.Empty() && len(name) > 0: message = fmt.Sprintf("%s (%s %s %s)", message, strings.ToLower(verb), qualifiedResource.String(), name) - case !qualifiedResource.IsEmpty(): + case !qualifiedResource.Empty(): message = fmt.Sprintf("%s (%s %s)", message, strings.ToLower(verb), qualifiedResource.String()) } var causes []unversioned.StatusCause diff --git a/pkg/api/meta/restmapper.go b/pkg/api/meta/restmapper.go index 3ec95925982..d95d49385da 100644 --- a/pkg/api/meta/restmapper.go +++ b/pkg/api/meta/restmapper.go @@ -183,7 +183,7 @@ func (m *DefaultRESTMapper) ResourceSingularizer(resourceType string) (string, e if !ok { continue } - if singular.IsEmpty() { + if singular.Empty() { singular = currSingular continue } @@ -193,7 +193,7 @@ func (m *DefaultRESTMapper) ResourceSingularizer(resourceType string) (string, e } } - if singular.IsEmpty() { + if singular.Empty() { return resourceType, fmt.Errorf("no singular of resource %v has been defined", resourceType) } diff --git a/pkg/api/unversioned/group_version.go b/pkg/api/unversioned/group_version.go index 73cc1eb0556..dfbfe3a32ac 100644 --- a/pkg/api/unversioned/group_version.go +++ b/pkg/api/unversioned/group_version.go @@ -50,7 +50,7 @@ func (gr GroupResource) WithVersion(version string) GroupVersionResource { return GroupVersionResource{Group: gr.Group, Version: version, Resource: gr.Resource} } -func (gr GroupResource) IsEmpty() bool { +func (gr GroupResource) Empty() bool { return len(gr.Group) == 0 && len(gr.Resource) == 0 } @@ -81,7 +81,7 @@ type GroupVersionResource struct { Resource string `protobuf:"bytes,3,opt,name=resource"` } -func (gvr GroupVersionResource) IsEmpty() bool { +func (gvr GroupVersionResource) Empty() bool { return len(gvr.Group) == 0 && len(gvr.Version) == 0 && len(gvr.Resource) == 0 } @@ -106,7 +106,7 @@ type GroupKind struct { Kind string `protobuf:"bytes,2,opt,name=kind"` } -func (gk GroupKind) IsEmpty() bool { +func (gk GroupKind) Empty() bool { return len(gk.Group) == 0 && len(gk.Kind) == 0 } @@ -131,8 +131,8 @@ type GroupVersionKind struct { Kind string `protobuf:"bytes,3,opt,name=kind"` } -// IsEmpty returns true if group, version, and kind are empty -func (gvk GroupVersionKind) IsEmpty() bool { +// Empty returns true if group, version, and kind are empty +func (gvk GroupVersionKind) Empty() bool { return len(gvk.Group) == 0 && len(gvk.Version) == 0 && len(gvk.Kind) == 0 } @@ -156,8 +156,8 @@ type GroupVersion struct { Version string `protobuf:"bytes,2,opt,name=version"` } -// IsEmpty returns true if group and version are empty -func (gv GroupVersion) IsEmpty() bool { +// Empty returns true if group and version are empty +func (gv GroupVersion) Empty() bool { return len(gv.Group) == 0 && len(gv.Version) == 0 } @@ -165,7 +165,7 @@ func (gv GroupVersion) IsEmpty() bool { // it returns "v1". func (gv GroupVersion) String() string { // special case the internal apiVersion for the legacy kube types - if gv.IsEmpty() { + if gv.Empty() { return "" } diff --git a/pkg/apiserver/api_installer.go b/pkg/apiserver/api_installer.go index 49be3ca3fad..406e8a2ced8 100644 --- a/pkg/apiserver/api_installer.go +++ b/pkg/apiserver/api_installer.go @@ -137,7 +137,7 @@ func (a *APIInstaller) getResourceKind(path string, storage rest.Storage) (unver fqKindToRegister = a.group.GroupVersion.WithKind(fqKind.Kind) } } - if fqKindToRegister.IsEmpty() { + if fqKindToRegister.Empty() { return unversioned.GroupVersionKind{}, fmt.Errorf("unable to locate fully qualified kind for %v: found %v when registering for %v", reflect.TypeOf(object), fqKinds, a.group.GroupVersion) } return fqKindToRegister, nil diff --git a/pkg/client/typed/discovery/discovery_client.go b/pkg/client/typed/discovery/discovery_client.go index 1bd18b9548c..bded981f031 100644 --- a/pkg/client/typed/discovery/discovery_client.go +++ b/pkg/client/typed/discovery/discovery_client.go @@ -234,7 +234,7 @@ func (d *DiscoveryClient) ServerVersion() (*version.Info, error) { // SwaggerSchema retrieves and parses the swagger API schema the server supports. func (d *DiscoveryClient) SwaggerSchema(version unversioned.GroupVersion) (*swagger.ApiDeclaration, error) { - if version.IsEmpty() { + if version.Empty() { return nil, fmt.Errorf("groupVersion cannot be empty") } diff --git a/pkg/kubectl/cmd/explain.go b/pkg/kubectl/cmd/explain.go index 0939fc8b4cb..8cf45ab8ef3 100644 --- a/pkg/kubectl/cmd/explain.go +++ b/pkg/kubectl/cmd/explain.go @@ -84,7 +84,7 @@ func RunExplain(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []st if fullySpecifiedGVR != nil { gvk, _ = mapper.KindFor(*fullySpecifiedGVR) } - if gvk.IsEmpty() { + if gvk.Empty() { gvk, err = mapper.KindFor(groupResource.WithVersion("")) if err != nil { return err diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index d2518491edc..fca22a810c1 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/pkg/kubectl/cmd/util/factory.go @@ -1270,10 +1270,10 @@ func (f *Factory) PrinterForMapping(cmd *cobra.Command, mapping *meta.RESTMappin if err != nil { return nil, err } - if version.IsEmpty() && mapping != nil { + if version.Empty() && mapping != nil { version = mapping.GroupVersionKind.GroupVersion() } - if version.IsEmpty() { + if version.Empty() { return nil, fmt.Errorf("you must specify an output-version when using this output format") } diff --git a/pkg/kubectl/resource/builder.go b/pkg/kubectl/resource/builder.go index f7d4d6cf844..ed7f1117e22 100644 --- a/pkg/kubectl/resource/builder.go +++ b/pkg/kubectl/resource/builder.go @@ -454,7 +454,7 @@ func (b *Builder) mappingFor(resourceArg string) (*meta.RESTMapping, error) { if fullySpecifiedGVR != nil { gvk, _ = b.mapper.KindFor(*fullySpecifiedGVR) } - if gvk.IsEmpty() { + if gvk.Empty() { var err error gvk, err = b.mapper.KindFor(groupResource.WithVersion("")) if err != nil { diff --git a/pkg/kubectl/resource/result.go b/pkg/kubectl/resource/result.go index 5c488506758..892b30e947a 100644 --- a/pkg/kubectl/resource/result.go +++ b/pkg/kubectl/resource/result.go @@ -250,7 +250,7 @@ func AsVersionedObjects(infos []*Info, version unversioned.GroupVersion, encoder // objects that are not part of api.Scheme must be converted to JSON // TODO: convert to map[string]interface{}, attach to runtime.Unknown? - if !version.IsEmpty() { + if !version.Empty() { if _, _, err := api.Scheme.ObjectKinds(info.Object); runtime.IsNotRegisteredError(err) { // TODO: ideally this would encode to version, but we don't expose multiple codecs here. data, err := runtime.Encode(encoder, info.Object) @@ -277,7 +277,7 @@ func AsVersionedObjects(infos []*Info, version unversioned.GroupVersion, encoder func tryConvert(converter runtime.ObjectConvertor, object runtime.Object, versions ...unversioned.GroupVersion) (runtime.Object, error) { var last error for _, version := range versions { - if version.IsEmpty() { + if version.Empty() { return object, nil } obj, err := converter.ConvertToVersion(object, version) diff --git a/pkg/kubectl/resource/visitor.go b/pkg/kubectl/resource/visitor.go index 3d260c2d4bd..365427c4ea1 100644 --- a/pkg/kubectl/resource/visitor.go +++ b/pkg/kubectl/resource/visitor.go @@ -385,7 +385,7 @@ func (v FlattenListVisitor) Visit(fn VisitorFunc) error { // If we have a GroupVersionKind on the list, prioritize that when asking for info on the objects contained in the list var preferredGVKs []unversioned.GroupVersionKind - if info.Mapping != nil && !info.Mapping.GroupVersionKind.IsEmpty() { + if info.Mapping != nil && !info.Mapping.GroupVersionKind.Empty() { preferredGVKs = append(preferredGVKs, info.Mapping.GroupVersionKind) } diff --git a/pkg/registry/thirdpartyresourcedata/codec.go b/pkg/registry/thirdpartyresourcedata/codec.go index 64308565e77..89993400194 100644 --- a/pkg/registry/thirdpartyresourcedata/codec.go +++ b/pkg/registry/thirdpartyresourcedata/codec.go @@ -517,7 +517,7 @@ func (t *thirdPartyResourceDataEncoder) Encode(obj runtime.Object, stream io.Wri listItems[ix] = json.RawMessage(buff.Bytes()) } - if t.gvk.IsEmpty() { + if t.gvk.Empty() { return fmt.Errorf("thirdPartyResourceDataEncoder was not given a target version") } diff --git a/pkg/runtime/unstructured.go b/pkg/runtime/unstructured.go index 7f275ef1a9a..e14c8840b60 100644 --- a/pkg/runtime/unstructured.go +++ b/pkg/runtime/unstructured.go @@ -188,7 +188,7 @@ func (UnstructuredObjectConverter) Convert(in, out, context interface{}) error { } func (UnstructuredObjectConverter) ConvertToVersion(in Object, target GroupVersioner) (Object, error) { - if kind := in.GetObjectKind().GroupVersionKind(); !kind.IsEmpty() { + if kind := in.GetObjectKind().GroupVersionKind(); !kind.Empty() { gvk, ok := target.KindForGroupVersionKinds([]unversioned.GroupVersionKind{kind}) if !ok { // TODO: should this be a typed error?