fix linter errors

Author: pooknull

cmd/postgres-operator/main.go

@@ -60,14 +60,14 @@ func assertNoError(err error) {
 	}
 }
 
-func initLogging() {
-	// Configure a singleton that treats logr.Logger.V(1) as logrus.DebugLevel.
-	var verbosity int
-	if strings.EqualFold(os.Getenv("CRUNCHY_DEBUG"), "true") {
-		verbosity = 1
-	}
-	logging.SetLogSink(logging.Logrus(os.Stdout, versionString, 1, verbosity))
-}
+//func initLogging() {
+//	// Configure a singleton that treats logr.Logger.V(1) as logrus.DebugLevel.
+//	var verbosity int
+//	if strings.EqualFold(os.Getenv("CRUNCHY_DEBUG"), "true") {
+//		verbosity = 1
+//	}
+//	logging.SetLogSink(logging.Logrus(os.Stdout, versionString, 1, verbosity))
+//}
 
 func main() {
 	// Set any supplied feature gates; panic on any unrecognized feature gate

internal/controller/postgrescluster/controller_test.go

@@ -105,6 +105,7 @@ func TestDeleteControlled(t *testing.T) {
 	})
 }
 
+/*
 var olmClusterYAML = `
 metadata:
   name: olm
@@ -132,6 +133,7 @@ spec:
               requests:
                 storage: 1Gi
 `
+*/
 
 var _ = Describe("PostgresCluster Reconciler", func() {
 	var test struct {

percona/pmm/pmm.go

@@ -10,10 +10,8 @@ import (
 	v2 "github.com/percona/percona-postgresql-operator/pkg/apis/pgv2.percona.com/v2"
 )
 
-// #nosec G101
-
 const (
-	SecretKey = "PMM_SERVER_KEY"
+	SecretKey = "PMM_SERVER_KEY" // nolint:gosec
 )
 
 func SidecarContainer(pgc *v2.PerconaPGCluster) corev1.Container {
@@ -242,5 +240,4 @@ func agentPrerunScript() string {
 	addService := fmt.Sprintf("pmm-admin add postgresql %s", strings.Join(addServiceArgs, " "))
 
 	return wait + "; " + addService + "; " + annotate
-
 }

percona/version/version.go

@@ -14,8 +14,6 @@ import (
 	v2 "github.com/percona/percona-postgresql-operator/pkg/apis/pgv2.percona.com/v2"
 )
 
-type DepVersion struct{}
-
 type Meta struct {
 	Apply              string
 	OperatorVersion    string
@@ -33,18 +31,18 @@ type Meta struct {
 }
 
 func EnsureVersion(ctx context.Context, meta Meta) error {
-	_, err := fetchVersions(ctx, v2.GetDefaultVersionServiceEndpoint(), meta)
+	err := fetchVersions(ctx, v2.GetDefaultVersionServiceEndpoint(), meta)
 	if err != nil {
 		return errors.Wrap(err, fmt.Sprintf("failed to send telemetry to %s", v2.GetDefaultVersionServiceEndpoint()))
 	}
 
 	return nil
 }
 
-func fetchVersions(ctx context.Context, endpoint string, vm Meta) (DepVersion, error) {
+func fetchVersions(ctx context.Context, endpoint string, vm Meta) error {
 	requestURL, err := url.Parse(endpoint)
 	if err != nil {
-		return DepVersion{}, errors.Wrap(err, "parse endpoint")
+		return errors.Wrap(err, "parse endpoint")
 	}
 
 	srvCl := client.NewHTTPClientWithConfig(nil, &client.TransportConfig{
@@ -76,8 +74,8 @@ func fetchVersions(ctx context.Context, endpoint string, vm Meta) (DepVersion, e
 
 	_, err = srvCl.VersionService.VersionServiceApply(applyParams)
 	if err != nil {
-		return DepVersion{}, errors.Wrap(err, "version service apply")
+		return errors.Wrap(err, "version service apply")
 	}
 
-	return DepVersion{}, nil
+	return nil
 }