From c32e6469a884dbadc880744b23224a94aafbe44c Mon Sep 17 00:00:00 2001 From: Erik Wilson Date: Sun, 7 Jul 2019 14:41:19 -0700 Subject: [PATCH] Revert "Merge pull request #607 from dramich/mockgen" This reverts commit cb306b9378eb7fba5bef7483d49d42a4e6b965fd, reversing changes made to ebb12c74c65914bb467239bee30cfadef6418bbb. --- pkg/codegen/main.go | 1 - .../controllers/k3s.cattle.io/factory.go | 6 -- trash.lock | 4 +- vendor.conf | 2 +- .../wrangler/pkg/apply/desiredset_apply.go | 10 +-- .../wrangler/pkg/apply/desiredset_compare.go | 12 +-- .../wrangler/pkg/controller-gen/args/args.go | 1 - .../controller-gen/generators/factory_go.go | 7 -- .../pkg/controller-gen/generators/util.go | 1 - .../wrangler/pkg/controller-gen/main.go | 8 +- .../wrangler/pkg/generic/controller.go | 1 + .../rancher/wrangler/pkg/gvk/get.go | 27 ------ .../wrangler/pkg/objectset/objectset.go | 89 +++++++++++++------ .../rancher/wrangler/pkg/schemes/all.go | 7 -- 14 files changed, 75 insertions(+), 101 deletions(-) delete mode 100644 vendor/github.com/rancher/wrangler/pkg/gvk/get.go delete mode 100644 vendor/github.com/rancher/wrangler/pkg/schemes/all.go diff --git a/pkg/codegen/main.go b/pkg/codegen/main.go index 883f50d76a..9c6b8a3edf 100644 --- a/pkg/codegen/main.go +++ b/pkg/codegen/main.go @@ -94,6 +94,5 @@ func main() { GenerateTypes: true, }, }, - GenMocks: false, }) } diff --git a/pkg/generated/controllers/k3s.cattle.io/factory.go b/pkg/generated/controllers/k3s.cattle.io/factory.go index c5e423ad62..7b96258fb0 100644 --- a/pkg/generated/controllers/k3s.cattle.io/factory.go +++ b/pkg/generated/controllers/k3s.cattle.io/factory.go @@ -23,18 +23,12 @@ import ( "time" clientset "github.com/rancher/k3s/pkg/generated/clientset/versioned" - scheme "github.com/rancher/k3s/pkg/generated/clientset/versioned/scheme" informers "github.com/rancher/k3s/pkg/generated/informers/externalversions" "github.com/rancher/wrangler/pkg/generic" - "github.com/rancher/wrangler/pkg/schemes" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/rest" ) -func init() { - scheme.AddToScheme(schemes.All) -} - type Factory struct { synced bool informerFactory informers.SharedInformerFactory diff --git a/trash.lock b/trash.lock index 21dc5eb088..0ccc8b3d11 100755 --- a/trash.lock +++ b/trash.lock @@ -231,7 +231,7 @@ import: - package: github.com/rancher/remotedialer version: 66218bc42b4fa27c34523c0d19a41a0e2b74983d - package: github.com/rancher/wrangler - version: d53925110e19e055d1c21df3b49021833e883f33 + version: 4202dbfa88013c19238bb004d82e013f0593493d - package: github.com/rancher/wrangler-api version: efe26ac6a9d720e1bfa5a8cc5f8dce5ad598ce26 - package: github.com/robfig/cron @@ -274,8 +274,6 @@ import: version: 1d523034197ff1f222f6429836dd36a2457a1874 - package: go.etcd.io/bbolt version: v1.3.1-etcd.8 -- package: go.etcd.io/etcd - version: v3.3.11 - package: golang.org/x/crypto version: a49355c7e3f8fe157a85be2f77e6e269a0f89602 - package: golang.org/x/net diff --git a/vendor.conf b/vendor.conf index aa995f0200..13b6f58a33 100644 --- a/vendor.conf +++ b/vendor.conf @@ -11,7 +11,7 @@ package=github.com/opencontainers/runc/contrib/cmd/recvtty k8s.io/kubernetes v1.14.3-k3s.2 https://github.com/rancher/k3s.git transitive=true,staging=true -github.com/rancher/wrangler d53925110e19e055d1c21df3b49021833e883f33 +github.com/rancher/wrangler 4202dbfa88013c19238bb004d82e013f0593493d github.com/rancher/wrangler-api efe26ac6a9d720e1bfa5a8cc5f8dce5ad598ce26 github.com/rancher/dynamiclistener 4716ac2362986f28bede3f3caf5d1ce347da55b0 github.com/rancher/remotedialer 66218bc42b4fa27c34523c0d19a41a0e2b74983d diff --git a/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_apply.go b/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_apply.go index f56a300584..c211bc65b7 100644 --- a/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_apply.go +++ b/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_apply.go @@ -6,8 +6,6 @@ import ( "fmt" "sync" - gvk2 "github.com/rancher/wrangler/pkg/gvk" - "github.com/pkg/errors" "github.com/rancher/wrangler/pkg/apply/injectors" "github.com/rancher/wrangler/pkg/objectset" @@ -167,14 +165,10 @@ func (o *desiredSet) getLabelsAndAnnotations() (map[string]string, map[string]st } if o.owner != nil { - gvk, err := gvk2.Get(o.owner) - if err != nil { - return nil, nil, err - } - annotations[LabelGVK] = gvk.String() + annotations[LabelGVK] = o.owner.GetObjectKind().GroupVersionKind().String() metadata, err := meta.Accessor(o.owner) if err != nil { - return nil, nil, fmt.Errorf("failed to get metadata for %s", gvk) + return nil, nil, fmt.Errorf("failed to get metadata for %s", o.owner.GetObjectKind().GroupVersionKind()) } annotations[LabelName] = metadata.GetName() annotations[LabelNamespace] = metadata.GetNamespace() diff --git a/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_compare.go b/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_compare.go index 13149d13b9..0dca721fcc 100644 --- a/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_compare.go +++ b/vendor/github.com/rancher/wrangler/pkg/apply/desiredset_compare.go @@ -208,19 +208,15 @@ func getOriginal(obj v1.Object) ([]byte, error) { return []byte("{}"), nil } - mapObj := map[string]interface{}{} - err := json.Unmarshal(original, &mapObj) + mapObj := &unstructured.Unstructured{} + err := json.Unmarshal(original, mapObj) if err != nil { return nil, err } - removeCreationTimestamp(mapObj) + removeCreationTimestamp(mapObj.Object) - u := &unstructured.Unstructured{ - Object: mapObj, - } - - objCopy, err := prepareObjectForCreate(u) + objCopy, err := prepareObjectForCreate(mapObj) if err != nil { return nil, err } diff --git a/vendor/github.com/rancher/wrangler/pkg/controller-gen/args/args.go b/vendor/github.com/rancher/wrangler/pkg/controller-gen/args/args.go index fd71abe360..1fe796a871 100644 --- a/vendor/github.com/rancher/wrangler/pkg/controller-gen/args/args.go +++ b/vendor/github.com/rancher/wrangler/pkg/controller-gen/args/args.go @@ -16,7 +16,6 @@ type Options struct { OutputPackage string Groups map[string]Group Boilerplate string - GenMocks bool } type Group struct { diff --git a/vendor/github.com/rancher/wrangler/pkg/controller-gen/generators/factory_go.go b/vendor/github.com/rancher/wrangler/pkg/controller-gen/generators/factory_go.go index aec5180bf3..22a2c664c8 100644 --- a/vendor/github.com/rancher/wrangler/pkg/controller-gen/generators/factory_go.go +++ b/vendor/github.com/rancher/wrangler/pkg/controller-gen/generators/factory_go.go @@ -3,7 +3,6 @@ package generators import ( "fmt" "io" - "path/filepath" args2 "github.com/rancher/wrangler/pkg/controller-gen/args" "k8s.io/gengo/args" @@ -39,9 +38,7 @@ func (f *factory) Imports(*generator.Context) []string { "k8s.io/apimachinery/pkg/runtime/schema", "k8s.io/client-go/rest", GenericPackage, - AllSchemes, fmt.Sprintf("clientset \"%s\"", group.ClientSetPackage), - fmt.Sprintf("scheme \"%s\"", filepath.Join(group.ClientSetPackage, "scheme")), fmt.Sprintf("informers \"%s\"", group.InformersPackage), } } @@ -64,10 +61,6 @@ func (f *factory) Init(c *generator.Context, w io.Writer) error { } var factoryBody = ` -func init() { - scheme.AddToScheme(schemes.All) -} - type Factory struct { synced bool informerFactory informers.SharedInformerFactory diff --git a/vendor/github.com/rancher/wrangler/pkg/controller-gen/generators/util.go b/vendor/github.com/rancher/wrangler/pkg/controller-gen/generators/util.go index a3ca741cbe..939414e505 100644 --- a/vendor/github.com/rancher/wrangler/pkg/controller-gen/generators/util.go +++ b/vendor/github.com/rancher/wrangler/pkg/controller-gen/generators/util.go @@ -8,7 +8,6 @@ import ( const ( GenericPackage = "github.com/rancher/wrangler/pkg/generic" - AllSchemes = "github.com/rancher/wrangler/pkg/schemes" ) func groupPath(group string) string { diff --git a/vendor/github.com/rancher/wrangler/pkg/controller-gen/main.go b/vendor/github.com/rancher/wrangler/pkg/controller-gen/main.go index ed82da826b..3b96553a95 100644 --- a/vendor/github.com/rancher/wrangler/pkg/controller-gen/main.go +++ b/vendor/github.com/rancher/wrangler/pkg/controller-gen/main.go @@ -104,11 +104,9 @@ func Run(opts cgargs.Options) { logrus.Fatalf("go modules copy failed: %v", err) } - if opts.GenMocks { - if err := clientGen.GenerateMocks(); err != nil { - logrus.Errorf("mocks failed: %v", err) - return - } + if err := clientGen.GenerateMocks(); err != nil { + logrus.Errorf("mocks failed: %v", err) + return } } diff --git a/vendor/github.com/rancher/wrangler/pkg/generic/controller.go b/vendor/github.com/rancher/wrangler/pkg/generic/controller.go index 56bf13dfdf..565c31370b 100644 --- a/vendor/github.com/rancher/wrangler/pkg/generic/controller.go +++ b/vendor/github.com/rancher/wrangler/pkg/generic/controller.go @@ -56,6 +56,7 @@ func NewController(name string, informer cache.SharedIndexInformer, workqueue wo workqueue: workqueue, } + logrus.Info("Setting up event handlers") informer.AddEventHandler(cache.ResourceEventHandlerFuncs{ AddFunc: controller.handleObject, UpdateFunc: func(old, new interface{}) { diff --git a/vendor/github.com/rancher/wrangler/pkg/gvk/get.go b/vendor/github.com/rancher/wrangler/pkg/gvk/get.go deleted file mode 100644 index 75146e7d53..0000000000 --- a/vendor/github.com/rancher/wrangler/pkg/gvk/get.go +++ /dev/null @@ -1,27 +0,0 @@ -package gvk - -import ( - "fmt" - - "github.com/rancher/wrangler/pkg/schemes" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" -) - -func Get(obj runtime.Object) (schema.GroupVersionKind, error) { - gvk := obj.GetObjectKind().GroupVersionKind() - if gvk.Kind != "" { - return gvk, nil - } - - gvks, _, err := schemes.All.ObjectKinds(obj) - if err != nil { - return schema.GroupVersionKind{}, err - } - - if len(gvks) == 0 { - return schema.GroupVersionKind{}, fmt.Errorf("failed to find gvk for %v", obj.GetObjectKind()) - } - - return gvks[0], nil -} diff --git a/vendor/github.com/rancher/wrangler/pkg/objectset/objectset.go b/vendor/github.com/rancher/wrangler/pkg/objectset/objectset.go index c4896938aa..7e3c9b0031 100644 --- a/vendor/github.com/rancher/wrangler/pkg/objectset/objectset.go +++ b/vendor/github.com/rancher/wrangler/pkg/objectset/objectset.go @@ -5,8 +5,6 @@ import ( "reflect" "sort" - "github.com/rancher/wrangler/pkg/gvk" - "github.com/rancher/wrangler/pkg/merr" "k8s.io/apimachinery/pkg/api/meta" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -35,21 +33,16 @@ func (o ObjectKey) String() string { type ObjectByGVK map[schema.GroupVersionKind]map[ObjectKey]runtime.Object -func (o ObjectByGVK) Add(obj runtime.Object) (schema.GroupVersionKind, error) { +func (o ObjectByGVK) Add(obj runtime.Object) error { metadata, err := meta.Accessor(obj) if err != nil { - return schema.GroupVersionKind{}, err + return err } - gvk, err := gvk.Get(obj) - if err != nil { - return schema.GroupVersionKind{}, err - } - - objs := o[gvk] + objs := o[obj.GetObjectKind().GroupVersionKind()] if objs == nil { objs = map[ObjectKey]runtime.Object{} - o[gvk] = objs + o[obj.GetObjectKind().GroupVersionKind()] = objs } objs[ObjectKey{ @@ -57,28 +50,42 @@ func (o ObjectByGVK) Add(obj runtime.Object) (schema.GroupVersionKind, error) { Name: metadata.GetName(), }] = obj - return gvk, nil + return nil } type ObjectSet struct { - errs []error - objects ObjectByGVK - order []runtime.Object - gvkOrder []schema.GroupVersionKind - gvkSeen map[schema.GroupVersionKind]bool + errs []error + objects ObjectByGVK + nsed map[schema.GroupVersionKind]bool + inputs []runtime.Object + order []runtime.Object } func NewObjectSet() *ObjectSet { return &ObjectSet{ + nsed: map[schema.GroupVersionKind]bool{}, objects: ObjectByGVK{}, - gvkSeen: map[schema.GroupVersionKind]bool{}, } } +func (o *ObjectSet) Inputs() []runtime.Object { + return o.inputs +} + func (o *ObjectSet) ObjectsByGVK() ObjectByGVK { return o.objects } +func (o *ObjectSet) AddInput(objs ...runtime.Object) *ObjectSet { + for _, obj := range objs { + if obj == nil || reflect.ValueOf(obj).IsNil() { + continue + } + o.inputs = append(o.inputs, obj) + } + return o +} + func (o *ObjectSet) Add(objs ...runtime.Object) *ObjectSet { for _, obj := range objs { o.add(obj) @@ -91,17 +98,34 @@ func (o *ObjectSet) add(obj runtime.Object) { return } - gvk, err := o.objects.Add(obj) + gvk := obj.GetObjectKind().GroupVersionKind() + + metadata, err := meta.Accessor(obj) if err != nil { - o.err(fmt.Errorf("failed to add %v", obj)) + o.err(fmt.Errorf("failed to get metadata for %s", gvk)) + return + } + + name := metadata.GetName() + if name == "" { + o.err(fmt.Errorf("%s is missing name", gvk)) + return + } + + namespace := metadata.GetNamespace() + nsed, ok := o.nsed[gvk] + if ok && nsed != (namespace != "") { + o.err(fmt.Errorf("got %s objects that are both namespaced and not namespaced", gvk)) + return + } + o.nsed[gvk] = namespace != "" + + if err := o.objects.Add(obj); err != nil { + o.err(fmt.Errorf("failed to get metadata for %s", gvk)) return } o.order = append(o.order, obj) - if !o.gvkSeen[gvk] { - o.gvkSeen[gvk] = true - o.gvkOrder = append(o.gvkOrder, gvk) - } } func (o *ObjectSet) err(err error) error { @@ -122,12 +146,25 @@ func (o *ObjectSet) Len() int { } func (o *ObjectSet) GVKOrder(known ...schema.GroupVersionKind) []schema.GroupVersionKind { + seen := map[schema.GroupVersionKind]bool{} + var gvkOrder []schema.GroupVersionKind + + for _, obj := range o.order { + if seen[obj.GetObjectKind().GroupVersionKind()] { + continue + } + seen[obj.GetObjectKind().GroupVersionKind()] = true + gvkOrder = append(gvkOrder, obj.GetObjectKind().GroupVersionKind()) + } + var rest []schema.GroupVersionKind for _, gvk := range known { - if o.gvkSeen[gvk] { + if seen[gvk] { continue } + + seen[gvk] = true rest = append(rest, gvk) } @@ -135,5 +172,5 @@ func (o *ObjectSet) GVKOrder(known ...schema.GroupVersionKind) []schema.GroupVer return rest[i].String() < rest[j].String() }) - return append(o.gvkOrder, rest...) + return append(gvkOrder, rest...) } diff --git a/vendor/github.com/rancher/wrangler/pkg/schemes/all.go b/vendor/github.com/rancher/wrangler/pkg/schemes/all.go deleted file mode 100644 index 8e64b5ca9f..0000000000 --- a/vendor/github.com/rancher/wrangler/pkg/schemes/all.go +++ /dev/null @@ -1,7 +0,0 @@ -package schemes - -import ( - "k8s.io/apimachinery/pkg/runtime" -) - -var All = runtime.NewScheme()