fix: linting issues

Author: shreddedbacon

internal/helpers/helper_types.go

@@ -33,7 +33,7 @@ func K8UPVersions(ctx context.Context, c client.Client) (bool, bool, error) {
 			return k8upv1alpha1Exists, k8upv1Exists, err
 		}
 	}
-	if crdv1alpha1.ObjectMeta.Name == "restores.backup.appuio.ch" {
+	if crdv1alpha1.Name == "restores.backup.appuio.ch" {
 		k8upv1alpha1Exists = true
 	}
 	crdv1 := &apiextensionsv1.CustomResourceDefinition{}
@@ -42,7 +42,7 @@ func K8UPVersions(ctx context.Context, c client.Client) (bool, bool, error) {
 			return k8upv1alpha1Exists, k8upv1Exists, err
 		}
 	}
-	if crdv1.ObjectMeta.Name == "restores.k8up.io" {
+	if crdv1.Name == "restores.k8up.io" {
 		k8upv1Exists = true
 	}
 	return k8upv1alpha1Exists, k8upv1Exists, nil

internal/messenger/consumer.go

@@ -322,13 +322,13 @@ func (m *Messenger) Consumer(targetName string) {
 			case "deploytarget:restic:backup:restore", "kubernetes:restic:backup:restore":
 				v1alpha1, v1, err := helpers.K8UPVersions(ctx, m.Client)
 				if err != nil {
-					//@TODO: send msg back to lagoon and update task to failed?
-					message.Ack(false) // ack to remove from queue
+					// @TODO: send msg back to lagoon and update task to failed?
+					_ = message.Ack(false) // ack to remove from queue
 					return
 				}
 				if !v1alpha1 && !v1 {
 					// k8up not installed
-					message.Ack(false) // ack to remove from queue
+					_ = message.Ack(false) // ack to remove from queue
 					return
 				}
 				opLog.Info(
@@ -354,13 +354,13 @@ func (m *Messenger) Consumer(targetName string) {
 			case "deploytarget:restic:cancel:restore":
 				v1alpha1, v1, err := helpers.K8UPVersions(ctx, m.Client)
 				if err != nil {
-					//@TODO: send msg back to lagoon and update task to failed?
-					message.Ack(false) // ack to remove from queue
+					// @TODO: send msg back to lagoon and update task to failed?
+					_ = message.Ack(false) // ack to remove from queue
 					return
 				}
 				if !v1alpha1 && !v1 {
 					// k8up not installed
-					message.Ack(false) // ack to remove from queue
+					_ = message.Ack(false) // ack to remove from queue
 					return
 				}
 				// if this is a request to cancel a restore attempt
@@ -380,8 +380,8 @@ func (m *Messenger) Consumer(targetName string) {
 							jobSpec.Environment.Name,
 						),
 					)
-					//@TODO: send msg back to lagoon and update task to failed?
-					message.Ack(false) // ack to remove from queue
+					// @TODO: send msg back to lagoon and update task to failed?
+					_ = message.Ack(false) // ack to remove from queue
 					return
 				}
 			case "deploytarget:route:migrate", "kubernetes:route:migrate", "openshift:route:migrate":

internal/messenger/tasks_restore.go

@@ -48,10 +48,8 @@ func (m *Messenger) ResticRestore(ctx context.Context, namespace string, jobSpec
 		} else {
 			if v1 {
 				handlev1 = true
-			} else {
-				if v1alpha1 {
-					handlev1alpha1 = true
-				}
+			} else if v1alpha1 {
+				handlev1alpha1 = true
 			}
 		}
 	} else {