Merge pull request #496 from Nordix/add-nakedret

🌱 Enable nakedret linter for golangcilint

Author: metal3-io-bot

.golangci.yaml

@@ -43,7 +43,7 @@ linters:
   - mirror
   - misspell
   #- mnd
-  #- nakedret
+  - nakedret
   - nilerr
   - nilnesserr
   - nilnil

internal/controller/ironic_controller.go

@@ -113,7 +113,7 @@ func (r *IronicReconciler) handleIronic(cctx ironic.ControllerContext, ironicCon
 	if ironicConf.DeletionTimestamp.IsZero() {
 		requeue, err = ensureFinalizer(cctx, ironicConf)
 		if requeue || err != nil {
-			return
+			return requeue, err
 		}
 	} else {
 		return r.cleanUp(cctx, ironicConf)
@@ -149,36 +149,36 @@ func (r *IronicReconciler) handleIronic(cctx ironic.ControllerContext, ironicCon
 		ironicConf.Status.RequestedVersion = actuallyRequestedVersion
 		err = r.setNotReady(cctx, ironicConf, metal3api.IronicReasonInProgress, "new version requested")
 		if err != nil {
-			return
+			return requeue, err
 		}
 	}
 
 	apiSecret, requeue, err := r.ensureAPISecret(cctx, ironicConf)
 	if requeue || err != nil {
-		return
+		return requeue, err
 	}
 
 	var tlsSecret *corev1.Secret
 	if tlsSecretName := ironicConf.Spec.TLS.CertificateName; tlsSecretName != "" {
 		tlsSecret, requeue, err = r.getAndUpdateSecret(cctx, ironicConf, tlsSecretName)
 		if requeue || err != nil {
-			return
+			return requeue, err
 		}
 	}
 
 	var bmcSecret *corev1.Secret
 	if bmcSecretName := ironicConf.Spec.TLS.BMCCAName; bmcSecretName != "" {
 		bmcSecret, requeue, err = r.getAndUpdateSecret(cctx, ironicConf, bmcSecretName)
 		if requeue || err != nil {
-			return
+			return requeue, err
 		}
 	}
 
 	var trustedCAConfigMap *corev1.ConfigMap
 	if trustedCAConfigMapName := ironicConf.Spec.TLS.TrustedCAName; trustedCAConfigMapName != "" {
 		trustedCAConfigMap, requeue, err = r.getConfigMap(cctx, ironicConf, trustedCAConfigMapName)
 		if requeue || err != nil {
-			return
+			return requeue, err
 		}
 	}
 
@@ -193,7 +193,7 @@ func (r *IronicReconciler) handleIronic(cctx ironic.ControllerContext, ironicCon
 	status, err := ironic.EnsureIronic(cctx, resources)
 	if err != nil {
 		cctx.Logger.Error(err, "potentially transient error, will retry")
-		return
+		return requeue, err
 	}
 
 	newStatus := ironicConf.Status.DeepCopy()
@@ -208,7 +208,7 @@ func (r *IronicReconciler) handleIronic(cctx ironic.ControllerContext, ironicCon
 		ironicConf.Status = *newStatus
 		err = cctx.Client.Status().Update(cctx.Context, ironicConf)
 	}
-	return
+	return requeue, err
 }
 
 // Get a secret and update its owner references using SecretManager.
@@ -274,7 +274,7 @@ func (r *IronicReconciler) ensureAPISecret(cctx ironic.ControllerContext, ironic
 		}
 
 		requeue = true
-		return
+		return apiSecret, requeue, err
 	}
 
 	apiSecret, requeue, err = r.getAndUpdateSecret(cctx, ironicConf, ironicConf.Spec.APICredentialsName)
@@ -292,7 +292,7 @@ func (r *IronicReconciler) ensureAPISecret(cctx ironic.ControllerContext, ironic
 		err = cctx.Client.Update(cctx.Context, apiSecret)
 	}
 
-	return
+	return apiSecret, requeue, err
 }
 
 func (r *IronicReconciler) cleanUp(cctx ironic.ControllerContext, ironicConf *metal3api.Ironic) (bool, error) {

pkg/ironic/containers.go

@@ -350,7 +350,7 @@ func databaseClientMounts(db *metal3api.Database) (volumes []corev1.Volume, moun
 		})
 	}
 
-	return
+	return volumes, mounts
 }
 
 func buildIronicVolumesAndMounts(resources Resources) (volumes []corev1.Volume, mounts []corev1.VolumeMount) {
@@ -464,7 +464,7 @@ func buildIronicVolumesAndMounts(resources Resources) (volumes []corev1.Volume,
 		mounts = append(mounts, dbMounts...)
 	}
 
-	return
+	return volumes, mounts
 }
 
 func buildIronicHttpdPorts(ironic *metal3api.Ironic) (ironicPorts []corev1.ContainerPort, httpdPorts []corev1.ContainerPort) {
@@ -498,7 +498,7 @@ func buildIronicHttpdPorts(ironic *metal3api.Ironic) (ironicPorts []corev1.Conta
 		}
 	}
 
-	return
+	return ironicPorts, httpdPorts
 }
 
 func buildDHCPRange(dhcp *metal3api.DHCP) string {

pkg/ironic/ironic.go

@@ -180,12 +180,12 @@ func removeIronicDeployment(cctx ControllerContext, ironic *metal3api.Ironic) er
 func EnsureIronic(cctx ControllerContext, resources Resources) (status Status, err error) {
 	if validationErr := ValidateIronic(&resources.Ironic.Spec, nil); validationErr != nil {
 		status = Status{Fatal: validationErr}
-		return //nolint:nilerr // validation errors are reported in status, not as return error
+		return status, nil //nolint:nilerr // validation errors are reported in status, not as return error
 	}
 
 	if validationErr := checkVersion(resources, cctx.VersionInfo.InstalledVersion); validationErr != nil {
 		status = Status{Fatal: validationErr}
-		return //nolint:nilerr // validation errors are reported in status, not as return error
+		return status, nil //nolint:nilerr // validation errors are reported in status, not as return error
 	}
 
 	if resources.Ironic.Spec.Database != nil {
@@ -199,19 +199,19 @@ func EnsureIronic(cctx ControllerContext, resources Resources) (status Status, e
 	if resources.Ironic.Spec.HighAvailability {
 		err = removeIronicDeployment(cctx, resources.Ironic)
 		if err != nil {
-			return
+			return status, err
 		}
 		status, err = ensureIronicDaemonSet(cctx, resources)
 	} else {
 		err = removeIronicDaemonSet(cctx, resources.Ironic)
 		if err != nil {
-			return
+			return status, err
 		}
 		status, err = ensureIronicDeployment(cctx, resources)
 	}
 
 	if err != nil || status.IsError() {
-		return
+		return status, err
 	}
 
 	// Let the service be created while Ironic is being deployed, but do
@@ -235,7 +235,7 @@ func EnsureIronic(cctx ControllerContext, resources Resources) (status Status, e
 		return smStatus, err
 	}
 
-	return
+	return status, err
 }
 
 // RemoveIronic removes all bits of the Ironic deployment.

pkg/ironic/version.go

@@ -71,7 +71,7 @@ func NewVersionInfo(ironicImages metal3api.Images, ironicVersion string, databas
 		result.MariaDBImage = defaultMariaDBImage
 	}
 
-	return
+	return result, nil
 }
 
 // Takes VersionInfo with defaults from the configuration and applies any overrides from the Ironic object.