From 09f3743d9833b9ea4b44c3020fe92bb7a688755e Mon Sep 17 00:00:00 2001 From: Jan Schlicht Date: Tue, 17 Dec 2019 14:46:42 +0100 Subject: [PATCH] Arrange import sections following our styleguide (#1192) --- pkg/kudoctl/cmd/init.go | 5 ++--- pkg/kudoctl/cmd/init_integration_test.go | 14 +++++++------- pkg/kudoctl/kudoinit/crd/crds.go | 8 ++++---- pkg/kudoctl/kudoinit/manager/manager.go | 8 ++++---- pkg/kudoctl/kudoinit/prereq/namespace.go | 8 ++++---- pkg/kudoctl/kudoinit/prereq/prereqs.go | 6 +++--- pkg/kudoctl/kudoinit/prereq/serviceaccount.go | 9 ++++----- pkg/kudoctl/kudoinit/prereq/webhook.go | 11 +++++------ pkg/kudoctl/kudoinit/setup/setup.go | 6 +++--- pkg/kudoctl/kudoinit/setup/wait.go | 8 ++++---- pkg/kudoctl/packages/package.go | 6 +++--- pkg/kudoctl/util/kudo/kudo.go | 16 ++++++++-------- pkg/test/utils/kubernetes.go | 12 +++++------- pkg/test/utils/kubernetes_test.go | 4 ++-- 14 files changed, 58 insertions(+), 63 deletions(-) diff --git a/pkg/kudoctl/cmd/init.go b/pkg/kudoctl/cmd/init.go index 50079c917..46484a974 100644 --- a/pkg/kudoctl/cmd/init.go +++ b/pkg/kudoctl/cmd/init.go @@ -6,9 +6,6 @@ import ( "io" "strings" - "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit" - "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit/setup" - "github.com/spf13/afero" "github.com/spf13/cobra" flag "github.com/spf13/pflag" @@ -16,6 +13,8 @@ import ( "github.com/kudobuilder/kudo/pkg/kudoctl/clog" "github.com/kudobuilder/kudo/pkg/kudoctl/kube" "github.com/kudobuilder/kudo/pkg/kudoctl/kudohome" + "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit" + "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit/setup" "github.com/kudobuilder/kudo/pkg/kudoctl/util/repo" ) diff --git a/pkg/kudoctl/cmd/init_integration_test.go b/pkg/kudoctl/cmd/init_integration_test.go index 289443400..c3dd6626c 100644 --- a/pkg/kudoctl/cmd/init_integration_test.go +++ b/pkg/kudoctl/cmd/init_integration_test.go @@ -13,13 +13,6 @@ import ( "strings" "testing" - "github.com/kudobuilder/kudo/pkg/kudoctl/clog" - "github.com/kudobuilder/kudo/pkg/kudoctl/kube" - "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit" - "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit/crd" - "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit/prereq" - testutils "github.com/kudobuilder/kudo/pkg/test/utils" - "github.com/spf13/afero" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -30,6 +23,13 @@ import ( "k8s.io/client-go/kubernetes" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/yaml" + + "github.com/kudobuilder/kudo/pkg/kudoctl/clog" + "github.com/kudobuilder/kudo/pkg/kudoctl/kube" + "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit" + "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit/crd" + "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit/prereq" + testutils "github.com/kudobuilder/kudo/pkg/test/utils" ) var testenv testutils.TestEnvironment diff --git a/pkg/kudoctl/kudoinit/crd/crds.go b/pkg/kudoctl/kudoinit/crd/crds.go index 6abd9c6be..91790942c 100644 --- a/pkg/kudoctl/kudoinit/crd/crds.go +++ b/pkg/kudoctl/kudoinit/crd/crds.go @@ -6,10 +6,6 @@ import ( "os" "strings" - "github.com/kudobuilder/kudo/pkg/kudoctl/clog" - "github.com/kudobuilder/kudo/pkg/kudoctl/kube" - "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit" - apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" kerrors "k8s.io/apimachinery/pkg/api/errors" @@ -17,6 +13,10 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/yaml" + + "github.com/kudobuilder/kudo/pkg/kudoctl/clog" + "github.com/kudobuilder/kudo/pkg/kudoctl/kube" + "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit" ) const ( diff --git a/pkg/kudoctl/kudoinit/manager/manager.go b/pkg/kudoctl/kudoinit/manager/manager.go index 0dc12400a..f099bf7cd 100644 --- a/pkg/kudoctl/kudoinit/manager/manager.go +++ b/pkg/kudoctl/kudoinit/manager/manager.go @@ -4,10 +4,6 @@ import ( "fmt" "strconv" - "github.com/kudobuilder/kudo/pkg/kudoctl/clog" - "github.com/kudobuilder/kudo/pkg/kudoctl/kube" - "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit" - appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" @@ -19,6 +15,10 @@ import ( appsv1client "k8s.io/client-go/kubernetes/typed/apps/v1" corev1 "k8s.io/client-go/kubernetes/typed/core/v1" "sigs.k8s.io/yaml" + + "github.com/kudobuilder/kudo/pkg/kudoctl/clog" + "github.com/kudobuilder/kudo/pkg/kudoctl/kube" + "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit" ) // Ensure kudoinit.InitStep is implemented diff --git a/pkg/kudoctl/kudoinit/prereq/namespace.go b/pkg/kudoctl/kudoinit/prereq/namespace.go index cb3c53471..e2e4bb2de 100644 --- a/pkg/kudoctl/kudoinit/prereq/namespace.go +++ b/pkg/kudoctl/kudoinit/prereq/namespace.go @@ -3,14 +3,14 @@ package prereq import ( "fmt" - "github.com/kudobuilder/kudo/pkg/kudoctl/clog" - "github.com/kudobuilder/kudo/pkg/kudoctl/kube" - "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit" - v1 "k8s.io/api/core/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + + "github.com/kudobuilder/kudo/pkg/kudoctl/clog" + "github.com/kudobuilder/kudo/pkg/kudoctl/kube" + "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit" ) // Ensure IF is implemented diff --git a/pkg/kudoctl/kudoinit/prereq/prereqs.go b/pkg/kudoctl/kudoinit/prereq/prereqs.go index 993241b81..bdd59894a 100644 --- a/pkg/kudoctl/kudoinit/prereq/prereqs.go +++ b/pkg/kudoctl/kudoinit/prereq/prereqs.go @@ -3,11 +3,11 @@ package prereq import ( "fmt" - "github.com/kudobuilder/kudo/pkg/kudoctl/kube" - "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit" - "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/yaml" + + "github.com/kudobuilder/kudo/pkg/kudoctl/kube" + "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit" ) // Ensure kudoinit.InitStep is implemented diff --git a/pkg/kudoctl/kudoinit/prereq/serviceaccount.go b/pkg/kudoctl/kudoinit/prereq/serviceaccount.go index 12d6cec4f..68b431733 100644 --- a/pkg/kudoctl/kudoinit/prereq/serviceaccount.go +++ b/pkg/kudoctl/kudoinit/prereq/serviceaccount.go @@ -4,16 +4,15 @@ import ( "fmt" "reflect" - "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit" - - "github.com/kudobuilder/kudo/pkg/kudoctl/clog" - "github.com/kudobuilder/kudo/pkg/kudoctl/kube" - v1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + + "github.com/kudobuilder/kudo/pkg/kudoctl/clog" + "github.com/kudobuilder/kudo/pkg/kudoctl/kube" + "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit" ) // Ensure IF is implemented diff --git a/pkg/kudoctl/kudoinit/prereq/webhook.go b/pkg/kudoctl/kudoinit/prereq/webhook.go index fa0f70653..614cfeb2b 100644 --- a/pkg/kudoctl/kudoinit/prereq/webhook.go +++ b/pkg/kudoctl/kudoinit/prereq/webhook.go @@ -4,12 +4,6 @@ import ( "fmt" "strings" - "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit" - - "github.com/kudobuilder/kudo/pkg/kudoctl/clog" - "github.com/kudobuilder/kudo/pkg/kudoctl/kube" - "github.com/kudobuilder/kudo/pkg/util/kudo" - admissionv1beta1 "k8s.io/api/admissionregistration/v1beta1" kerrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -18,6 +12,11 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/dynamic" clientv1beta1 "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1" + + "github.com/kudobuilder/kudo/pkg/kudoctl/clog" + "github.com/kudobuilder/kudo/pkg/kudoctl/kube" + "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit" + "github.com/kudobuilder/kudo/pkg/util/kudo" ) // Ensure IF is implemented diff --git a/pkg/kudoctl/kudoinit/setup/setup.go b/pkg/kudoctl/kudoinit/setup/setup.go index f236fad79..27b26e77a 100644 --- a/pkg/kudoctl/kudoinit/setup/setup.go +++ b/pkg/kudoctl/kudoinit/setup/setup.go @@ -3,15 +3,15 @@ package setup import ( "fmt" + "k8s.io/apimachinery/pkg/runtime" + "sigs.k8s.io/yaml" + "github.com/kudobuilder/kudo/pkg/kudoctl/clog" "github.com/kudobuilder/kudo/pkg/kudoctl/kube" "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit" "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit/crd" "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit/manager" "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit/prereq" - - "k8s.io/apimachinery/pkg/runtime" - "sigs.k8s.io/yaml" ) // Install uses Kubernetes client to install KUDO. diff --git a/pkg/kudoctl/kudoinit/setup/wait.go b/pkg/kudoctl/kudoinit/setup/wait.go index 99b248277..443d002fc 100644 --- a/pkg/kudoctl/kudoinit/setup/wait.go +++ b/pkg/kudoctl/kudoinit/setup/wait.go @@ -4,15 +4,15 @@ import ( "errors" "time" - "github.com/kudobuilder/kudo/pkg/kudoctl/kube" - "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit" - "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit/manager" - v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/kubernetes" corev1 "k8s.io/client-go/kubernetes/typed/core/v1" + + "github.com/kudobuilder/kudo/pkg/kudoctl/kube" + "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit" + "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit/manager" ) // WatchKUDOUntilReady waits for the KUDO pod to become available. diff --git a/pkg/kudoctl/packages/package.go b/pkg/kudoctl/packages/package.go index dc257ada9..806e4cc37 100644 --- a/pkg/kudoctl/packages/package.go +++ b/pkg/kudoctl/packages/package.go @@ -6,12 +6,12 @@ import ( "log" "strings" + v1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/kudobuilder/kudo/pkg/apis/kudo/v1beta1" "github.com/kudobuilder/kudo/pkg/engine/task" "github.com/kudobuilder/kudo/pkg/util/kudo" - - v1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func (p *Files) Resources() (*Resources, error) { diff --git a/pkg/kudoctl/util/kudo/kudo.go b/pkg/kudoctl/util/kudo/kudo.go index 42b3bc976..0a3497c4f 100644 --- a/pkg/kudoctl/util/kudo/kudo.go +++ b/pkg/kudoctl/util/kudo/kudo.go @@ -7,14 +7,6 @@ import ( "strings" "time" - "github.com/kudobuilder/kudo/pkg/apis/kudo/v1beta1" - "github.com/kudobuilder/kudo/pkg/client/clientset/versioned" - "github.com/kudobuilder/kudo/pkg/kudoctl/clog" - "github.com/kudobuilder/kudo/pkg/kudoctl/kube" - "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit/crd" - "github.com/kudobuilder/kudo/pkg/util/kudo" - "github.com/kudobuilder/kudo/pkg/version" - v1core "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -24,6 +16,14 @@ import ( // Import Kubernetes authentication providers to support GKE, etc. _ "k8s.io/client-go/plugin/pkg/client/auth" "k8s.io/client-go/tools/clientcmd" + + "github.com/kudobuilder/kudo/pkg/apis/kudo/v1beta1" + "github.com/kudobuilder/kudo/pkg/client/clientset/versioned" + "github.com/kudobuilder/kudo/pkg/kudoctl/clog" + "github.com/kudobuilder/kudo/pkg/kudoctl/kube" + "github.com/kudobuilder/kudo/pkg/kudoctl/kudoinit/crd" + "github.com/kudobuilder/kudo/pkg/util/kudo" + "github.com/kudobuilder/kudo/pkg/version" ) // Client is a KUDO Client providing access to a clientset diff --git a/pkg/test/utils/kubernetes.go b/pkg/test/utils/kubernetes.go index d4479345e..111d7a158 100644 --- a/pkg/test/utils/kubernetes.go +++ b/pkg/test/utils/kubernetes.go @@ -19,10 +19,9 @@ import ( "testing" "time" - "sigs.k8s.io/controller-runtime/pkg/client/apiutil" - "github.com/google/shlex" "github.com/pmezard/go-difflib/difflib" + "github.com/spf13/pflag" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" @@ -30,11 +29,6 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - - "github.com/kudobuilder/kudo/pkg/apis" - kudo "github.com/kudobuilder/kudo/pkg/apis/kudo/v1beta1" - - "github.com/spf13/pflag" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer/json" @@ -52,8 +46,12 @@ import ( coretesting "k8s.io/client-go/testing" api "k8s.io/client-go/tools/clientcmd/api/v1" "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/client/apiutil" "sigs.k8s.io/controller-runtime/pkg/envtest" kindConfig "sigs.k8s.io/kind/pkg/apis/config/v1alpha3" + + "github.com/kudobuilder/kudo/pkg/apis" + kudo "github.com/kudobuilder/kudo/pkg/apis/kudo/v1beta1" ) // ensure that we only add to the scheme once. diff --git a/pkg/test/utils/kubernetes_test.go b/pkg/test/utils/kubernetes_test.go index c717ef485..8c028488d 100644 --- a/pkg/test/utils/kubernetes_test.go +++ b/pkg/test/utils/kubernetes_test.go @@ -7,13 +7,13 @@ import ( "testing" "time" - kudo "github.com/kudobuilder/kudo/pkg/apis/kudo/v1beta1" - "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" + + kudo "github.com/kudobuilder/kudo/pkg/apis/kudo/v1beta1" ) func TestNamespaced(t *testing.T) {