chore(style): run goimports

Author: njhale

pkg/api/apis/operators/v1alpha1/clusterserviceversion_types.go

@@ -479,4 +479,3 @@ func (csv ClusterServiceVersion) GetOwnedAPIServiceDescriptions() []APIServiceDe
 
 	return descs
 }
-

pkg/controller/operators/catalog/operator.go

@@ -43,7 +43,7 @@ const (
 	clusterRoleKind        = "ClusterRole"
 	clusterRoleBindingKind = "ClusterRoleBinding"
 	serviceAccountKind     = "ServiceAccount"
-	serviceKind 		   = "Service"
+	serviceKind            = "Service"
 	roleKind               = "Role"
 	roleBindingKind        = "RoleBinding"
 )
@@ -1032,7 +1032,7 @@ func (o *Operator) ExecutePlan(plan *v1alpha1.InstallPlan) error {
 					// If no error occurred, mark the step as Created.
 					plan.Status.Plan[i].Status = v1alpha1.StepStatusCreated
 				}
-			
+
 			case serviceKind:
 				// Marshal the manifest into a Service instance
 				var s corev1.Service

pkg/controller/operators/catalog/operator_test.go

@@ -1,16 +1,18 @@
 package catalog
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
 	"testing"
 	"time"
-	"encoding/json"
 
 	"github.com/ghodss/yaml"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/require"
+	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
+	rbacv1 "k8s.io/api/rbac/v1"
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	apiextensionsfake "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -20,8 +22,6 @@ import (
 	k8sfake "k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/cache"
 	apiregistrationfake "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake"
-	appsv1 "k8s.io/api/apps/v1"
-	rbacv1 "k8s.io/api/rbac/v1"
 
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned/fake"
@@ -119,51 +119,51 @@ func TestTransitionInstallPlan(t *testing.T) {
 func TestExecutePlan(t *testing.T) {
 	namespace := "ns"
 
-	tests := []struct{
+	tests := []struct {
 		testName string
-		in *v1alpha1.InstallPlan
-		want []runtime.Object
-		err error
+		in       *v1alpha1.InstallPlan
+		want     []runtime.Object
+		err      error
 	}{
 		{
 			testName: "NoSteps",
-			in: installPlan("p", namespace, v1alpha1.InstallPlanPhaseInstalling),
-			want: []runtime.Object{},
-			err: nil,
+			in:       installPlan("p", namespace, v1alpha1.InstallPlanPhaseInstalling),
+			want:     []runtime.Object{},
+			err:      nil,
 		},
 		{
 			testName: "MultipleSteps",
 			in: withSteps(installPlan("p", namespace, v1alpha1.InstallPlanPhaseInstalling, "csv"),
 				[]*v1alpha1.Step{
 					&v1alpha1.Step{
 						Resource: v1alpha1.StepResource{
-							CatalogSource: "catalog",
+							CatalogSource:          "catalog",
 							CatalogSourceNamespace: namespace,
-							Group: "",
-							Version: "v1",
-							Kind: "Service",
-							Name: "service",
-							Manifest: toManifest(service("service", namespace)),
+							Group:                  "",
+							Version:                "v1",
+							Kind:                   "Service",
+							Name:                   "service",
+							Manifest:               toManifest(service("service", namespace)),
 						},
 						Status: v1alpha1.StepStatusUnknown,
 					},
 					&v1alpha1.Step{
 						Resource: v1alpha1.StepResource{
-							CatalogSource: "catalog",
+							CatalogSource:          "catalog",
 							CatalogSourceNamespace: namespace,
-							Group: "operators.coreos.com",
-							Version: "v1alpha1",
-							Kind: "ClusterServiceVersion",
-							Name: "csv",
-							Manifest: toManifest(csv("csv", namespace, nil, nil)),
+							Group:                  "operators.coreos.com",
+							Version:                "v1alpha1",
+							Kind:                   "ClusterServiceVersion",
+							Name:                   "csv",
+							Manifest:               toManifest(csv("csv", namespace, nil, nil)),
 						},
 						Status: v1alpha1.StepStatusUnknown,
 					},
 				},
 			),
 			want: []runtime.Object{service("service", namespace), csv("csv", namespace, nil, nil)},
-			err: nil,
-		},		
+			err:  nil,
+		},
 	}
 
 	for _, tt := range tests {
@@ -538,15 +538,15 @@ func NewFakeOperator(clientObjs []runtime.Object, k8sObjs []runtime.Object, extO
 func installPlan(name, namespace string, phase v1alpha1.InstallPlanPhase, names ...string) *v1alpha1.InstallPlan {
 	return &v1alpha1.InstallPlan{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: name,
+			Name:      name,
 			Namespace: namespace,
 		},
 		Spec: v1alpha1.InstallPlanSpec{
 			ClusterServiceVersionNames: names,
 		},
 		Status: v1alpha1.InstallPlanStatus{
 			Phase: phase,
-			Plan: []*v1alpha1.Step{},
+			Plan:  []*v1alpha1.Step{},
 		},
 	}
 }
@@ -575,7 +575,7 @@ func csv(name, namespace string, owned, required []string) *v1alpha1.ClusterServ
 
 	return &v1alpha1.ClusterServiceVersion{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: name,
+			Name:      name,
 			Namespace: namespace,
 		},
 		Spec: v1alpha1.ClusterServiceVersionSpec{
@@ -605,7 +605,7 @@ func crd(name string) v1beta1.CustomResourceDefinition {
 func service(name, namespace string) *corev1.Service {
 	return &corev1.Service{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: name, 
+			Name:      name,
 			Namespace: namespace,
 		},
 	}
@@ -614,4 +614,4 @@ func service(name, namespace string) *corev1.Service {
 func toManifest(obj runtime.Object) string {
 	raw, _ := json.Marshal(obj)
 	return string(raw)
-}
+}

pkg/controller/registry/resolver/resolver_test.go

@@ -7,9 +7,9 @@ import (
 
 	opregistry "github.com/operator-framework/operator-registry/pkg/registry"
 	"github.com/stretchr/testify/require"
+	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/cache"
 
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
@@ -126,7 +126,7 @@ func TestNamespaceResolver(t *testing.T) {
 			out: out{
 				steps: [][]*v1alpha1.Step{
 					bundleSteps(bundle("a.v1", "a", "alpha", "", nil, Requires1, nil, nil), namespace, catalog),
-					bundleSteps(withBundleObject(bundle("b.v1", "b", "beta", "", Provides1, nil, nil, nil),  u(&corev1.Service{TypeMeta: metav1.TypeMeta{Kind: "Service", APIVersion: ""}, ObjectMeta: metav1.ObjectMeta{Name: "test-service"}})), namespace, catalog),
+					bundleSteps(withBundleObject(bundle("b.v1", "b", "beta", "", Provides1, nil, nil, nil), u(&corev1.Service{TypeMeta: metav1.TypeMeta{Kind: "Service", APIVersion: ""}, ObjectMeta: metav1.ObjectMeta{Name: "test-service"}})), namespace, catalog),
 					subSteps(namespace, "b.v1", "b", "beta", catalog),
 				},
 				subs: []*v1alpha1.Subscription{