From 9d2ffcd41d0d1979631d602cf4118c2f58c1ca05 Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Thu, 7 Jun 2018 19:20:10 -0700 Subject: [PATCH 1/4] Update test.sh to run go vet and go fmt --- test.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test.sh b/test.sh index 01f6faeb1d..82315132ae 100755 --- a/test.sh +++ b/test.sh @@ -103,3 +103,8 @@ setup_envs go test github.com/kubernetes-sigs/controller-runtime/pkg/... go install github.com/kubernetes-sigs/controller-runtime/example + +go vet ./pkg/... +go fmt ./pkg/... + +# golint -set_exit_status ./pkg/... \ No newline at end of file From 3558040a9e590faeed091aff613226030d0a39eb Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Thu, 7 Jun 2018 19:22:02 -0700 Subject: [PATCH 2/4] fix main --- example/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/main.go b/example/main.go index fde3db0ecc..07066641a1 100644 --- a/example/main.go +++ b/example/main.go @@ -38,7 +38,7 @@ func main() { logf.SetLogger(logf.ZapLogger(false)) // Setup a ControllerManager - manager, err := controller.NewControllerManager(ctrl.ControllerManagerArgs{}) + manager, err := controller.NewControllerManager(controller.ControllerManagerArgs{}) if err != nil { log.Fatal(err) } From f1f7302a373bc76ee2eb1e335b136ff14457de37 Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Thu, 7 Jun 2018 19:36:57 -0700 Subject: [PATCH 3/4] fix go vet issues --- .../eventhandler/eventhandler_test.go | 58 +++++++++---------- pkg/controller/reconcile/example_test.go | 2 +- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pkg/controller/eventhandler/eventhandler_test.go b/pkg/controller/eventhandler/eventhandler_test.go index 7de3880566..503d8d4623 100644 --- a/pkg/controller/eventhandler/eventhandler_test.go +++ b/pkg/controller/eventhandler/eventhandler_test.go @@ -37,7 +37,7 @@ var _ = Describe("Eventhandler", func() { var pod *corev1.Pod t := true BeforeEach(func() { - q = controllertest.Queue{workqueue.New()} + q = controllertest.Queue{Interface: workqueue.New()} instance = eventhandler.EnqueueHandler{} pod = &corev1.Pod{ ObjectMeta: metav1.ObjectMeta{Namespace: "biz", Name: "baz"}, @@ -196,10 +196,10 @@ var _ = Describe("Eventhandler", func() { Expect(a.Object).To(Equal(pod)) req = []reconcile.ReconcileRequest{ { - types.NamespacedName{"foo", "bar"}, + NamespacedName: types.NamespacedName{Namespace: "foo", Name: "bar"}, }, { - types.NamespacedName{"biz", "baz"}, + NamespacedName: types.NamespacedName{Namespace: "biz", Name: "baz"}, }, } return req @@ -215,11 +215,11 @@ var _ = Describe("Eventhandler", func() { i, _ := q.Get() Expect(i).To(Equal(reconcile.ReconcileRequest{ - types.NamespacedName{"foo", "bar"}})) + NamespacedName: types.NamespacedName{Namespace: "foo", Name: "bar"}})) i, _ = q.Get() Expect(i).To(Equal(reconcile.ReconcileRequest{ - types.NamespacedName{"biz", "baz"}})) + NamespacedName: types.NamespacedName{Namespace: "biz", Name: "baz"}})) }) It("should enqueue a ReconcileRequest with the function applied to the DeleteEvent.", func() { @@ -231,10 +231,10 @@ var _ = Describe("Eventhandler", func() { Expect(a.Object).To(Equal(pod)) req = []reconcile.ReconcileRequest{ { - types.NamespacedName{"foo", "bar"}, + NamespacedName: types.NamespacedName{Namespace: "foo", Name: "bar"}, }, { - types.NamespacedName{"biz", "baz"}, + NamespacedName: types.NamespacedName{Namespace: "biz", Name: "baz"}, }, } return req @@ -250,11 +250,11 @@ var _ = Describe("Eventhandler", func() { i, _ := q.Get() Expect(i).To(Equal(reconcile.ReconcileRequest{ - types.NamespacedName{"foo", "bar"}})) + NamespacedName: types.NamespacedName{Namespace: "foo", Name: "bar"}})) i, _ = q.Get() Expect(i).To(Equal(reconcile.ReconcileRequest{ - types.NamespacedName{"biz", "baz"}})) + NamespacedName: types.NamespacedName{Namespace: "biz", Name: "baz"}})) }) It("should enqueue a ReconcileRequest with the function applied to both objects in the UpdateEvent.", @@ -269,10 +269,10 @@ var _ = Describe("Eventhandler", func() { defer GinkgoRecover() req = []reconcile.ReconcileRequest{ { - types.NamespacedName{"foo", a.Meta.GetName() + "-bar"}, + NamespacedName: types.NamespacedName{Namespace: "foo", Name: a.Meta.GetName() + "-bar"}, }, { - types.NamespacedName{"biz", a.Meta.GetName() + "-baz"}, + NamespacedName: types.NamespacedName{Namespace: "biz", Name: a.Meta.GetName() + "-baz"}, }, } return req @@ -290,19 +290,19 @@ var _ = Describe("Eventhandler", func() { i, _ := q.Get() Expect(i).To(Equal(reconcile.ReconcileRequest{ - types.NamespacedName{"foo", "baz-bar"}})) + NamespacedName: types.NamespacedName{Namespace: "foo", Name: "baz-bar"}})) i, _ = q.Get() Expect(i).To(Equal(reconcile.ReconcileRequest{ - types.NamespacedName{"biz", "baz-baz"}})) + NamespacedName: types.NamespacedName{Namespace: "biz", Name: "baz-baz"}})) i, _ = q.Get() Expect(i).To(Equal(reconcile.ReconcileRequest{ - types.NamespacedName{"foo", "baz2-bar"}})) + NamespacedName: types.NamespacedName{Namespace: "foo", Name: "baz2-bar"}})) i, _ = q.Get() Expect(i).To(Equal(reconcile.ReconcileRequest{ - types.NamespacedName{"biz", "baz2-baz"}})) + NamespacedName: types.NamespacedName{Namespace: "biz", Name: "baz2-baz"}})) }) It("should enqueue a ReconcileRequest with the function applied to the GenericEvent.", func() { @@ -314,10 +314,10 @@ var _ = Describe("Eventhandler", func() { Expect(a.Object).To(Equal(pod)) req = []reconcile.ReconcileRequest{ { - types.NamespacedName{"foo", "bar"}, + NamespacedName: types.NamespacedName{Namespace: "foo", Name: "bar"}, }, { - types.NamespacedName{"biz", "baz"}, + NamespacedName: types.NamespacedName{Namespace: "biz", Name: "baz"}, }, } return req @@ -333,11 +333,11 @@ var _ = Describe("Eventhandler", func() { i, _ := q.Get() Expect(i).To(Equal(reconcile.ReconcileRequest{ - types.NamespacedName{"foo", "bar"}})) + NamespacedName: types.NamespacedName{Namespace: "foo", Name: "bar"}})) i, _ = q.Get() Expect(i).To(Equal(reconcile.ReconcileRequest{ - types.NamespacedName{"biz", "baz"}})) + NamespacedName: types.NamespacedName{Namespace: "biz", Name: "baz"}})) }) }) @@ -364,7 +364,7 @@ var _ = Describe("Eventhandler", func() { i, _ := q.Get() Expect(i).To(Equal(reconcile.ReconcileRequest{ - types.NamespacedName{pod.GetNamespace(), "foo-parent"}})) + NamespacedName: types.NamespacedName{Namespace: pod.GetNamespace(), Name: "foo-parent"}})) }) It("should enqueue a ReconcileRequest with the Owner of the object in the DeleteEvent.", func() { @@ -389,7 +389,7 @@ var _ = Describe("Eventhandler", func() { i, _ := q.Get() Expect(i).To(Equal(reconcile.ReconcileRequest{ - types.NamespacedName{pod.GetNamespace(), "foo-parent"}})) + NamespacedName: types.NamespacedName{Namespace: pod.GetNamespace(), Name: "foo-parent"}})) }) It("should enqueue a ReconcileRequest with the Owners of both objects in the UpdateEvent.", func() { @@ -427,11 +427,11 @@ var _ = Describe("Eventhandler", func() { i, _ := q.Get() Expect(i).To(Equal(reconcile.ReconcileRequest{ - types.NamespacedName{pod.GetNamespace(), "foo1-parent"}})) + NamespacedName: types.NamespacedName{Namespace: pod.GetNamespace(), Name: "foo1-parent"}})) i, _ = q.Get() Expect(i).To(Equal(reconcile.ReconcileRequest{ - types.NamespacedName{newPod.GetNamespace(), "foo2-parent"}})) + NamespacedName: types.NamespacedName{Namespace: newPod.GetNamespace(), Name: "foo2-parent"}})) }) It("should enqueue a ReconcileRequest with the Owner of the object in the GenericEvent.", func() { @@ -456,7 +456,7 @@ var _ = Describe("Eventhandler", func() { i, _ := q.Get() Expect(i).To(Equal(reconcile.ReconcileRequest{ - types.NamespacedName{pod.GetNamespace(), "foo-parent"}})) + NamespacedName: types.NamespacedName{Namespace: pod.GetNamespace(), Name: "foo-parent"}})) }) It("should not enqueue a ReconcileRequest if there are no owners matching Group and Kind.", func() { @@ -507,7 +507,7 @@ var _ = Describe("Eventhandler", func() { i, _ := q.Get() Expect(i).To(Equal(reconcile.ReconcileRequest{ - types.NamespacedName{pod.GetNamespace(), "foo-parent"}})) + NamespacedName: types.NamespacedName{Namespace: pod.GetNamespace(), Name: "foo-parent"}})) }) It("should not enqueue a ReconcileRequest if there are no owners.", func() { @@ -568,7 +568,7 @@ var _ = Describe("Eventhandler", func() { Expect(q.Len()).To(Equal(1)) i, _ := q.Get() Expect(i).To(Equal(reconcile.ReconcileRequest{ - types.NamespacedName{pod.GetNamespace(), "foo2-parent"}})) + NamespacedName: types.NamespacedName{Namespace: pod.GetNamespace(), Name: "foo2-parent"}})) }) It("should not enqueue ReconcileRequests if there are no Controller owners.", func() { @@ -649,13 +649,13 @@ var _ = Describe("Eventhandler", func() { i, _ := q.Get() Expect(i).To(Equal(reconcile.ReconcileRequest{ - types.NamespacedName{pod.GetNamespace(), "foo1-parent"}})) + NamespacedName: types.NamespacedName{Namespace: pod.GetNamespace(), Name: "foo1-parent"}})) i, _ = q.Get() Expect(i).To(Equal(reconcile.ReconcileRequest{ - types.NamespacedName{pod.GetNamespace(), "foo2-parent"}})) + NamespacedName: types.NamespacedName{Namespace: pod.GetNamespace(), Name: "foo2-parent"}})) i, _ = q.Get() Expect(i).To(Equal(reconcile.ReconcileRequest{ - types.NamespacedName{pod.GetNamespace(), "foo3-parent"}})) + NamespacedName: types.NamespacedName{Namespace: pod.GetNamespace(), Name: "foo3-parent"}})) }) }) diff --git a/pkg/controller/reconcile/example_test.go b/pkg/controller/reconcile/example_test.go index 6f7b11872e..4559b9c86a 100644 --- a/pkg/controller/reconcile/example_test.go +++ b/pkg/controller/reconcile/example_test.go @@ -31,7 +31,7 @@ func ExampleReconcileFunc() { return reconcile.ReconcileResult{}, nil }) - r.Reconcile(reconcile.ReconcileRequest{types.NamespacedName{Namespace: "default", Name: "test"}}) + r.Reconcile(reconcile.ReconcileRequest{NamespacedName: types.NamespacedName{Namespace: "default", Name: "test"}}) // Output: Name: test, Namespace: default } From 6686bf47568a43cc969da81e717b000b87837251 Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Thu, 7 Jun 2018 19:41:26 -0700 Subject: [PATCH 4/4] don't format go in test.sh since it doesn't return anything useful --- test.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/test.sh b/test.sh index 82315132ae..564bbeb106 100755 --- a/test.sh +++ b/test.sh @@ -105,6 +105,5 @@ go test github.com/kubernetes-sigs/controller-runtime/pkg/... go install github.com/kubernetes-sigs/controller-runtime/example go vet ./pkg/... -go fmt ./pkg/... # golint -set_exit_status ./pkg/... \ No newline at end of file