pkg,test: Fix linting violations in relevant packages

Run find . -name '*.go' -not -path "./vendor/*" -not -path "./pkg/lib/operatorclient/operatorclientmocks/*" | xargs gofmt -w find . -name '*.go' -not -path "./vendor/*" -not -path "./pkg/lib/operatorclient/operatorclientmocks/*" | xargs goimports -w and commit the results. Signed-off-by: timflannagan <timflannagan@gmail.com>
operator-framework · Sep 8, 2021 · 2246f8a · 2246f8a
1 parent 5deade0
commit 2246f8a
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 19 deletions.
diff --git a/pkg/controller/certs/certs.go b/pkg/controller/certs/certs.go
@@ -16,12 +16,12 @@ import (
 )
 
 type CertGenerator interface {
- Generate(notAfter time.Time, organization string, ca *KeyPair, hosts []string) (*KeyPair, error)
+ Generate(notAfter time.Time, organization string, ca *KeyPair, hosts []string) (*KeyPair, error)
 }
 
 type CertGeneratorFunc func(notAfter time.Time, organization string, ca *KeyPair, hosts []string) (*KeyPair, error)
 
-func (f CertGeneratorFunc) Generate(notAfter time.Time, organization string, ca *KeyPair, hosts []string) (*KeyPair, error)  {
+func (f CertGeneratorFunc) Generate(notAfter time.Time, organization string, ca *KeyPair, hosts []string) (*KeyPair, error) {
  return f(notAfter, organization, ca, hosts)
 }
 

diff --git a/pkg/controller/operators/catalog/installplan_sync.go b/pkg/controller/operators/catalog/installplan_sync.go
@@ -4,7 +4,6 @@ import (
  "context"
  "errors"
 
-
  "github.com/sirupsen/logrus"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/apimachinery/pkg/labels"

diff --git a/pkg/controller/operators/openshift/clusteroperator_controller_test.go b/pkg/controller/operators/openshift/clusteroperator_controller_test.go
@@ -2,6 +2,7 @@ package openshift
 
 import (
  "fmt"
+
  semver "github.com/blang/semver/v4"
  . "github.com/onsi/ginkgo"
  . "github.com/onsi/gomega"

diff --git a/pkg/controller/operators/operatorcondition_controller_test.go b/pkg/controller/operators/operatorcondition_controller_test.go
@@ -6,8 +6,8 @@ import (
 
  . "github.com/onsi/ginkgo"
  . "github.com/onsi/gomega"
- operatorsv2 "github.com/operator-framework/api/pkg/operators/v2"
  operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
+ operatorsv2 "github.com/operator-framework/api/pkg/operators/v2"
  "github.com/operator-framework/operator-lifecycle-manager/pkg/lib/ownerutil"
 
  appsv1 "k8s.io/api/apps/v1"

diff --git a/pkg/controller/operators/operatorconditiongenerator_controller_test.go b/pkg/controller/operators/operatorconditiongenerator_controller_test.go
@@ -14,8 +14,8 @@ import (
 
  . "github.com/onsi/ginkgo"
  . "github.com/onsi/gomega"
- operatorsv2 "github.com/operator-framework/api/pkg/operators/v2"
  operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
+ operatorsv2 "github.com/operator-framework/api/pkg/operators/v2"
 )
 
 var _ = Describe("The OperatorConditionsGenerator Controller", func() {

diff --git a/pkg/controller/registry/grpc/source.go b/pkg/controller/registry/grpc/source.go
@@ -2,10 +2,11 @@ package grpc
 
 import (
  "context"
- "github.com/operator-framework/operator-registry/pkg/client"
  "sync"
  "time"
 
+ "github.com/operator-framework/operator-registry/pkg/client"
+
  "github.com/sirupsen/logrus"
  "google.golang.org/grpc"
  "google.golang.org/grpc/connectivity"
@@ -225,4 +226,4 @@ func (s *SourceStore) ClientsForNamespaces(namespaces ...string) map[registry.Ca
 
  // TODO : remove unhealthy
  return refs
-}
+}
diff --git a/pkg/controller/registry/resolver/rbac.go b/pkg/controller/registry/resolver/rbac.go
@@ -22,7 +22,7 @@ func generateName(base string, o interface{}) string {
  hashutil.DeepHashObject(hasher, o)
  hash := utilrand.SafeEncodeString(fmt.Sprint(hasher.Sum32()))
  if len(base)+len(hash) > maxNameLength {
- base = base[:maxNameLength - len(hash) - 1]
+ base = base[:maxNameLength-len(hash)-1]
  }
 
  return fmt.Sprintf("%s-%s", base, hash)

diff --git a/pkg/controller/registry/resolver/rbac_test.go b/pkg/controller/registry/resolver/rbac_test.go
@@ -29,15 +29,15 @@ func TestGenerateName(t *testing.T) {
  name: "generate",
  args: args{
  base: "myname",
- o: []string{"something"},
+ o:  []string{"something"},
  },
  want: "myname-9c895f74f",
  },
  {
  name: "truncated",
  args: args{
  base: strings.Repeat("name", 100),
- o: []string{"something", "else"},
+ o:  []string{"something", "else"},
  },
  want: "namenamenamenamenamenamenamenamenamenamenamenamename-78fd8b4d6b",
  },

diff --git a/pkg/lib/controller-runtime/client/ssa_test.go b/pkg/lib/controller-runtime/client/ssa_test.go
@@ -2,9 +2,10 @@ package client
 
 import (
  "context"
- "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
  "testing"
 
+ "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
  "github.com/operator-framework/operator-lifecycle-manager/pkg/lib/testobj"
  "github.com/stretchr/testify/require"
  corev1 "k8s.io/api/core/v1"

diff --git a/pkg/lib/crd/storage.go b/pkg/lib/crd/storage.go
@@ -2,6 +2,7 @@ package crd
 
 import (
  "fmt"
+
  apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
  apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
  "k8s.io/apimachinery/pkg/runtime"

diff --git a/pkg/lib/crd/storage_test.go b/pkg/lib/crd/storage_test.go
@@ -1,10 +1,11 @@
 package crd
 
 import (
+ "testing"
+
  "github.com/stretchr/testify/require"
  apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "testing"
 )
 
 const crdName = "test"
@@ -152,4 +153,4 @@ func TestSafeStorageVersionUpgradeSuccess(t *testing.T) {
  require.True(t, safe)
  // expect no error, since crd upgrade is safe
  require.NoError(t, err, "did not expect error for safe CRD upgrade")
-}
+}
diff --git a/pkg/lib/crd/version.go b/pkg/lib/crd/version.go
@@ -38,4 +38,3 @@ func Version(manifest *string) (string, error) {
 
  return v, nil
 }
-
diff --git a/pkg/lib/operatorlister/configmap.go b/pkg/lib/operatorlister/configmap.go
@@ -4,7 +4,7 @@ import (
  "fmt"
  "sync"
 
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/apimachinery/pkg/labels"
  "k8s.io/apimachinery/pkg/types"

diff --git a/pkg/lib/operatorlister/operatorgroup.go b/pkg/lib/operatorlister/operatorgroup.go
@@ -8,7 +8,7 @@ import (
  "k8s.io/apimachinery/pkg/labels"
  "k8s.io/apimachinery/pkg/types"
 
- "github.com/operator-framework/api/pkg/operators/v1"
+ v1 "github.com/operator-framework/api/pkg/operators/v1"
  listers "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/listers/operators/v1"
 )
 

diff --git a/pkg/lib/operatorlister/pod.go b/pkg/lib/operatorlister/pod.go
@@ -4,7 +4,7 @@ import (
  "fmt"
  "sync"
 
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/apimachinery/pkg/labels"
  "k8s.io/apimachinery/pkg/types"

diff --git a/pkg/package-server/provider/registry.go b/pkg/package-server/provider/registry.go
@@ -4,12 +4,13 @@ import (
  "context"
  "encoding/json"
  "fmt"
- "github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry"
  "io"
  "strings"
  "sync"
  "time"
 
+ "github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry"
+
  "github.com/sirupsen/logrus"
  "google.golang.org/grpc"
  "google.golang.org/grpc/connectivity"

diff --git a/test/e2e/registry.go b/test/e2e/registry.go
@@ -3,10 +3,11 @@ package e2e
 import (
  "context"
  "fmt"
+ "os/exec"
+
  "github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient"
  corev1 "k8s.io/api/core/v1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "os/exec"
 )
 
 // This module contains helper functions for copying images and creating image registries