Merge pull request #406 from gibizer/full-golangci-lint

Ensure golangci-lint runs on all files
openstack-k8s-operators · Apr 22, 2024 · d4f7fd0 · d4f7fd0
2 parents 6e12eff + f9b2abc
commit d4f7fd0
Show file tree

Hide file tree

Showing 9 changed files with 154 additions and 162 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -58,5 +58,5 @@ repos:
 - repo: https://github.com/golangci/golangci-lint
   rev: v1.55.2
   hooks:
-    - id: golangci-lint
+    - id: golangci-lint-full
       args: ["-v"]
diff --git a/controllers/keystoneapi_controller.go b/controllers/keystoneapi_controller.go
@@ -36,7 +36,6 @@ import (
 	labels "github.com/openstack-k8s-operators/lib-common/modules/common/labels"
 	nad "github.com/openstack-k8s-operators/lib-common/modules/common/networkattachment"
 	common_rbac "github.com/openstack-k8s-operators/lib-common/modules/common/rbac"
-	"github.com/openstack-k8s-operators/lib-common/modules/common/secret"
 	oko_secret "github.com/openstack-k8s-operators/lib-common/modules/common/secret"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
@@ -672,7 +671,7 @@ func (r *KeystoneAPIReconciler) reconcileInit(
 	return ctrl.Result{}, nil
 }
 
-func (r *KeystoneAPIReconciler) reconcileUpdate(ctx context.Context, instance *keystonev1.KeystoneAPI, helper *helper.Helper) (ctrl.Result, error) {
+func (r *KeystoneAPIReconciler) reconcileUpdate(ctx context.Context) (ctrl.Result, error) {
 	l := GetLog(ctx)
 	l.Info("Reconciling Service update")
 
@@ -683,7 +682,7 @@ func (r *KeystoneAPIReconciler) reconcileUpdate(ctx context.Context, instance *k
 	return ctrl.Result{}, nil
 }
 
-func (r *KeystoneAPIReconciler) reconcileUpgrade(ctx context.Context, instance *keystonev1.KeystoneAPI, helper *helper.Helper) (ctrl.Result, error) {
+func (r *KeystoneAPIReconciler) reconcileUpgrade(ctx context.Context) (ctrl.Result, error) {
 	l := GetLog(ctx)
 	l.Info("Reconciling Service upgrade")
 
@@ -969,15 +968,15 @@ func (r *KeystoneAPIReconciler) reconcileNormal(
 	}
 
 	// Handle service update
-	ctrlResult, err = r.reconcileUpdate(ctx, instance, helper)
+	ctrlResult, err = r.reconcileUpdate(ctx)
 	if err != nil {
 		return ctrlResult, err
 	} else if (ctrlResult != ctrl.Result{}) {
 		return ctrlResult, nil
 	}
 
 	// Handle service upgrade
-	ctrlResult, err = r.reconcileUpgrade(ctx, instance, helper)
+	ctrlResult, err = r.reconcileUpgrade(ctx)
 	if err != nil {
 		return ctrlResult, err
 	} else if (ctrlResult != ctrl.Result{}) {
@@ -989,7 +988,7 @@ func (r *KeystoneAPIReconciler) reconcileNormal(
 	//
 
 	// Define a new Deployment object
-	deplDef, err := keystone.Deployment(ctx, helper, instance, inputHash, serviceLabels, serviceAnnotations)
+	deplDef, err := keystone.Deployment(instance, inputHash, serviceLabels, serviceAnnotations)
 	if err != nil {
 		instance.Status.Conditions.Set(condition.FalseCondition(
 			condition.DeploymentReadyCondition,
@@ -1153,7 +1152,7 @@ func (r *KeystoneAPIReconciler) generateServiceConfigMaps(
 		customData[key] = data
 	}
 
-	transportURLSecret, _, err := secret.GetSecret(ctx, h, instance.Status.TransportURLSecret, instance.Namespace)
+	transportURLSecret, _, err := oko_secret.GetSecret(ctx, h, instance.Status.TransportURLSecret, instance.Namespace)
 	if err != nil {
 		return err
 	}
@@ -1210,7 +1209,7 @@ func (r *KeystoneAPIReconciler) generateServiceConfigMaps(
 			Labels:        cmLabels,
 		},
 	}
-	return secret.EnsureSecrets(ctx, h, instance, tmpl, envVars)
+	return oko_secret.EnsureSecrets(ctx, h, instance, tmpl, envVars)
 }
 
 // reconcileConfigMap -  creates clouds.yaml

diff --git a/controllers/keystoneendpoint_controller.go b/controllers/keystoneendpoint_controller.go
@@ -408,7 +408,6 @@ func (r *KeystoneEndpointReconciler) reconcileNormal(
 	err = r.reconcileEndpoints(
 		ctx,
 		instance,
-		helper,
 		os)
 	if err != nil {
 		instance.Status.Conditions.Set(condition.FalseCondition(
@@ -433,7 +432,6 @@ func (r *KeystoneEndpointReconciler) reconcileNormal(
 func (r *KeystoneEndpointReconciler) reconcileEndpoints(
 	ctx context.Context,
 	instance *keystonev1.KeystoneEndpoint,
-	helper *helper.Helper,
 	os *openstack.OpenStack,
 ) error {
 	l := GetLog(ctx)

diff --git a/pkg/keystone/deployment.go b/pkg/keystone/deployment.go
@@ -16,13 +16,10 @@ limitations under the License.
 package keystone
 
 import (
-	"context"
-
 	keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1"
 	common "github.com/openstack-k8s-operators/lib-common/modules/common"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/affinity"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/env"
-	"github.com/openstack-k8s-operators/lib-common/modules/common/helper"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 
@@ -39,8 +36,6 @@ const (
 
 // Deployment func
 func Deployment(
-	ctx context.Context,
-	helper *helper.Helper,
 	instance *keystonev1.KeystoneAPI,
 	configHash string,
 	labels map[string]string,

diff --git a/pkg/keystone/fernet.go b/pkg/keystone/fernet.go
@@ -19,12 +19,10 @@ import (
 	"encoding/base64"
 
 	"math/rand"
-	"time"
 )
 
 // GenerateFernetKey -
 func GenerateFernetKey() string {
-	rand.Seed(time.Now().UnixNano())
 	data := make([]byte, 32)
 	for i := 0; i < 32; i++ {
 		data[i] = byte(rand.Intn(10))

diff --git a/tests/functional/base_test.go b/tests/functional/base_test.go
@@ -19,7 +19,7 @@ package functional_test
 import (
 	"fmt"
 
-	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega" //revive:disable:dot-imports
 
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"