Skip to content

Commit 77c54f2

Browse files
authored
Merge pull request #1014 from mhutter/cleanup
chore: Address linter issues
2 parents 7713061 + 106ab8f commit 77c54f2

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

operator/backupcontroller/executor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func (b *BackupExecutor) startBackup(ctx context.Context) error {
185185

186186
backupItems, err := b.listAndFilterPVCs(ctx, cfg.Config.BackupAnnotation)
187187
if err != nil {
188-
b.Generic.SetConditionFalseWithMessage(ctx, k8upv1.ConditionReady, k8upv1.ReasonRetrievalFailed, err.Error())
188+
b.Generic.SetConditionFalseWithMessage(ctx, k8upv1.ConditionReady, k8upv1.ReasonRetrievalFailed, "%s", err.Error())
189189
return err
190190
}
191191

operator/backupcontroller/prebackup.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ func (b *BackupExecutor) allDeploymentsAreReady(ctx context.Context, deployments
7171
ready, err := isPreBackupDeploymentReady(deployment)
7272
if err != nil {
7373
log.Info("backup failed: deadline exceeded on pre backup deployment")
74-
b.SetConditionFalseWithMessage(ctx, k8upv1.ConditionPreBackupPodReady, k8upv1.ReasonFailed, err.Error())
75-
b.SetConditionTrueWithMessage(ctx, k8upv1.ConditionReady, k8upv1.ReasonFailed, err.Error())
74+
b.SetConditionFalseWithMessage(ctx, k8upv1.ConditionPreBackupPodReady, k8upv1.ReasonFailed, "%s", err.Error())
75+
b.SetConditionTrueWithMessage(ctx, k8upv1.ConditionReady, k8upv1.ReasonFailed, "%s", err.Error())
7676
b.deletePreBackupDeployment(ctx, deployment)
7777
return false, err
7878
}

operator/backupcontroller/prebackup_utils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,14 @@ func (b *BackupExecutor) fetchOrCreatePreBackupDeployment(ctx context.Context, d
8787
if fetchErr != nil {
8888
if !errors.IsNotFound(fetchErr) {
8989
err := fmt.Errorf("error getting pre backup pod '%v': %w", name.String(), fetchErr)
90-
b.SetConditionFalseWithMessage(ctx, k8upv1.ConditionPreBackupPodReady, k8upv1.ReasonRetrievalFailed, err.Error())
90+
b.SetConditionFalseWithMessage(ctx, k8upv1.ConditionPreBackupPodReady, k8upv1.ReasonRetrievalFailed, "%s", err.Error())
9191
return err
9292
}
9393

9494
createErr := b.Client.Create(ctx, deployment)
9595
if createErr != nil {
9696
err := fmt.Errorf("error creating pre backup pod '%v': %w", name.String(), createErr)
97-
b.SetConditionFalseWithMessage(ctx, k8upv1.ConditionPreBackupPodReady, k8upv1.ReasonCreationFailed, err.Error())
97+
b.SetConditionFalseWithMessage(ctx, k8upv1.ConditionPreBackupPodReady, k8upv1.ReasonCreationFailed, "%s", err.Error())
9898
return err
9999
}
100100
log.Info("started pre backup pod", "preBackup", name.String())

restic/s3/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func (c *Client) deleteBucketByName(ctx context.Context, name string) error {
148148

149149
// Print errors received from RemoveObjects API
150150
for e := range errorCh {
151-
return fmt.Errorf("Failed to remove " + e.ObjectName + ", error: " + e.Err.Error())
151+
return fmt.Errorf("Failed to remove %v ,error: %v", e.ObjectName, e.Err.Error())
152152
}
153153

154154
return c.minioClient.RemoveBucket(ctx, name)

0 commit comments

Comments
 (0)