Address issues highlighted by golangci-lint v2

Signed-off-by: Stephen Finucane <[email protected]>

Author: stephenfin

.golangci.yml

@@ -172,16 +172,6 @@ linters:
       - linters:
           - staticcheck
         text: 'SA1019: "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions" is deprecated: This package is deprecated and is going to be removed when support for v1beta1 will be dropped. Please see https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20240916-improve-status-in-CAPI-resources.md for more details.'
-      # TODO(stephenfin): Remove all of these iteratively
-      - linters:
-          - staticcheck
-        text: "ST1005: error strings should not be capitalized"
-      - linters:
-          - staticcheck
-        text: "QF1003: could use tagged switch on .*"
-      - linters:
-          - staticcheck
-        text: "QF1008: could remove embedded field \".*\" from selector"
     paths:
       - zz_generated.*\.go$
       - third_party$

controllers/openstackfloatingippool_controller.go

@@ -91,7 +91,7 @@ func (r *OpenStackFloatingIPPoolReconciler) Reconcile(ctx context.Context, req c
 		return ctrl.Result{}, err
 	}
 
-	if pool.ObjectMeta.DeletionTimestamp.IsZero() {
+	if pool.DeletionTimestamp.IsZero() {
 		// Add finalizer if it does not exist
 		if controllerutil.AddFinalizer(pool, infrav1alpha1.OpenStackFloatingIPPoolFinalizer) {
 			return ctrl.Result{}, r.Client.Update(ctx, pool)
@@ -125,7 +125,7 @@ func (r *OpenStackFloatingIPPoolReconciler) Reconcile(ctx context.Context, req c
 
 	for _, claim := range claims.Items {
 		log := log.WithValues("claim", claim.Name)
-		if !claim.ObjectMeta.DeletionTimestamp.IsZero() {
+		if !claim.DeletionTimestamp.IsZero() {
 			continue
 		}
 
@@ -281,7 +281,7 @@ func (r *OpenStackFloatingIPPoolReconciler) reconcileIPAddresses(ctx context.Con
 
 	for i := 0; i < len(ipAddresses.Items); i++ {
 		ipAddress := &(ipAddresses.Items[i])
-		if ipAddress.ObjectMeta.DeletionTimestamp.IsZero() {
+		if ipAddress.DeletionTimestamp.IsZero() {
 			pool.Status.ClaimedIPs = append(pool.Status.ClaimedIPs, ipAddress.Spec.Address)
 			continue
 		}

controllers/openstackmachine_controller.go

@@ -380,7 +380,7 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, scope
 
 	if instanceStatus == nil {
 		v1beta1conditions.MarkFalse(openStackMachine, infrav1.InstanceReadyCondition, infrav1.InstanceDeletedReason, clusterv1beta1.ConditionSeverityError, infrav1.ServerUnexpectedDeletedMessage)
-		openStackMachine.SetFailure(capoerrors.DeprecatedCAPIUpdateMachineError, errors.New(infrav1.ServerUnexpectedDeletedMessage)) //nolint:stylecheck // This error is not used as an error
+		openStackMachine.SetFailure(capoerrors.DeprecatedCAPIUpdateMachineError, errors.New(infrav1.ServerUnexpectedDeletedMessage)) //nolint:staticcheck // This error is not used as an error
 		return ctrl.Result{}, nil
 	}
 
@@ -714,7 +714,7 @@ func (r *OpenStackMachineReconciler) OpenStackClusterToOpenStackMachines(ctx con
 		log := log.WithValues("objectMapper", "openStackClusterToOpenStackMachine", "namespace", c.Namespace, "openStackCluster", c.Name)
 
 		// Don't handle deleted OpenStackClusters
-		if !c.ObjectMeta.DeletionTimestamp.IsZero() {
+		if !c.DeletionTimestamp.IsZero() {
 			log.V(4).Info("OpenStackClusters has a deletion timestamp, skipping mapping.")
 			return nil
 		}
@@ -744,7 +744,7 @@ func (r *OpenStackMachineReconciler) requeueOpenStackMachinesForUnpausedCluster(
 		log := log.WithValues("objectMapper", "clusterToOpenStackMachine", "namespace", c.Namespace, "cluster", c.Name)
 
 		// Don't handle deleted clusters
-		if !c.ObjectMeta.DeletionTimestamp.IsZero() {
+		if !c.DeletionTimestamp.IsZero() {
 			log.V(4).Info("Cluster has a deletion timestamp, skipping mapping.")
 			return nil
 		}

controllers/openstackserver_controller.go

@@ -132,7 +132,7 @@ func (r *OpenStackServerReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 		}
 	}()
 
-	if !openStackServer.ObjectMeta.DeletionTimestamp.IsZero() {
+	if !openStackServer.DeletionTimestamp.IsZero() {
 		// When moving a cluster, we need to populate the server status with the resources
 		// that were in another object's status.
 		// This is because the status is not persisted across CAPI resources moves.
@@ -626,8 +626,8 @@ func (r *OpenStackServerReconciler) getOrCreateIPAddressClaimForFloatingAddress(
 
 	// If the OpenStackServer has a ClusterNameLabel, set it on the IPAddressClaim as well.
 	// This is useful for garbage collection of IPAddressClaims when a Cluster is deleted.
-	if openStackServer.ObjectMeta.Labels[clusterv1.ClusterNameLabel] != "" {
-		claim.ObjectMeta.Labels[clusterv1.ClusterNameLabel] = openStackServer.ObjectMeta.Labels[clusterv1.ClusterNameLabel]
+	if openStackServer.Labels[clusterv1.ClusterNameLabel] != "" {
+		claim.Labels[clusterv1.ClusterNameLabel] = openStackServer.Labels[clusterv1.ClusterNameLabel]
 	}
 
 	if err := r.Client.Create(ctx, claim); err != nil {

pkg/cloud/services/compute/instance.go

@@ -311,19 +311,20 @@ func (s *Service) getBlockDevices(eventObject runtime.Object, instanceSpec *Inst
 			return nil, fmt.Errorf("block device name 'root' is reserved")
 		}
 
-		if blockDeviceSpec.Storage.Type == infrav1.VolumeBlockDevice {
+		switch blockDeviceSpec.Storage.Type {
+		case infrav1.VolumeBlockDevice:
 			blockDevice, err := s.getOrCreateVolumeBuilder(eventObject, instanceSpec, &blockDeviceSpec, "", fmt.Sprintf("Additional block device for %s", instanceSpec.Name))
 			if err != nil {
 				return nil, err
 			}
 			bdUUID = blockDevice.ID
 			sourceType = servers.SourceVolume
 			destinationType = servers.DestinationVolume
-		} else if blockDeviceSpec.Storage.Type == infrav1.LocalBlockDevice {
+		case infrav1.LocalBlockDevice:
 			sourceType = servers.SourceBlank
 			destinationType = servers.DestinationLocal
 			localDiskSizeGiB = blockDeviceSpec.SizeGiB
-		} else {
+		default:
 			return nil, fmt.Errorf("invalid block device type %s", blockDeviceSpec.Storage.Type)
 		}
 

pkg/cloud/services/compute/referenced_resources.go

@@ -52,8 +52,8 @@ func ResolveServerSpec(ctx context.Context, scope *scope.WithLogger, k8sClient c
 
 	// If the server is bound to a cluster, we use the cluster name to generate the port description.
 	var clusterName string
-	if openStackServer.ObjectMeta.Labels[clusterv1.ClusterNameLabel] != "" {
-		clusterName = openStackServer.ObjectMeta.Labels[clusterv1.ClusterNameLabel]
+	if openStackServer.Labels[clusterv1.ClusterNameLabel] != "" {
+		clusterName = openStackServer.Labels[clusterv1.ClusterNameLabel]
 	}
 
 	computeService, err := NewService(scope)

test/e2e/shared/common.go

@@ -187,7 +187,7 @@ type OpenStackLogCollector struct {
 
 // CollectMachineLog gets logs for the OpenStack resources related to the given machine.
 func (o OpenStackLogCollector) CollectMachineLog(ctx context.Context, managementClusterClient client.Client, m *clusterv1.Machine, outputPath string) error {
-	Logf("Collecting logs for machine %q and storing them in %q", m.ObjectMeta.Name, outputPath)
+	Logf("Collecting logs for machine %q and storing them in %q", m.Name, outputPath)
 
 	if err := os.MkdirAll(outputPath, 0o750); err != nil {
 		return fmt.Errorf("couldn't create directory %q for logs: %s", outputPath, err)