Merge pull request #102 from inteon/fix_linters

Fix linters

.golangci.yaml

@@ -2,11 +2,6 @@ issues:
   exclude-rules:
     - linters:
         - gosec
-        - unparam
-        - errorlint
-        - tenv
-        - gci
-        - gocritic
       text: ".*"
 linters:
   # Explicitly define all enabled linters

controllers/certificaterequest_controller_integration_test.go

@@ -148,7 +148,7 @@ func TestCertificateRequestControllerIntegrationIssuerInitiallyNotFoundAndNotRea
 
 			checkComplete := kubeClients.StartObjectWatch(t, ctx, cr)
 			t.Log("Creating & approving the CertificateRequest")
-			createApprovedCR(t, ctx, kubeClients.Client, clock.RealClock{}, cr)
+			createApprovedCR(t, ctx, kubeClients.Client, cr)
 			t.Log("Waiting for controller to mark the CertificateRequest as IssuerNotFound")
 			err := checkComplete(func(obj runtime.Object) error {
 				readyCondition := cmutil.GetCertificateRequestCondition(obj.(*cmapi.CertificateRequest), cmapi.CertificateRequestConditionReady)
@@ -272,7 +272,7 @@ func TestCertificateRequestControllerIntegrationSetCondition(t *testing.T) {
 
 	checkComplete := kubeClients.StartObjectWatch(t, ctx, cr)
 	t.Log("Creating & approving the CertificateRequest")
-	createApprovedCR(t, ctx, kubeClients.Client, clock.RealClock{}, cr)
+	createApprovedCR(t, ctx, kubeClients.Client, cr)
 	t.Log("Waiting for controller to mark the CertificateRequest as IssuerNotFound")
 	err := checkComplete(func(obj runtime.Object) error {
 		readyCondition := cmutil.GetCertificateRequestCondition(obj.(*cmapi.CertificateRequest), cmapi.CertificateRequestConditionReady)
@@ -372,12 +372,12 @@ func TestCertificateRequestControllerIntegrationSetCondition(t *testing.T) {
 	require.Equal(t, uint64(3), atomic.LoadUint64(&counter))
 }
 
-func createApprovedCR(t *testing.T, ctx context.Context, kc client.Client, clock clock.PassiveClock, cr *cmapi.CertificateRequest) {
+func createApprovedCR(t *testing.T, ctx context.Context, kc client.Client, cr *cmapi.CertificateRequest) {
 	t.Helper()
 
 	require.NoError(t, kc.Create(ctx, cr))
 	conditions.SetCertificateRequestStatusCondition(
-		clock,
+		clock.RealClock{},
 		cr.Status.Conditions,
 		&cr.Status.Conditions,
 		cmapi.CertificateRequestConditionApproved,

controllers/combined_controller_integration_test.go

@@ -193,7 +193,7 @@ func TestCombinedControllerTemporaryFailedCertificateRequestRetrigger(t *testing
 			}, watch.Added, watch.Modified)
 			require.NoError(t, err)
 
-			createApprovedCR(t, ctx, kubeClients.Client, clock.RealClock{}, cr)
+			createApprovedCR(t, ctx, kubeClients.Client, cr)
 
 			checkCr1Complete := kubeClients.StartObjectWatch(t, ctx, cr)
 			checkCr2Complete := kubeClients.StartObjectWatch(t, ctx, cr)
@@ -538,7 +538,7 @@ func TestCombinedControllerTiming(t *testing.T) { //nolint:tparallel
 			)
 
 			require.NoError(t, kubeClients.Client.Create(ctx, issuer))
-			createApprovedCR(t, ctx, kubeClients.Client, clock.RealClock{}, cr)
+			createApprovedCR(t, ctx, kubeClients.Client, cr)
 
 			<-done
 			time.Sleep(1 * time.Second)

controllers/issuer_controller.go

@@ -129,7 +129,7 @@ func (r *IssuerReconciler) reconcileStatusPatch(
 	logger logr.Logger,
 	ctx context.Context,
 	req ctrl.Request,
-) (result ctrl.Result, issuerStatusPatch *v1alpha1.IssuerStatus, reconcileError error) {
+) (result ctrl.Result, issuerStatusPatch *v1alpha1.IssuerStatus, reconcileError error) { // nolint:unparam
 	// Get the ClusterIssuer
 	issuer := r.ForObject.DeepCopyObject().(v1alpha1.Issuer)
 	forObjectGvk := r.ForObject.GetObjectKind().GroupVersionKind()
@@ -170,8 +170,7 @@ func (r *IssuerReconciler) reconcileStatusPatch(
 	// for updating its Status.
 	issuerStatusPatch = &v1alpha1.IssuerStatus{}
 
-	setCondition := func(
-		conditionType cmapi.IssuerConditionType,
+	setReadyCondition := func(
 		status cmmeta.ConditionStatus,
 		reason, message string,
 	) string {
@@ -180,8 +179,8 @@ func (r *IssuerReconciler) reconcileStatusPatch(
 			issuer.GetStatus().Conditions,
 			&issuerStatusPatch.Conditions,
 			issuer.GetGeneration(),
-			conditionType, status,
-			reason, message,
+			cmapi.IssuerConditionReady,
+			status, reason, message,
 		)
 		return condition.Message
 	}
@@ -190,8 +189,7 @@ func (r *IssuerReconciler) reconcileStatusPatch(
 	// to Unknown.
 	if readyCondition == nil {
 		logger.V(1).Info("Initializing Ready condition")
-		setCondition(
-			cmapi.IssuerConditionReady,
+		setReadyCondition(
 			cmmeta.ConditionUnknown,
 			v1alpha1.IssuerConditionReasonInitializing,
 			fmt.Sprintf("%s has started reconciling this Issuer", r.FieldOwner),
@@ -212,8 +210,7 @@ func (r *IssuerReconciler) reconcileStatusPatch(
 	}
 	if err == nil {
 		logger.V(1).Info("Successfully finished the reconciliation.")
-		message := setCondition(
-			cmapi.IssuerConditionReady,
+		message := setReadyCondition(
 			cmmeta.ConditionTrue,
 			v1alpha1.IssuerConditionReasonChecked,
 			"Succeeded checking the issuer",
@@ -227,8 +224,7 @@ func (r *IssuerReconciler) reconcileStatusPatch(
 	if isPermanentError {
 		// fail permanently
 		logger.V(1).Error(err, "Permanent Issuer error. Marking as failed.")
-		message := setCondition(
-			cmapi.IssuerConditionReady,
+		message := setReadyCondition(
 			cmmeta.ConditionFalse,
 			v1alpha1.IssuerConditionReasonFailed,
 			fmt.Sprintf("Failed permanently: %s", err),
@@ -238,8 +234,7 @@ func (r *IssuerReconciler) reconcileStatusPatch(
 	} else {
 		// retry
 		logger.V(1).Error(err, "Retryable Issuer error.")
-		message := setCondition(
-			cmapi.IssuerConditionReady,
+		message := setReadyCondition(
 			cmmeta.ConditionFalse,
 			v1alpha1.IssuerConditionReasonPending,
 			fmt.Sprintf("Not ready yet: %s", err),

examples/simple/controller/signer.go

@@ -28,7 +28,6 @@ import (
 	"time"
 
 	ctrl "sigs.k8s.io/controller-runtime"
-
 	"simple-issuer/api"
 
 	"github.com/cert-manager/issuer-lib/api/v1alpha1"

examples/simple/e2e/e2e_test.go

@@ -41,7 +41,6 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/util/retry"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-
 	"simple-issuer/api"
 )
 

examples/simple/main.go

@@ -35,7 +35,6 @@ import (
 	ctrlzap "sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
-
 	"simple-issuer/api"
 	"simple-issuer/controller"
 
@@ -113,6 +112,23 @@ func main() {
 	klog.SetLogger(logr)
 	ctrl.SetLogger(logr)
 
+	if err := run(
+		clusterResourceNamespace,
+		metricsAddr,
+		enableLeaderElection,
+		probeAddr,
+	); err != nil {
+		logr.Error(err, "error running manager")
+		os.Exit(1)
+	}
+}
+
+func run(
+	clusterResourceNamespace string,
+	metricsAddr string,
+	enableLeaderElection bool,
+	probeAddr string,
+) error {
 	setupLog := ctrl.Log.WithName("setup")
 
 	setupLog.Info("versionInfo", "Version", Version)
@@ -124,7 +140,6 @@ func main() {
 		} else {
 			setupLog.Error(err, "unexpected error while getting in-cluster Namespace")
 		}
-		os.Exit(1)
 	}
 
 	scheme := runtime.NewScheme()
@@ -160,30 +175,27 @@ func main() {
 
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), options)
 	if err != nil {
-		setupLog.Error(err, "unable to start manager")
-		os.Exit(1)
+		return fmt.Errorf("unable to start manager: %w", err)
 	}
 
 	if err = (&controller.Signer{}).SetupWithManager(ctx, mgr); err != nil {
-		setupLog.Error(err, "unable to create controller")
-		os.Exit(1)
+		return fmt.Errorf("unable to create controller: %w", err)
 	}
 	// +kubebuilder:scaffold:builder
 
 	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {
-		setupLog.Error(err, "unable to set up health check")
-		os.Exit(1)
+		return fmt.Errorf("unable to set up health check: %w", err)
 	}
 	if err := mgr.AddReadyzCheck("readyz", healthz.Ping); err != nil {
-		setupLog.Error(err, "unable to set up ready check")
-		os.Exit(1)
+		return fmt.Errorf("unable to set up ready check: %w", err)
 	}
 
 	setupLog.Info("starting manager")
 	if err := mgr.Start(ctx); err != nil {
-		setupLog.Error(err, "problem running manager")
-		os.Exit(1)
+		return fmt.Errorf("problem running manager: %w", err)
 	}
+
+	return nil
 }
 
 var errNotInCluster = errors.New("not running in-cluster")

internal/tests/testresource/kube.go

@@ -21,7 +21,6 @@ import (
 	"errors"
 	"fmt"
 	"math/rand"
-	"os"
 	goruntime "runtime"
 	"testing"
 	"time"
@@ -107,7 +106,7 @@ func (k *OwnedKubeClients) initTestEnv(tb testing.TB, scheme *runtime.Scheme) {
 func (k *OwnedKubeClients) initExistingKubernetes(tb testing.TB, kubeconfig string) {
 	tb.Helper()
 
-	os.Setenv("KUBECONFIG", kubeconfig)
+	tb.Setenv("KUBECONFIG", kubeconfig)
 	kubeConfig, err := config.GetConfigWithContext("")
 	require.NoError(tb, err)