Merge pull request #1014 from mhutter/cleanup

chore: Address linter issues
k8up-io · Oct 10, 2024 · 77c54f2 · 77c54f2
2 parents 7713061 + 106ab8f
commit 77c54f2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/operator/backupcontroller/executor.go b/operator/backupcontroller/executor.go
@@ -185,7 +185,7 @@ func (b *BackupExecutor) startBackup(ctx context.Context) error {
 
 	backupItems, err := b.listAndFilterPVCs(ctx, cfg.Config.BackupAnnotation)
 	if err != nil {
-		b.Generic.SetConditionFalseWithMessage(ctx, k8upv1.ConditionReady, k8upv1.ReasonRetrievalFailed, err.Error())
+		b.Generic.SetConditionFalseWithMessage(ctx, k8upv1.ConditionReady, k8upv1.ReasonRetrievalFailed, "%s", err.Error())
 		return err
 	}
 

diff --git a/operator/backupcontroller/prebackup.go b/operator/backupcontroller/prebackup.go
@@ -71,8 +71,8 @@ func (b *BackupExecutor) allDeploymentsAreReady(ctx context.Context, deployments
 		ready, err := isPreBackupDeploymentReady(deployment)
 		if err != nil {
 			log.Info("backup failed: deadline exceeded on pre backup deployment")
-			b.SetConditionFalseWithMessage(ctx, k8upv1.ConditionPreBackupPodReady, k8upv1.ReasonFailed, err.Error())
-			b.SetConditionTrueWithMessage(ctx, k8upv1.ConditionReady, k8upv1.ReasonFailed, err.Error())
+			b.SetConditionFalseWithMessage(ctx, k8upv1.ConditionPreBackupPodReady, k8upv1.ReasonFailed, "%s", err.Error())
+			b.SetConditionTrueWithMessage(ctx, k8upv1.ConditionReady, k8upv1.ReasonFailed, "%s", err.Error())
 			b.deletePreBackupDeployment(ctx, deployment)
 			return false, err
 		}

diff --git a/operator/backupcontroller/prebackup_utils.go b/operator/backupcontroller/prebackup_utils.go
@@ -87,14 +87,14 @@ func (b *BackupExecutor) fetchOrCreatePreBackupDeployment(ctx context.Context, d
 	if fetchErr != nil {
 		if !errors.IsNotFound(fetchErr) {
 			err := fmt.Errorf("error getting pre backup pod '%v': %w", name.String(), fetchErr)
-			b.SetConditionFalseWithMessage(ctx, k8upv1.ConditionPreBackupPodReady, k8upv1.ReasonRetrievalFailed, err.Error())
+			b.SetConditionFalseWithMessage(ctx, k8upv1.ConditionPreBackupPodReady, k8upv1.ReasonRetrievalFailed, "%s", err.Error())
 			return err
 		}
 
 		createErr := b.Client.Create(ctx, deployment)
 		if createErr != nil {
 			err := fmt.Errorf("error creating pre backup pod '%v': %w", name.String(), createErr)
-			b.SetConditionFalseWithMessage(ctx, k8upv1.ConditionPreBackupPodReady, k8upv1.ReasonCreationFailed, err.Error())
+			b.SetConditionFalseWithMessage(ctx, k8upv1.ConditionPreBackupPodReady, k8upv1.ReasonCreationFailed, "%s", err.Error())
 			return err
 		}
 		log.Info("started pre backup pod", "preBackup", name.String())

diff --git a/restic/s3/client.go b/restic/s3/client.go
@@ -148,7 +148,7 @@ func (c *Client) deleteBucketByName(ctx context.Context, name string) error {
 
 	// Print errors received from RemoveObjects API
 	for e := range errorCh {
-		return fmt.Errorf("Failed to remove " + e.ObjectName + ", error: " + e.Err.Error())
+		return fmt.Errorf("Failed to remove %v ,error: %v", e.ObjectName, e.Err.Error())
 	}
 
 	return c.minioClient.RemoveBucket(ctx, name)