fix golangci reported issuers

Signed-off-by: Martin Schuppert <[email protected]>

Author: stuggi

api/v1beta1/keystoneapi_webhook.go

@@ -151,7 +151,7 @@ func (spec *KeystoneAPISpec) ValidateUpdate(old KeystoneAPISpec, basePath *field
 	return spec.KeystoneAPISpecCore.ValidateUpdate(old.KeystoneAPISpecCore, basePath)
 }
 
-func (spec *KeystoneAPISpecCore) ValidateUpdate(old KeystoneAPISpecCore, basePath *field.Path) field.ErrorList {
+func (spec *KeystoneAPISpecCore) ValidateUpdate(_ KeystoneAPISpecCore, basePath *field.Path) field.ErrorList {
 	var allErrs field.ErrorList
 
 	// validate the service override key is valid

api/v1beta1/keystoneendpoint.go

@@ -239,6 +239,5 @@ func GetKeystoneEndpointUrls(
 		}
 	}
 
-
 	return endpointurls, nil
 }

controllers/keystoneapi_controller.go

@@ -887,7 +887,8 @@ func (r *KeystoneAPIReconciler) reconcileNormal(
 					condition.TLSInputReadyCondition,
 					condition.RequestedReason,
 					condition.SeverityInfo,
-					fmt.Sprintf(condition.TLSInputReadyWaitingMessage, instance.Spec.TLS.CaBundleSecretName)))
+					condition.TLSInputReadyWaitingMessage,
+					instance.Spec.TLS.CaBundleSecretName))
 				return ctrl.Result{}, nil
 			}
 			instance.Status.Conditions.Set(condition.FalseCondition(
@@ -912,7 +913,8 @@ func (r *KeystoneAPIReconciler) reconcileNormal(
 				condition.TLSInputReadyCondition,
 				condition.RequestedReason,
 				condition.SeverityInfo,
-				fmt.Sprintf(condition.TLSInputReadyWaitingMessage, err.Error())))
+				condition.TLSInputReadyWaitingMessage,
+				err.Error()))
 			return ctrl.Result{}, nil
 		}
 		instance.Status.Conditions.Set(condition.FalseCondition(

pkg/keystone/bootstrap.go

@@ -117,7 +117,7 @@ func BootstrapJob(
 	}
 	job.Spec.Template.Spec.Containers[0].Env = env.MergeEnvs(job.Spec.Template.Spec.Containers[0].Env, envVars)
 
-	if instance.Spec.NodeSelector != nil && len(instance.Spec.NodeSelector) > 0 {
+	if len(instance.Spec.NodeSelector) > 0 {
 		job.Spec.Template.Spec.NodeSelector = instance.Spec.NodeSelector
 	}
 

pkg/keystone/cloudconfig.go

@@ -50,11 +50,17 @@ type OpenStackConfigSecret struct {
 func GenerateCloudrc(secret *OpenStackConfigSecret, config *OpenStackConfig) string {
 	auth := config.Clouds.Default.Auth
 	val := fmt.Sprintf(
-		"export OS_AUTH_URL=" + auth.AuthURL +
-			"\nexport OS_USERNAME=" + auth.UserName +
-			"\nexport OS_PROJECT_NAME=" + auth.ProjectName +
-			"\nexport OS_PROJECT_DOMAIN_NAME=" + auth.ProjectDomainName +
-			"\nexport OS_USER_DOMAIN_NAME=" + auth.UserDomainName +
-			"\nexport OS_PASSWORD=" + secret.Clouds.Default.Auth.Password)
+		"export OS_AUTH_URL=%s"+
+			"\nexport OS_USERNAME=%s"+
+			"\nexport OS_PROJECT_NAME=%s"+
+			"\nexport OS_PROJECT_DOMAIN_NAME=%s"+
+			"\nexport OS_USER_DOMAIN_NAME=%s"+
+			"\nexport OS_PASSWORD=%s",
+		auth.AuthURL,
+		auth.UserName,
+		auth.ProjectName,
+		auth.ProjectDomainName,
+		auth.UserDomainName,
+		secret.Clouds.Default.Auth.Password)
 	return val
 }

pkg/keystone/cronjob.go

@@ -98,7 +98,7 @@ func CronJob(
 			},
 		},
 	}
-	if instance.Spec.NodeSelector != nil && len(instance.Spec.NodeSelector) > 0 {
+	if len(instance.Spec.NodeSelector) > 0 {
 		cronjob.Spec.JobTemplate.Spec.Template.Spec.NodeSelector = instance.Spec.NodeSelector
 	}
 

pkg/keystone/dbsync.go

@@ -89,7 +89,7 @@ func DbSyncJob(
 		},
 	}
 
-	if instance.Spec.NodeSelector != nil && len(instance.Spec.NodeSelector) > 0 {
+	if len(instance.Spec.NodeSelector) > 0 {
 		job.Spec.Template.Spec.NodeSelector = instance.Spec.NodeSelector
 	}
 

pkg/keystone/deployment.go

@@ -158,7 +158,7 @@ func Deployment(
 		},
 		corev1.LabelHostname,
 	)
-	if instance.Spec.NodeSelector != nil && len(instance.Spec.NodeSelector) > 0 {
+	if len(instance.Spec.NodeSelector) > 0 {
 		deployment.Spec.Template.Spec.NodeSelector = instance.Spec.NodeSelector
 	}
 

tests/functional/keystoneapi_controller_test.go

@@ -1188,7 +1188,7 @@ var _ = Describe("Keystone controller", func() {
 
 	mariadbSuite.RunBasicSuite()
 
-	mariadbSuite.RunURLAssertSuite(func(accountName types.NamespacedName, username string, password string) {
+	mariadbSuite.RunURLAssertSuite(func(_ types.NamespacedName, username string, password string) {
 		Eventually(func(g Gomega) {
 			scrt := th.GetSecret(keystoneAPIConfigDataName)
 			configData := string(scrt.Data["keystone.conf"])