Move ObjectClient to different package

controller/generic_controller.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/juju/ratelimit"
 	errors2 "github.com/pkg/errors"
-	"github.com/rancher/norman/clientbase"
+	"github.com/rancher/norman/objectclient"
 	"github.com/rancher/norman/types"
 	"github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -40,7 +40,7 @@ type GenericController interface {
 type Backend interface {
 	List(opts metav1.ListOptions) (runtime.Object, error)
 	Watch(opts metav1.ListOptions) (watch.Interface, error)
-	ObjectFactory() clientbase.ObjectFactory
+	ObjectFactory() objectclient.ObjectFactory
 }
 
 type handlerDef struct {

generator/controller_template.go

@@ -6,7 +6,7 @@ import (
 	"context"
 
 	{{.importPackage}}
-	"github.com/rancher/norman/clientbase"
+	"github.com/rancher/norman/objectclient"
 	"github.com/rancher/norman/controller"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -59,7 +59,7 @@ type {{.schema.CodeName}}Controller interface {
 }
 
 type {{.schema.CodeName}}Interface interface {
-    ObjectClient() *clientbase.ObjectClient
+    ObjectClient() *objectclient.ObjectClient
 	Create(*{{.prefix}}{{.schema.CodeName}}) (*{{.prefix}}{{.schema.CodeName}}, error)
 	GetNamespaced(namespace, name string, opts metav1.GetOptions) (*{{.prefix}}{{.schema.CodeName}}, error)
 	Get(name string, opts metav1.GetOptions) (*{{.prefix}}{{.schema.CodeName}}, error)
@@ -185,11 +185,11 @@ func (s *{{.schema.ID}}Client) Controller() {{.schema.CodeName}}Controller {
 type {{.schema.ID}}Client struct {
 	client *Client
 	ns string
-	objectClient *clientbase.ObjectClient
+	objectClient *objectclient.ObjectClient
 	controller   {{.schema.CodeName}}Controller
 }
 
-func (s *{{.schema.ID}}Client) ObjectClient() *clientbase.ObjectClient {
+func (s *{{.schema.ID}}Client) ObjectClient() *objectclient.ObjectClient {
 	return s.objectClient
 }
 

generator/k8s_client_template.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 	"context"
 
-	"github.com/rancher/norman/clientbase"
+	"github.com/rancher/norman/objectclient"
 	"github.com/rancher/norman/controller"
 	"github.com/rancher/norman/restwatch"
 	"k8s.io/client-go/dynamic"
@@ -64,7 +64,7 @@ type {{.CodeNamePlural}}Getter interface {
 }
 
 func (c *Client) {{.CodeNamePlural}}(namespace string) {{.CodeName}}Interface {
-	objectClient := clientbase.NewObjectClient(namespace, c.restClient, &{{.CodeName}}Resource, {{.CodeName}}GroupVersionKind, {{.ID}}Factory{})
+	objectClient := objectclient.NewObjectClient(namespace, c.restClient, &{{.CodeName}}Resource, {{.CodeName}}GroupVersionKind, {{.ID}}Factory{})
 	return &{{.ID}}Client{
 		ns:           namespace,
 		client:       c,

lifecycle/object.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/rancher/norman/clientbase"
+	"github.com/rancher/norman/objectclient"
 	"github.com/rancher/norman/types/slice"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -27,10 +27,10 @@ type objectLifecycleAdapter struct {
 	name          string
 	clusterScoped bool
 	lifecycle     ObjectLifecycle
-	objectClient  *clientbase.ObjectClient
+	objectClient  *objectclient.ObjectClient
 }
 
-func NewObjectLifecycleAdapter(name string, clusterScoped bool, lifecycle ObjectLifecycle, objectClient *clientbase.ObjectClient) func(key string, obj runtime.Object) error {
+func NewObjectLifecycleAdapter(name string, clusterScoped bool, lifecycle ObjectLifecycle, objectClient *objectclient.ObjectClient) func(key string, obj runtime.Object) error {
 	o := objectLifecycleAdapter{
 		name:          name,
 		clusterScoped: clusterScoped,

objectclient/object_client.go

@@ -1,4 +1,4 @@
-package clientbase
+package objectclient
 
 import (
 	"encoding/json"

types/reflection.go

@@ -2,24 +2,20 @@ package types
 
 import (
 	"fmt"
+	"net/http"
 	"reflect"
 	"strconv"
 	"strings"
 
-	"net/http"
-
 	"github.com/rancher/norman/types/convert"
 	"github.com/rancher/norman/types/definition"
 	"github.com/rancher/norman/types/slice"
 	"github.com/sirupsen/logrus"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 var (
 	namespacedType = reflect.TypeOf(Namespaced{})
 	resourceType   = reflect.TypeOf(Resource{})
-	typeType       = reflect.TypeOf(metav1.TypeMeta{})
-	metaType       = reflect.TypeOf(metav1.ObjectMeta{})
 	blacklistNames = map[string]bool{
 		"links":   true,
 		"actions": true,
@@ -194,6 +190,16 @@ func jsonName(f reflect.StructField) string {
 	return strings.SplitN(f.Tag.Get("json"), ",", 2)[0]
 }
 
+func k8sType(field reflect.StructField) bool {
+	return field.Type.Name() == "TypeMeta" &&
+		strings.HasSuffix(field.Type.PkgPath(), "k8s.io/apimachinery/pkg/apis/meta/v1")
+}
+
+func k8sObject(field reflect.StructField) bool {
+	return field.Type.Name() == "ObjectMeta" &&
+		strings.HasSuffix(field.Type.PkgPath(), "k8s.io/apimachinery/pkg/apis/meta/v1")
+}
+
 func (s *Schemas) readFields(schema *Schema, t reflect.Type) error {
 	if t == resourceType {
 		schema.CollectionMethods = []string{"GET", "POST"}
@@ -212,16 +218,15 @@ func (s *Schemas) readFields(schema *Schema, t reflect.Type) error {
 		}
 
 		jsonName := jsonName(field)
-
 		if jsonName == "-" {
 			continue
 		}
 
-		if field.Anonymous && jsonName == "" && field.Type == typeType {
+		if field.Anonymous && jsonName == "" && k8sType(field) {
 			hasType = true
 		}
 
-		if field.Anonymous && jsonName == "metadata" && field.Type == metaType {
+		if field.Anonymous && jsonName == "metadata" && k8sObject(field) {
 			hasMeta = true
 		}