From 2d52da0a15f0b7851506e1420a5114f138c74a08 Mon Sep 17 00:00:00 2001 From: kashitaka Date: Mon, 14 Jul 2025 21:32:32 +0900 Subject: [PATCH] fix staticcheck ST1005 issues (follow error msg rules) --- .golangci.yml | 1 - api/v1alpha1/mariadb_galera_types.go | 2 +- api/v1alpha1/mariadb_types.go | 16 ++++++++-------- cmd/controller/webhook.go | 2 +- cmd/init/main.go | 2 +- internal/controller/mariadb_controller_update.go | 2 +- .../controller/maxscale_controller_status.go | 2 +- .../controller/physicalbackup_controller_job.go | 2 +- internal/controller/restore_controller.go | 2 +- internal/controller/webhookconfig_controller.go | 12 ++++++------ internal/webhook/v1alpha1/mariadb_webhook.go | 2 +- pkg/builder/batch_builder.go | 10 +++++----- pkg/builder/certificate_builder.go | 2 +- pkg/builder/container_builder.go | 2 +- pkg/builder/persistentvolumeclaim_builder.go | 2 +- pkg/builder/service_builder.go | 6 +++--- pkg/command/backup.go | 4 ++-- pkg/controller/certificate/cert_manager.go | 6 +++--- pkg/controller/certificate/controller.go | 12 ++++++------ pkg/controller/endpoints/controller.go | 4 ++-- pkg/controller/galera/recovery.go | 8 ++++---- pkg/controller/galera/recovery_status.go | 2 +- pkg/controller/rbac/controller.go | 2 +- pkg/galera/agent/server/server.go | 2 +- pkg/kubernetes/auth/auth.go | 2 +- pkg/log/log.go | 6 +++--- pkg/pki/keypair.go | 2 +- pkg/pki/pem.go | 4 ++-- pkg/refresolver/refresolver.go | 2 +- 29 files changed, 61 insertions(+), 62 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index e16d5294..942701d9 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -28,7 +28,6 @@ linters: checks: - all - '-ST1003' # Poorly chosen identifier: https://staticcheck.dev/docs/checks/#ST1003 - - '-ST1005' # Incorrectly formatted error string: https://staticcheck.dev/docs/checks/#ST1005 exclusions: generated: lax presets: diff --git a/api/v1alpha1/mariadb_galera_types.go b/api/v1alpha1/mariadb_galera_types.go index 9ed91d07..1eda4c8d 100644 --- a/api/v1alpha1/mariadb_galera_types.go +++ b/api/v1alpha1/mariadb_galera_types.go @@ -235,7 +235,7 @@ func (r *GaleraAgent) Validate() error { kubernetesAuth := ptr.Deref(r.KubernetesAuth, KubernetesAuth{}) basicAuth := ptr.Deref(r.BasicAuth, BasicAuth{}) if kubernetesAuth.Enabled && basicAuth.Enabled { - return errors.New("Only one authentication method must be enabled: kubernetes or basic auth") + return errors.New("only one authentication method must be enabled: kubernetes or basic auth") } return nil } diff --git a/api/v1alpha1/mariadb_types.go b/api/v1alpha1/mariadb_types.go index de343a14..61f05462 100644 --- a/api/v1alpha1/mariadb_types.go +++ b/api/v1alpha1/mariadb_types.go @@ -97,20 +97,20 @@ type Storage struct { func (s *Storage) Validate(mdb *MariaDB) error { if s.Ephemeral != nil { if *s.Ephemeral && mdb.IsHAEnabled() { - return errors.New("Ephemeral storage is only compatible with non HA MariaDBs") + return errors.New("ephemeral storage is only compatible with non HA MariaDBs") } if *s.Ephemeral && (s.Size != nil || s.VolumeClaimTemplate != nil) { - return errors.New("Either ephemeral or regular storage must be provided") + return errors.New("either ephemeral or regular storage must be provided") } if *s.Ephemeral { return nil } } if s.Size != nil && s.Size.IsZero() { - return errors.New("Greater than zero storage size must be provided") + return errors.New("greater than zero storage size must be provided") } if s.Size == nil && s.VolumeClaimTemplate == nil { - return errors.New("Either storage size or volumeClaimTemplate must be provided") + return errors.New("either storage size or volumeClaimTemplate must be provided") } if s.Size != nil && s.VolumeClaimTemplate != nil { vctplSize, ok := s.VolumeClaimTemplate.Resources.Requests[corev1.ResourceStorage] @@ -118,7 +118,7 @@ func (s *Storage) Validate(mdb *MariaDB) error { return nil } if s.Size.Cmp(vctplSize) < 0 { - return errors.New("Storage size cannot be decreased") + return errors.New("storage size cannot be decreased") } } return nil @@ -322,7 +322,7 @@ func (b *BootstrapFrom) Validate() error { case "", BackupKind: if b.BackupContentType != "" && b.BackupContentType != BackupContentTypeLogical { return fmt.Errorf( - "inconsistent 'backupRef.kind'='%s' and 'backupContentType'='%s' fields. Logical type must be set in this case.", + "inconsistent 'backupRef.kind'='%s' and 'backupContentType'='%s' fields. Logical type must be set in this case", kind, b.BackupContentType, ) @@ -330,7 +330,7 @@ func (b *BootstrapFrom) Validate() error { case PhysicalBackupKind: if b.BackupContentType != "" && b.BackupContentType != BackupContentTypePhysical { return fmt.Errorf( - "inconsistent 'backupRef.kind'='%s' and 'backupContentType'='%s' fields. Physical type must be set in this case.", + "inconsistent 'backupRef.kind'='%s' and 'backupContentType'='%s' fields. Physical type must be set in this case", kind, b.BackupContentType, ) @@ -342,7 +342,7 @@ func (b *BootstrapFrom) Validate() error { if b.VolumeSnapshotRef != nil { if b.BackupContentType != "" && b.BackupContentType != BackupContentTypePhysical { - return errors.New("inconsistent 'volumeSnapshotRef' and 'backupContentType' fields. Physical type must be set in this case.") + return errors.New("inconsistent 'volumeSnapshotRef' and 'backupContentType' fields. Physical type must be set in this case") } if b.S3 != nil || b.Volume != nil || b.RestoreJob != nil { return errors.New("'s3', 'volume' and 'restoreJob' may not be set when 'volumeSnapshotRef' is set") diff --git a/cmd/controller/webhook.go b/cmd/controller/webhook.go index afff9711..6ccfddf3 100644 --- a/cmd/controller/webhook.go +++ b/cmd/controller/webhook.go @@ -157,7 +157,7 @@ func checkCerts(dnsName string, at time.Time) error { } valid, err := pki.ValidateCert(caCert, certKeyPair, dnsName, at) if !valid || err != nil { - err := fmt.Errorf("Certificate is not valid for %s", dnsName) + err := fmt.Errorf("Certificate is not valid for %s", dnsName) //nolint:staticcheck setupLog.V(1).Info("Error validating certificate", "error", err) return err } diff --git a/cmd/init/main.go b/cmd/init/main.go index 77569c8d..d4a92c47 100644 --- a/cmd/init/main.go +++ b/cmd/init/main.go @@ -248,7 +248,7 @@ func cleanupPreviousSST(fm *filemanager.FileManager) error { func getPreviousPodName(mdb *mariadbv1alpha1.MariaDB, podIndex int) (string, error) { if podIndex == 0 { - return "", fmt.Errorf("Pod '%s' is the first Pod", statefulset.PodName(mdb.ObjectMeta, podIndex)) + return "", fmt.Errorf("Pod '%s' is the first Pod", statefulset.PodName(mdb.ObjectMeta, podIndex)) //nolint:staticcheck } previousPodIndex := podIndex - 1 return statefulset.PodName(mdb.ObjectMeta, previousPodIndex), nil diff --git a/internal/controller/mariadb_controller_update.go b/internal/controller/mariadb_controller_update.go index def5d72e..c267ab5b 100644 --- a/internal/controller/mariadb_controller_update.go +++ b/internal/controller/mariadb_controller_update.go @@ -234,7 +234,7 @@ func (r *MariaDBReconciler) pollUntilPodUpdated(ctx context.Context, mariadbKey, if podpkg.PodUpdated(&pod, updateRevision) { return nil } - return errors.New("Pod stale") + return errors.New("Pod stale") //nolint:staticcheck }) } diff --git a/internal/controller/maxscale_controller_status.go b/internal/controller/maxscale_controller_status.go index e33f578d..f3cdb5a9 100644 --- a/internal/controller/maxscale_controller_status.go +++ b/internal/controller/maxscale_controller_status.go @@ -310,7 +310,7 @@ func (r *MaxScaleReconciler) getSqlClient(ctx context.Context, mxs *mariadbv1alp return nil, errors.New("config sync must be enabled") } if mxs.Spec.Auth.SyncUsername == nil || mxs.Spec.Auth.SyncPasswordSecretKeyRef == nil { - return nil, errors.New("Config sync credentials must be set") + return nil, errors.New("config sync credentials must be set") } serverIdx := mxs.ServerIndex() diff --git a/internal/controller/physicalbackup_controller_job.go b/internal/controller/physicalbackup_controller_job.go index 2d6839b5..fb627bd8 100644 --- a/internal/controller/physicalbackup_controller_job.go +++ b/internal/controller/physicalbackup_controller_job.go @@ -341,7 +341,7 @@ func (r *PhysicalBackupReconciler) deleteJobSync(ctx context.Context, job *batch if err := r.Get(ctx, key, &j); apierrors.IsNotFound(err) { return nil } - return errors.New("Job still exists") + return errors.New("Job still exists") //nolint:staticcheck }) } diff --git a/internal/controller/restore_controller.go b/internal/controller/restore_controller.go index 3d3a0305..006b5abe 100644 --- a/internal/controller/restore_controller.go +++ b/internal/controller/restore_controller.go @@ -138,7 +138,7 @@ func (r *RestoreReconciler) setDefaults(ctx context.Context, restore *mariadbv1a if !backup.IsComplete() { var errBundle *multierror.Error - errBundle = multierror.Append(errBundle, errors.New("Backup not complete")) + errBundle = multierror.Append(errBundle, errors.New("Backup not complete")) //nolint:staticcheck err := r.patchStatus(ctx, restore, r.ConditionComplete.PatcherFailed("Backup not complete")) errBundle = multierror.Append(errBundle, err) diff --git a/internal/controller/webhookconfig_controller.go b/internal/controller/webhookconfig_controller.go index c1b5e384..2f92b88f 100644 --- a/internal/controller/webhookconfig_controller.go +++ b/internal/controller/webhookconfig_controller.go @@ -80,15 +80,15 @@ func NewWebhookConfigReconciler(client client.Client, scheme *runtime.Scheme, re func (r *WebhookConfigReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { certResult, err := r.certReconciler.Reconcile(ctx, r.certOpts...) if err != nil { - return ctrl.Result{}, fmt.Errorf("Error reconciling webhook certificate: %v", err) + return ctrl.Result{}, fmt.Errorf("error reconciling webhook certificate: %v", err) } if err := r.reconcileValidatingWebhook(ctx, req.NamespacedName, certResult); err != nil { - return ctrl.Result{}, fmt.Errorf("Error reconciling ValidatingWebhookConfiguration: %v", err) + return ctrl.Result{}, fmt.Errorf("error reconciling ValidatingWebhookConfiguration: %v", err) } if err := r.reconcileMutatingWebhook(ctx, req.NamespacedName, certResult); err != nil { - return ctrl.Result{}, fmt.Errorf("Error reconciling MutatingWebhookConfiguration: %v", err) + return ctrl.Result{}, fmt.Errorf("error reconciling MutatingWebhookConfiguration: %v", err) } r.readyMux.Lock() @@ -130,18 +130,18 @@ func (r *WebhookConfigReconciler) ReadyHandler(logger logr.Logger) func(_ *http. r.readyMux.Lock() defer r.readyMux.Unlock() if !r.ready { - err := errors.New("Webhook not ready") + err := errors.New("webhook not ready") logger.Error(err, "Readiness probe failed") return err } healthy, err := health.IsServiceHealthy(context.Background(), r.Client, r.serviceKey) if err != nil { - err := fmt.Errorf("Service not ready: %s", err) + err := fmt.Errorf("service not ready: %s", err) logger.Error(err, "Readiness probe failed") return err } if !healthy { - err := errors.New("Service not ready") + err := errors.New("service not ready") logger.Error(err, "Readiness probe failed") return err } diff --git a/internal/webhook/v1alpha1/mariadb_webhook.go b/internal/webhook/v1alpha1/mariadb_webhook.go index cad76a09..b6e9996b 100644 --- a/internal/webhook/v1alpha1/mariadb_webhook.go +++ b/internal/webhook/v1alpha1/mariadb_webhook.go @@ -132,7 +132,7 @@ func (v *MariaDBCustomValidator) ValidateDelete(ctx context.Context, obj runtime func validateHA(mariadb *v1alpha1.MariaDB) error { if mariadb.Replication().Enabled && mariadb.IsGaleraEnabled() { - return errors.New("You may only enable one HA method at a time, either 'spec.replication' or 'spec.galera'") + return errors.New("you may only enable one HA method at a time, either 'spec.replication' or 'spec.galera'") } if !mariadb.IsHAEnabled() && mariadb.Spec.Replicas > 1 { return field.Invalid( diff --git a/pkg/builder/batch_builder.go b/pkg/builder/batch_builder.go index cf8df014..f2e40d70 100644 --- a/pkg/builder/batch_builder.go +++ b/pkg/builder/batch_builder.go @@ -149,7 +149,7 @@ func (b *Builder) BuildPhysicalBackupJob(key types.NamespacedName, backup *maria return nil, fmt.Errorf("error getting index for Pod '%s': %v", pod.Name, err) } if pod.Spec.NodeName == "" { - return nil, errors.New("Pod must be scheduled: spec.nodeName is empty") + return nil, errors.New("Pod must be scheduled: spec.nodeName is empty") //nolint:staticcheck } jobMeta := @@ -504,7 +504,7 @@ func (b *Builder) BuildPhysicalBackupRestoreJob(key types.NamespacedName, mariad func (b *Builder) BuildGaleraInitJob(key types.NamespacedName, mariadb *mariadbv1alpha1.MariaDB) (*batchv1.Job, error) { galera := ptr.Deref(mariadb.Spec.Galera, mariadbv1alpha1.Galera{}) if !galera.Enabled { - return nil, errors.New("Galera must be enabled") + return nil, errors.New("Galera must be enabled") //nolint:staticcheck } initJob := ptr.Deref(galera.InitJob, mariadbv1alpha1.GaleraInitJob{}) extraMeta := ptr.Deref(initJob.Metadata, mariadbv1alpha1.Metadata{}) @@ -582,11 +582,11 @@ func (b *Builder) BuildGaleraRecoveryJob(key types.NamespacedName, mariadb *mari pod *corev1.Pod) (*batchv1.Job, error) { galera := ptr.Deref(mariadb.Spec.Galera, mariadbv1alpha1.Galera{}) if !galera.Enabled { - return nil, errors.New("Galera must be enabled") + return nil, errors.New("Galera must be enabled") //nolint:staticcheck } recovery := ptr.Deref(galera.Recovery, mariadbv1alpha1.GaleraRecovery{}) if !recovery.Enabled { - return nil, errors.New("Galera recovery must be enabled") + return nil, errors.New("Galera recovery must be enabled") //nolint:staticcheck } podIndex, err := statefulset.PodIndex(pod.Name) @@ -594,7 +594,7 @@ func (b *Builder) BuildGaleraRecoveryJob(key types.NamespacedName, mariadb *mari return nil, fmt.Errorf("error getting index for Pod '%s': %v", pod.Name, err) } if pod.Spec.NodeName == "" { - return nil, errors.New("Pod must be scheduled: spec.nodeName is empty") + return nil, errors.New("Pod must be scheduled: spec.nodeName is empty") //nolint:staticcheck } recoveryJob := ptr.Deref(recovery.Job, mariadbv1alpha1.GaleraRecoveryJob{}) diff --git a/pkg/builder/certificate_builder.go b/pkg/builder/certificate_builder.go index 76d3bbf7..e1202a5c 100644 --- a/pkg/builder/certificate_builder.go +++ b/pkg/builder/certificate_builder.go @@ -83,7 +83,7 @@ func (b *Builder) BuildCertificate(certOpts ...CertOpt) (*certmanagerv1.Certific } if opts.Key == nil || opts.Owner == nil || len(opts.DNSNames) == 0 || opts.Lifetime == nil || opts.RenewBeforePercentage == nil || opts.IssuerRef == nil { - return nil, errors.New("Key, Owner, DNSNames, Lifetime, RenewBeforePercentage and IssuerRef must be set") + return nil, errors.New("options Key, Owner, DNSNames, Lifetime, RenewBeforePercentage and IssuerRef must be set") } renewBefore, err := pki.RenewalDuration(*opts.Lifetime, *opts.RenewBeforePercentage) diff --git a/pkg/builder/container_builder.go b/pkg/builder/container_builder.go index 0c8b70a2..a4326a1e 100644 --- a/pkg/builder/container_builder.go +++ b/pkg/builder/container_builder.go @@ -249,7 +249,7 @@ func (b *Builder) mariadbInitContainers(mariadb *mariadbv1alpha1.MariaDB, opts . func (b *Builder) galeraInitContainer(mariadb *mariadbv1alpha1.MariaDB) (*corev1.Container, error) { galera := ptr.Deref(mariadb.Spec.Galera, mariadbv1alpha1.Galera{}) if !galera.Enabled { - return nil, errors.New("Galera is not enabled") + return nil, errors.New("Galera is not enabled") //nolint:staticcheck } init := galera.InitContainer container, err := b.buildContainerWithTemplate(init.Image, init.ImagePullPolicy, &init.ContainerTemplate) diff --git a/pkg/builder/persistentvolumeclaim_builder.go b/pkg/builder/persistentvolumeclaim_builder.go index 5fc71ba2..1fca37f9 100644 --- a/pkg/builder/persistentvolumeclaim_builder.go +++ b/pkg/builder/persistentvolumeclaim_builder.go @@ -67,7 +67,7 @@ func WithVolumeSnapshotDataSource(snapshotName string) PVCOption { func (b *Builder) BuildStoragePVC(key types.NamespacedName, tpl *mariadbv1alpha1.VolumeClaimTemplate, mariadb *mariadbv1alpha1.MariaDB, opts ...PVCOption) (*corev1.PersistentVolumeClaim, error) { if tpl == nil { - return nil, errors.New("Template must not be nil") + return nil, errors.New("template must not be nil") } labels := labels.NewLabelsBuilder(). WithMariaDBSelectorLabels(mariadb). diff --git a/pkg/builder/service_builder.go b/pkg/builder/service_builder.go index 6c5c63fc..0fab8abf 100644 --- a/pkg/builder/service_builder.go +++ b/pkg/builder/service_builder.go @@ -18,7 +18,7 @@ func MariaDBPort(svc *corev1.Service) (*corev1.ServicePort, error) { return &p, nil } } - return nil, fmt.Errorf("Service port not found") + return nil, fmt.Errorf("service port not found") } func ValidateServicePorts(ports []corev1.ServicePort) error { @@ -26,11 +26,11 @@ func ValidateServicePorts(ports []corev1.ServicePort) error { portMap := make(map[int32]bool, len(ports)) for _, p := range ports { if nameMap[p.Name] { - return fmt.Errorf("Port name %s is already taken by another port", p.Name) + return fmt.Errorf("port name %s is already taken by another port", p.Name) } nameMap[p.Name] = true if portMap[p.Port] { - return fmt.Errorf("Port number %d is already taken by another port", p.Port) + return fmt.Errorf("port number %d is already taken by another port", p.Port) } portMap[p.Port] = true } diff --git a/pkg/command/backup.go b/pkg/command/backup.go index 97c1c131..951e031f 100644 --- a/pkg/command/backup.go +++ b/pkg/command/backup.go @@ -196,7 +196,7 @@ func (b *BackupCommand) MariadbDump(backup *mariadbv1alpha1.Backup, func (b *BackupCommand) MariadbBackup(mariadb *mariadbv1alpha1.MariaDB, backupFilePath string) (*Command, error) { if b.Database != nil { - return nil, errors.New("Database option not supported in physical backups") + return nil, errors.New("database option not supported in physical backups") } connFlags, err := ConnectionFlags(&b.CommandOpts, mariadb) @@ -317,7 +317,7 @@ func (b *BackupCommand) MariadbRestore(restore *mariadbv1alpha1.Restore, mariadb func (b *BackupCommand) MariadbBackupRestore(mariadb *mariadbv1alpha1.MariaDB, backupDirPath string) (*Command, error) { if b.Database != nil { - return nil, errors.New("Database option not supported in physical backups") + return nil, errors.New("database option not supported in physical backups") } // The ext4 filesystem creates a lost+found directory by default, which causes mariadb-backup to fail with: diff --git a/pkg/controller/certificate/cert_manager.go b/pkg/controller/certificate/cert_manager.go index 27df22c1..40b8f84a 100644 --- a/pkg/controller/certificate/cert_manager.go +++ b/pkg/controller/certificate/cert_manager.go @@ -30,7 +30,7 @@ func (r *CertReconciler) reconcileCertManagerCert(ctx context.Context, opts *Cer if !certExists { r.recorder.Event(opts.relatedObject, corev1.EventTypeWarning, mariadbv1alpha1.ReasonCRDNotFound, "Unable to reconcile certificate: Certificate CRD not installed in the cluster") - logger.Error(errors.New("Certificate CRD not installed in the cluster"), "Unable to reconcile certificate") + logger.Error(errors.New("Certificate CRD not installed in the cluster"), "Unable to reconcile Certificate") //nolint:staticcheck return ctrl.Result{RequeueAfter: 10 * time.Second}, nil } @@ -101,10 +101,10 @@ func (r *CertReconciler) certManagerCertReady(ctx context.Context, opts *CertRec if condition.Status == cmmeta.ConditionTrue { return nil } else { - return fmt.Errorf("Certificate '%s' not ready: %s", opts.certSecretKey.Name, condition.Message) + return fmt.Errorf("Certificate '%s' not ready: %s", opts.certSecretKey.Name, condition.Message) //nolint:staticcheck } } - return fmt.Errorf("Certificate '%s' not ready", opts.certSecretKey.Name) + return fmt.Errorf("Certificate '%s' not ready", opts.certSecretKey.Name) //nolint:staticcheck } func certManagerKeyUsages(opts *CertReconcilerOpts, logger logr.Logger) []certmanagerv1.KeyUsage { diff --git a/pkg/controller/certificate/controller.go b/pkg/controller/certificate/controller.go index 6a29072c..d87ad24a 100644 --- a/pkg/controller/certificate/controller.go +++ b/pkg/controller/certificate/controller.go @@ -107,7 +107,7 @@ func (r *CertReconciler) reconcileCA(ctx context.Context, opts *CertReconcilerOp createCA := r.createCAFn(opts) caKeyPair, err := r.reconcileKeyPair(ctx, opts.caSecretKey, opts.caSecretType, false, opts, createCA) if err != nil { - return nil, fmt.Errorf("Error reconciling CA keypair: %v", err) + return nil, fmt.Errorf("error reconciling CA keypair: %v", err) } caLeafCert, err := caKeyPair.LeafCertificate() @@ -136,7 +136,7 @@ func (r *CertReconciler) reconcileCA(ctx context.Context, opts *CertReconcilerOp caKeyPair, err = r.reconcileKeyPair(ctx, opts.caSecretKey, opts.caSecretType, true, opts, createCA) if err != nil { - return nil, fmt.Errorf("Error reconciling CA keypair: %v", err) + return nil, fmt.Errorf("error reconciling CA keypair: %v", err) } } return caKeyPair, nil @@ -154,12 +154,12 @@ func (r *CertReconciler) reconcileCert(ctx context.Context, caKeyPair *pki.KeyPa createCert := r.createCertFn(caKeyPair, opts) certKeyPair, err := r.reconcileKeyPair(ctx, opts.certSecretKey, SecretTypeTLS, false, opts, createCert) if err != nil { - return ctrl.Result{}, nil, fmt.Errorf("Error reconciling certificate keypair: %v", err) + return ctrl.Result{}, nil, fmt.Errorf("error reconciling certificate keypair: %v", err) } caCerts, err := r.getCABundle(ctx, caKeyPair, opts, logger) if err != nil { - return ctrl.Result{}, nil, fmt.Errorf("Error getting CA bundle: %v", err) + return ctrl.Result{}, nil, fmt.Errorf("error getting CA bundle: %v", err) } leafCert, err := certKeyPair.LeafCertificate() if err != nil { @@ -340,7 +340,7 @@ func (r *CertReconciler) createSecret(ctx context.Context, key types.NamespacedN } if err := r.Create(ctx, secret); err != nil { - return fmt.Errorf("Error creating TLS Secret: %v", err) + return fmt.Errorf("error creating TLS Secret: %v", err) } return nil } @@ -360,7 +360,7 @@ func (r *CertReconciler) patchSecret(ctx context.Context, secretType SecretType, } if err := r.Patch(ctx, secret, patch); err != nil { - return fmt.Errorf("Error patching TLS Secret: %v", err) + return fmt.Errorf("error patching TLS Secret: %v", err) } return nil } diff --git a/pkg/controller/endpoints/controller.go b/pkg/controller/endpoints/controller.go index ae70db73..5b1bed6b 100644 --- a/pkg/controller/endpoints/controller.go +++ b/pkg/controller/endpoints/controller.go @@ -148,7 +148,7 @@ func (r *EndpointsReconciler) endpointSlice(ctx context.Context, key types.Names func buildEndpoint(pod *corev1.Pod) (*discoveryv1.Endpoint, error) { if pod.Status.PodIP == "" || pod.Spec.NodeName == "" { - return nil, errors.New("Pod IP and Nodename must be set") + return nil, errors.New("Pod IP and NodeName must be set") //nolint:staticcheck } return &discoveryv1.Endpoint{ Addresses: []string{pod.Status.PodIP}, @@ -167,7 +167,7 @@ func buildEndpoint(pod *corev1.Pod) (*discoveryv1.Endpoint, error) { func getAddressType(pod *corev1.Pod) (*discoveryv1.AddressType, error) { if pod.Status.PodIP == "" { - return nil, errors.New("Pod IP and Nodename must be set") + return nil, errors.New("Pod IP and NodeName must be set") //nolint:staticcheck } parsedIp := net.ParseIP(pod.Status.PodIP) if parsedIp == nil { diff --git a/pkg/controller/galera/recovery.go b/pkg/controller/galera/recovery.go index 67cd024d..f23eb00b 100644 --- a/pkg/controller/galera/recovery.go +++ b/pkg/controller/galera/recovery.go @@ -153,7 +153,7 @@ func (r *GaleraReconciler) restartPods(ctx context.Context, mariadb *mariadbv1al return fmt.Errorf("error getting source to forcefully bootstrap: %v", err) } if src.pod == "" { - return errors.New("Unable to restart Pods. Cluster hasn't been bootstrapped") + return errors.New("unable to restart Pods. Cluster hasn't been bootstrapped") } mariadbKey := ctrlclient.ObjectKeyFromObject(mariadb) @@ -537,7 +537,7 @@ func (r *GaleraReconciler) pollUntilPodHealthy(ctx context.Context, mariadbKey, return fmt.Errorf("error getting Pod '%s': %v", podKey.Name, err) } if pod.Status.Phase != corev1.PodRunning { - return errors.New("Pod not running") + return errors.New("Pod not running") //nolint:staticcheck } healthy, err := client.Galera.Health(ctx) @@ -545,7 +545,7 @@ func (r *GaleraReconciler) pollUntilPodHealthy(ctx context.Context, mariadbKey, return fmt.Errorf("error getting Galera health: %v", err) } if !healthy { - return errors.New("Galera not healthy") + return errors.New("Galera not healthy") //nolint:staticcheck } return nil }) @@ -586,7 +586,7 @@ func (r *GaleraReconciler) pollUntilPodSynced(ctx context.Context, mariadbKey, p return fmt.Errorf("error checking Pod sync: %v", err) } if !synced { - return errors.New("Pod not synced") + return errors.New("Pod not synced") //nolint:staticcheck } return nil }) diff --git a/pkg/controller/galera/recovery_status.go b/pkg/controller/galera/recovery_status.go index 168e8375..0169e2e8 100644 --- a/pkg/controller/galera/recovery_status.go +++ b/pkg/controller/galera/recovery_status.go @@ -192,7 +192,7 @@ func (rs *recoveryStatus) bootstrapSource(mdb *mariadbv1alpha1.MariaDB, forceBoo pod: *pod, }, nil } - return nil, fmt.Errorf("Pod '%s' used to forcefully bootstrap not found", *forceBootstrapInPod) + return nil, fmt.Errorf("Pod '%s' used to forcefully bootstrap not found", *forceBootstrapInPod) //nolint:staticcheck } if !rs.isComplete(mdb, logger) { diff --git a/pkg/controller/rbac/controller.go b/pkg/controller/rbac/controller.go index cd93d9e8..10fccc5a 100644 --- a/pkg/controller/rbac/controller.go +++ b/pkg/controller/rbac/controller.go @@ -163,7 +163,7 @@ func (r *RBACReconciler) reconcileClusterRoleBinding(ctx context.Context, key ty if err == nil { if !isOwnedBy(mariadb, &existingCRB) { return fmt.Errorf( - "ClusterRoleBinding '%s' already exists. Specify a different one via 'spec.galera.agent.kubernetesAuth.authDelegatorRoleName'.", + "ClusterRoleBinding '%s' already exists. Specify a different one via 'spec.galera.agent.kubernetesAuth.authDelegatorRoleName'", existingCRB.Name, ) } diff --git a/pkg/galera/agent/server/server.go b/pkg/galera/agent/server/server.go index 0775a55a..1a6c7a5d 100644 --- a/pkg/galera/agent/server/server.go +++ b/pkg/galera/agent/server/server.go @@ -99,7 +99,7 @@ func (s *Server) Start(ctx context.Context) error { }() go func() { if err := s.listen(); err != nil { - errChan <- fmt.Errorf("Error starting server: %v", err) + errChan <- fmt.Errorf("error starting server: %v", err) } }() diff --git a/pkg/kubernetes/auth/auth.go b/pkg/kubernetes/auth/auth.go index 0aaa23f1..d23d923a 100644 --- a/pkg/kubernetes/auth/auth.go +++ b/pkg/kubernetes/auth/auth.go @@ -78,7 +78,7 @@ func (a *KubernetesAuth) Handler(next http.Handler) http.Handler { func authToken(r *http.Request) (string, error) { auth := r.Header.Get("Authorization") if auth == "" { - return "", errors.New("Authorization header not found") + return "", errors.New("Authorization header not found") //nolint:staticcheck } parts := strings.Split(auth, "Bearer ") if len(parts) != 2 { diff --git a/pkg/log/log.go b/pkg/log/log.go index aa421e6e..2035a4ba 100644 --- a/pkg/log/log.go +++ b/pkg/log/log.go @@ -40,15 +40,15 @@ func SetupLogger(level, timeEncoder string, development bool) { func SetupLoggerWithCommand(cmd *cobra.Command) error { logLevel, err := cmd.Flags().GetString("log-level") if err != nil { - return fmt.Errorf("error getting 'log-level' flag: %v\n", err) + return fmt.Errorf("error getting 'log-level' flag: %v", err) } logTimeEncoder, err := cmd.Flags().GetString("log-time-encoder") if err != nil { - return fmt.Errorf("error getting 'log-time-encoder' flag: %v\n", err) + return fmt.Errorf("error getting 'log-time-encoder' flag: %v", err) } logDev, err := cmd.Flags().GetBool("log-dev") if err != nil { - return fmt.Errorf("error getting 'log-dev' flag: %v\n", err) + return fmt.Errorf("error getting 'log-dev' flag: %v", err) } SetupLogger(logLevel, logTimeEncoder, logDev) return nil diff --git a/pkg/pki/keypair.go b/pkg/pki/keypair.go index 88dd21b6..8a08c865 100644 --- a/pkg/pki/keypair.go +++ b/pkg/pki/keypair.go @@ -23,7 +23,7 @@ var ( ) // ErrSecretKeyNotFound is returned when a CA/TLS key is not found in a Secret- -var ErrSecretKeyNotFound = errors.New("Secret key not found") +var ErrSecretKeyNotFound = errors.New("secret key not found") // KeyPairOpt is a function type used to configure a KeyPair. type KeyPairOpt func(*KeyPair) diff --git a/pkg/pki/pem.go b/pkg/pki/pem.go index 01eaf8a1..0239bea5 100644 --- a/pkg/pki/pem.go +++ b/pkg/pki/pem.go @@ -63,7 +63,7 @@ func BundleCertificatePEMs(pems [][]byte, bundleOpts ...BundleOption) ([]byte, e } } if bundle == nil { - return nil, errors.New("No certificate PEMs were found") + return nil, errors.New("no certificate PEMs were found") } return bundle, nil } @@ -73,7 +73,7 @@ func appendPEM(bundle []byte, pemBytes []byte, existingCerts map[string]struct{} for len(pemBytes) > 0 { block, pemBytes = pem.Decode(pemBytes) if block == nil { - opts.logger.Error(errors.New("Invalid PEM block"), "Error decoding PEM block. Ignoring...") + opts.logger.Error(errors.New("invalid PEM block"), "Error decoding PEM block. Ignoring...") break } if block.Type != string(pemBlockCertificate) { diff --git a/pkg/refresolver/refresolver.go b/pkg/refresolver/refresolver.go index 0114bd6f..de9c7eb0 100644 --- a/pkg/refresolver/refresolver.go +++ b/pkg/refresolver/refresolver.go @@ -134,7 +134,7 @@ func (r *RefResolver) SecretKeyRef(ctx context.Context, selector mariadbv1alpha1 data, ok := secret.Data[selector.Key] if !ok { - return "", fmt.Errorf("Secret key \"%s\" not found", selector.Key) + return "", fmt.Errorf("secret key \"%s\" not found", selector.Key) } return string(data), nil }