Merge pull request #452 from coreydaley-redhat/organize_imports

organize imports
shipwright-io · Oct 29, 2020 · b6d900f · b6d900f
2 parents 589082e + cf35c73
commit b6d900f
Show file tree

Hide file tree

Showing 38 changed files with 142 additions and 106 deletions.
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -12,31 +12,30 @@ import (
 	"os"
 	"runtime"
 
-	buildconfig "github.com/shipwright-io/build/pkg/config"
-
-	"github.com/shipwright-io/build/pkg/ctxlog"
-
-	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
-
-	_ "k8s.io/client-go/plugin/pkg/client/auth"
-	"k8s.io/client-go/rest"
-
 	"github.com/operator-framework/operator-sdk/pkg/k8sutil"
 	kubemetrics "github.com/operator-framework/operator-sdk/pkg/kube-metrics"
+
+	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
 	"github.com/operator-framework/operator-sdk/pkg/log/zap"
 	"github.com/operator-framework/operator-sdk/pkg/metrics"
 	"github.com/operator-framework/operator-sdk/pkg/ready"
 	sdkVersion "github.com/operator-framework/operator-sdk/version"
-	"github.com/shipwright-io/build/pkg/apis"
-	"github.com/shipwright-io/build/pkg/controller"
-	buildMetrics "github.com/shipwright-io/build/pkg/metrics"
-	"github.com/shipwright-io/build/version"
 	"github.com/spf13/pflag"
+
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
+	_ "k8s.io/client-go/plugin/pkg/client/auth"
+	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
+
+	"github.com/shipwright-io/build/pkg/apis"
+	buildconfig "github.com/shipwright-io/build/pkg/config"
+	"github.com/shipwright-io/build/pkg/controller"
+	"github.com/shipwright-io/build/pkg/ctxlog"
+	buildMetrics "github.com/shipwright-io/build/pkg/metrics"
+	"github.com/shipwright-io/build/version"
 )
 
 // Change below variables to serve metrics on different host or port.

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -20,7 +20,7 @@ const (
 	contextTimeoutEnvVar = "CTX_TIMEOUT"
 
 	kanikoDefaultImage = "gcr.io/kaniko-project/executor:v1.2.0"
-	kanikoImageEnvVar = "KANIKO_CONTAINER_IMAGE"
+	kanikoImageEnvVar  = "KANIKO_CONTAINER_IMAGE"
 
 	// environment variable to override the buckets
 	metricBuildRunCompletionDurationBucketsEnvVar = "PROMETHEUS_BR_COMP_DUR_BUCKETS"

diff --git a/pkg/controller/build/build_controller.go b/pkg/controller/build/build_controller.go
@@ -11,11 +11,7 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
-	build "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
-	"github.com/shipwright-io/build/pkg/config"
-	"github.com/shipwright-io/build/pkg/controller/utils"
-	"github.com/shipwright-io/build/pkg/ctxlog"
-	buildmetrics "github.com/shipwright-io/build/pkg/metrics"
+
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -30,6 +26,12 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
+
+	build "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
+	"github.com/shipwright-io/build/pkg/config"
+	"github.com/shipwright-io/build/pkg/controller/utils"
+	"github.com/shipwright-io/build/pkg/ctxlog"
+	buildmetrics "github.com/shipwright-io/build/pkg/metrics"
 )
 
 // succeedStatus default status for the Build CRD

diff --git a/pkg/controller/build/build_controller_test.go b/pkg/controller/build/build_controller_test.go
@@ -8,15 +8,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/shipwright-io/build/test"
-
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	build "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
-	"github.com/shipwright-io/build/pkg/config"
-	buildController "github.com/shipwright-io/build/pkg/controller/build"
-	"github.com/shipwright-io/build/pkg/controller/fakes"
-	"github.com/shipwright-io/build/pkg/ctxlog"
+
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -25,6 +19,13 @@ import (
 	crc "sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	build "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
+	"github.com/shipwright-io/build/pkg/config"
+	buildController "github.com/shipwright-io/build/pkg/controller/build"
+	"github.com/shipwright-io/build/pkg/controller/fakes"
+	"github.com/shipwright-io/build/pkg/ctxlog"
+	"github.com/shipwright-io/build/test"
 )
 
 var _ = Describe("Reconcile Build", func() {

diff --git a/pkg/controller/buildrun/buildrun_controller.go b/pkg/controller/buildrun/buildrun_controller.go
@@ -11,17 +11,14 @@ import (
 	"strconv"
 	"strings"
 
-	buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
-	"github.com/shipwright-io/build/pkg/config"
-	"github.com/shipwright-io/build/pkg/ctxlog"
-	buildmetrics "github.com/shipwright-io/build/pkg/metrics"
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
+	"knative.dev/pkg/apis"
+
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
-	"knative.dev/pkg/apis"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -31,6 +28,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
+
+	buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
+	"github.com/shipwright-io/build/pkg/config"
+	"github.com/shipwright-io/build/pkg/ctxlog"
+	buildmetrics "github.com/shipwright-io/build/pkg/metrics"
 )
 
 const (

diff --git a/pkg/controller/buildrun/buildrun_controller_test.go b/pkg/controller/buildrun/buildrun_controller_test.go
@@ -12,14 +12,8 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"github.com/shipwright-io/build/pkg/apis"
-	build "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
-	"github.com/shipwright-io/build/pkg/config"
-	buildrunctl "github.com/shipwright-io/build/pkg/controller/buildrun"
-	"github.com/shipwright-io/build/pkg/controller/fakes"
-	"github.com/shipwright-io/build/pkg/ctxlog"
-	"github.com/shipwright-io/build/test"
 	v1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
+
 	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -31,6 +25,14 @@ import (
 	crc "sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	"github.com/shipwright-io/build/pkg/apis"
+	build "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
+	"github.com/shipwright-io/build/pkg/config"
+	buildrunctl "github.com/shipwright-io/build/pkg/controller/buildrun"
+	"github.com/shipwright-io/build/pkg/controller/fakes"
+	"github.com/shipwright-io/build/pkg/ctxlog"
+	"github.com/shipwright-io/build/test"
 )
 
 var _ = Describe("Reconcile BuildRun", func() {

diff --git a/pkg/controller/buildrun/credentials.go b/pkg/controller/buildrun/credentials.go
@@ -7,10 +7,10 @@ package buildrun
 import (
 	"context"
 
+	corev1 "k8s.io/api/core/v1"
+
 	buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
 	"github.com/shipwright-io/build/pkg/ctxlog"
-
-	corev1 "k8s.io/api/core/v1"
 )
 
 // ApplyCredentials adds all credentials that are referenced by the build and adds them to the service account.

diff --git a/pkg/controller/buildrun/credentials_test.go b/pkg/controller/buildrun/credentials_test.go
@@ -9,9 +9,10 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
+
 	corev1 "k8s.io/api/core/v1"
 
+	buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
 	buildRunController "github.com/shipwright-io/build/pkg/controller/buildrun"
 )
 

diff --git a/pkg/controller/buildrun/generate_taskrun.go b/pkg/controller/buildrun/generate_taskrun.go
@@ -9,13 +9,15 @@ import (
 	"strconv"
 	"strings"
 
-	buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
-	"github.com/shipwright-io/build/pkg/config"
-	"github.com/shipwright-io/build/pkg/controller/utils"
 	taskv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1alpha1"
 	v1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
+
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
+	"github.com/shipwright-io/build/pkg/config"
+	"github.com/shipwright-io/build/pkg/controller/utils"
 )
 
 const (

diff --git a/pkg/controller/buildrun/generate_taskrun_test.go b/pkg/controller/buildrun/generate_taskrun_test.go
@@ -11,14 +11,16 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
-	"github.com/shipwright-io/build/pkg/config"
-	buildrunCtl "github.com/shipwright-io/build/pkg/controller/buildrun"
-	"github.com/shipwright-io/build/test"
 	v1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
+
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
+	"github.com/shipwright-io/build/pkg/config"
+	buildrunCtl "github.com/shipwright-io/build/pkg/controller/buildrun"
+	"github.com/shipwright-io/build/test"
 )
 
 var _ = Describe("GenerateTaskrun", func() {

diff --git a/pkg/controller/buildrun/runtime_image.go b/pkg/controller/buildrun/runtime_image.go
@@ -12,11 +12,13 @@ import (
 	"strings"
 	"text/template"
 
+	v1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
+
+	v1 "k8s.io/api/core/v1"
+
 	buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
 	"github.com/shipwright-io/build/pkg/config"
 	"github.com/shipwright-io/build/pkg/controller/utils"
-	v1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
-	v1 "k8s.io/api/core/v1"
 )
 
 const (

diff --git a/pkg/controller/buildrun/runtime_image_test.go b/pkg/controller/buildrun/runtime_image_test.go
@@ -7,12 +7,12 @@ package buildrun
 import (
 	"fmt"
 
-	buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
-	"github.com/shipwright-io/build/pkg/config"
-	v1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
-
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	v1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
+
+	buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
+	"github.com/shipwright-io/build/pkg/config"
 )
 
 var _ = Describe("runtime-image", func() {

diff --git a/pkg/controller/buildstrategy/buildstrategy_controller.go b/pkg/controller/buildstrategy/buildstrategy_controller.go
@@ -7,16 +7,17 @@ package buildstrategy
 import (
 	"context"
 
-	buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
-	"github.com/shipwright-io/build/pkg/config"
-	"github.com/shipwright-io/build/pkg/ctxlog"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
+
+	buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
+	"github.com/shipwright-io/build/pkg/config"
+	"github.com/shipwright-io/build/pkg/ctxlog"
 )
 
 // Add creates a new BuildStrategy Controller and adds it to the Manager. The Manager will set fields on the Controller

diff --git a/pkg/controller/buildstrategy/buildstrategy_controller_test.go b/pkg/controller/buildstrategy/buildstrategy_controller_test.go
@@ -9,12 +9,14 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+
+	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
 	"github.com/shipwright-io/build/pkg/config"
 	buildstrategyController "github.com/shipwright-io/build/pkg/controller/buildstrategy"
 	"github.com/shipwright-io/build/pkg/controller/fakes"
 	"github.com/shipwright-io/build/pkg/ctxlog"
-	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
 var _ = Describe("Reconcile BuildStrategy", func() {

diff --git a/pkg/controller/clusterbuildstrategy/clusterbuildstrategy_controller.go b/pkg/controller/clusterbuildstrategy/clusterbuildstrategy_controller.go
@@ -7,16 +7,17 @@ package clusterbuildstrategy
 import (
 	"context"
 
-	buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
-	"github.com/shipwright-io/build/pkg/config"
-	"github.com/shipwright-io/build/pkg/ctxlog"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
+
+	buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
+	"github.com/shipwright-io/build/pkg/config"
+	"github.com/shipwright-io/build/pkg/ctxlog"
 )
 
 // Add creates a new ClusterBuildStrategy Controller and adds it to the Manager. The Manager will set fields on the Controller

diff --git a/pkg/controller/clusterbuildstrategy/clusterbuildstrategy_controller_test.go b/pkg/controller/clusterbuildstrategy/clusterbuildstrategy_controller_test.go
@@ -9,12 +9,14 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+
+	"k8s.io/apimachinery/pkg/types"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
 	"github.com/shipwright-io/build/pkg/config"
 	clusterbuildstrategyController "github.com/shipwright-io/build/pkg/controller/clusterbuildstrategy"
 	"github.com/shipwright-io/build/pkg/controller/fakes"
 	"github.com/shipwright-io/build/pkg/ctxlog"
-	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
 var _ = Describe("Reconcile ClusterBuildStrategy", func() {

diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -7,13 +7,14 @@ package controller
 import (
 	"context"
 
-	"github.com/shipwright-io/build/pkg/apis"
-	"github.com/shipwright-io/build/pkg/config"
-	"github.com/shipwright-io/build/pkg/ctxlog"
 	pipelinev1beta1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
-	"k8s.io/client-go/rest"
 
+	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
+
+	"github.com/shipwright-io/build/pkg/apis"
+	"github.com/shipwright-io/build/pkg/config"
+	"github.com/shipwright-io/build/pkg/ctxlog"
 )
 
 var (

diff --git a/pkg/controller/suite_test.go b/pkg/controller/suite_test.go
@@ -5,10 +5,10 @@
 package controller_test
 
 import (
+	"testing"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-
-	"testing"
 )
 
 func TestControllers(t *testing.T) {

diff --git a/pkg/ctxlog/context.go b/pkg/ctxlog/context.go
@@ -8,6 +8,7 @@ import (
 	"context"
 
 	"github.com/go-logr/logr"
+
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 

diff --git a/pkg/ctxlog/log.go b/pkg/ctxlog/log.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/operator-framework/operator-sdk/pkg/log/zap"
+
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ import ( @@
     	"context"
     	"github.com/go-logr/logr"
     	logf "sigs.k8s.io/controller-runtime/pkg/log"
     )
@@ Expand Down @@