Skip to content

Commit ec3ba69

Browse files
author
Ariel Kass
committed
resolve wsl_v5 linter issues
Signed-off-by: Ariel Kass <[email protected]>
1 parent 8074f4c commit ec3ba69

File tree

6 files changed

+18
-1
lines changed

6 files changed

+18
-1
lines changed

controllers/parameters.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ const (
3737
// replicationclass which are matching the prefix.
3838
func filterPrefixedParameters(prefix string, param map[string]string) map[string]string {
3939
newParam := map[string]string{}
40+
4041
for key, val := range param {
4142
if !strings.HasPrefix(key, prefix) {
4243
newParam[key] = val
@@ -62,7 +63,6 @@ func validatePrefixedParameters(param map[string]string) error {
6263
}
6364
// keep adding known prefixes to this list.
6465
default:
65-
6666
return fmt.Errorf("found unknown parameter key %q with reserved prefix %s", key, replicationParameterPrefix)
6767
}
6868
}

controllers/secret.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ func (r *VolumeReplicationReconciler) getSecret(ctx context.Context, logger logr
3636

3737
return nil, err
3838
}
39+
3940
logger.Error(err, "error getting secret", "Secret Name", name, "Secret Namespace", namespace)
4041

4142
return nil, err

controllers/strings.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ func remove(slice []string, s string) (result []string) {
3333
if item == s {
3434
continue
3535
}
36+
3637
result = append(result, item)
3738
}
3839

controllers/volumereplication_controller.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,13 +216,15 @@ func (r *VolumeReplicationReconciler) Reconcile(ctx context.Context, req ctrl.Re
216216

217217
return reconcile.Result{}, err
218218
}
219+
219220
if pvc != nil {
220221
if err = r.addFinalizerToPVC(ctx, logger, pvc); err != nil {
221222
logger.Error(err, "Failed to add PersistentVolumeClaim finalizer")
222223

223224
return reconcile.Result{}, err
224225
}
225226
}
227+
226228
if vg != nil {
227229
if err = r.addFinalizerToVG(ctx, logger, vg); err != nil {
228230
logger.Error(err, "Failed to add VolumeGroup finalizer")
@@ -238,6 +240,7 @@ func (r *VolumeReplicationReconciler) Reconcile(ctx context.Context, req ctrl.Re
238240

239241
return ctrl.Result{}, err
240242
}
243+
241244
if pvc != nil {
242245
if err = r.removeFinalizerFromPVC(ctx, logger, pvc); err != nil {
243246
logger.Error(err, "Failed to remove PersistentVolumeClaim finalizer")
@@ -260,6 +263,7 @@ func (r *VolumeReplicationReconciler) Reconcile(ctx context.Context, req ctrl.Re
260263
return reconcile.Result{}, err
261264
}
262265
}
266+
263267
logger.Info("volumeReplication object is terminated, skipping reconciliation")
264268

265269
return ctrl.Result{}, nil
@@ -276,6 +280,7 @@ func (r *VolumeReplicationReconciler) Reconcile(ctx context.Context, req ctrl.Re
276280
if err = r.enableReplication(logger, replicationSource, replicationHandle, parameters, secret); err != nil {
277281
logger.Error(err, "failed to enable replication")
278282
setFailureCondition(instance)
283+
279284
msg := replication.GetMessageFromError(err)
280285
uErr := r.updateReplicationStatus(ctx, instance, logger, getCurrentReplicationState(instance), msg)
281286
if uErr != nil {
@@ -339,6 +344,7 @@ func (r *VolumeReplicationReconciler) Reconcile(ctx context.Context, req ctrl.Re
339344
if replicationErr != nil {
340345
msg := replication.GetMessageFromError(replicationErr)
341346
logger.Error(replicationErr, "failed to Replicate", "ReplicationState", instance.Spec.ReplicationState)
347+
342348
err = r.updateReplicationStatus(ctx, instance, logger, getCurrentReplicationState(instance), msg)
343349
if err != nil {
344350
logger.Error(err, "failed to update volumeReplication status", "VRName", instance.Name)
@@ -380,6 +386,7 @@ func (r *VolumeReplicationReconciler) Reconcile(ctx context.Context, req ctrl.Re
380386
}
381387

382388
instance.Status.LastCompletionTime = getCurrentTime()
389+
383390
err = r.updateReplicationStatus(ctx, instance, logger, getReplicationState(instance), msg)
384391
if err != nil {
385392
return ctrl.Result{}, err
@@ -475,6 +482,7 @@ func (r *VolumeReplicationReconciler) waitForVolumeReplicationResource(logger lo
475482
Kind: resourceName,
476483
Version: replicationv1alpha1.GroupVersion.Version,
477484
})
485+
478486
for {
479487
err := r.Client.List(context.TODO(), unstructuredResource)
480488
if err == nil {
@@ -636,6 +644,7 @@ func (r *VolumeReplicationReconciler) disableVolumeReplication(logger logr.Logge
636644

637645
return nil
638646
}
647+
639648
logger.Error(resp.Error, "failed to disable volume replication")
640649

641650
return resp.Error

main.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,13 @@ func init() {
6363

6464
func main() {
6565
var metricsAddr string
66+
6667
var leaderElectionNamespace string
68+
6769
var enableLeaderElection bool
70+
6871
var probeAddr string
72+
6973
var opts zap.Options
7074

7175
if strings.EqualFold(os.Getenv("DEVELOPMENT_MODE"), "true") {
@@ -162,6 +166,7 @@ func main() {
162166
}
163167

164168
setupLog.Info("starting manager")
169+
165170
err = mgr.Start(ctrl.SetupSignalHandler())
166171
if err != nil {
167172
setupLog.Error(err, "problem running manager")

pkg/client/replication-client.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ func (rc *replicationClient) DemoteVolume(replicationSource *replicationlib.Repl
122122
Parameters: parameters,
123123
Secrets: secrets,
124124
}
125+
125126
createCtx, cancel := context.WithTimeout(context.Background(), rc.timeout)
126127
defer cancel()
127128
resp, err := rc.client.DemoteVolume(createCtx, req)

0 commit comments

Comments
 (0)