Skip to content

Commit b5716c0

Browse files
author
Ariel Kass
committed
resolve more noinlineerr linter issues
Signed-off-by: Ariel Kass <[email protected]>
1 parent f8f2d6a commit b5716c0

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

controllers/finalizers.go

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ func (r *VolumeReplicationReconciler) addFinalizerToVR(ctx context.Context, logg
4040
if !contains(vr.ObjectMeta.Finalizers, volumeReplicationFinalizer) {
4141
logger.Info("adding finalizer to volumeReplication object", "Finalizer", volumeReplicationFinalizer)
4242
vr.ObjectMeta.Finalizers = append(vr.ObjectMeta.Finalizers, volumeReplicationFinalizer)
43-
if err := r.Client.Update(ctx, vr); err != nil {
43+
err := r.Client.Update(ctx, vr)
44+
if err != nil {
4445
return fmt.Errorf("failed to add finalizer (%s) to VolumeReplication resource"+
4546
" (%s/%s) %w",
4647
volumeReplicationFinalizer, vr.Namespace, vr.Name, err)
@@ -55,7 +56,8 @@ func (r *VolumeReplicationReconciler) removeFinalizerFromVR(ctx context.Context,
5556
if contains(vr.ObjectMeta.Finalizers, volumeReplicationFinalizer) {
5657
logger.Info("removing finalizer from volumeReplication object", "Finalizer", volumeReplicationFinalizer)
5758
vr.ObjectMeta.Finalizers = remove(vr.ObjectMeta.Finalizers, volumeReplicationFinalizer)
58-
if err := r.Client.Update(ctx, vr); err != nil {
59+
err := r.Client.Update(ctx, vr)
60+
if err != nil {
5961
return fmt.Errorf("failed to remove finalizer (%s) from VolumeReplication resource"+
6062
" (%s/%s), %w",
6163
volumeReplicationFinalizer, vr.Namespace, vr.Name, err)
@@ -70,7 +72,8 @@ func (r *VolumeReplicationReconciler) addFinalizerToPVC(ctx context.Context, log
7072
if !contains(pvc.ObjectMeta.Finalizers, pvcReplicationFinalizer) {
7173
logger.Info("adding finalizer to PersistentVolumeClaim object", "Finalizer", pvcReplicationFinalizer)
7274
pvc.ObjectMeta.Finalizers = append(pvc.ObjectMeta.Finalizers, pvcReplicationFinalizer)
73-
if err := r.Client.Update(ctx, pvc); err != nil {
75+
err := r.Client.Update(ctx, pvc)
76+
if err != nil {
7477
return fmt.Errorf("failed to add finalizer (%s) to PersistentVolumeClaim resource"+
7578
" (%s/%s) %w",
7679
pvcReplicationFinalizer, pvc.Namespace, pvc.Name, err)
@@ -86,7 +89,8 @@ func (r *VolumeReplicationReconciler) removeFinalizerFromPVC(ctx context.Context
8689
if contains(pvc.ObjectMeta.Finalizers, pvcReplicationFinalizer) {
8790
logger.Info("removing finalizer from PersistentVolumeClaim object", "Finalizer", pvcReplicationFinalizer)
8891
pvc.ObjectMeta.Finalizers = remove(pvc.ObjectMeta.Finalizers, pvcReplicationFinalizer)
89-
if err := r.Client.Update(ctx, pvc); err != nil {
92+
err := r.Client.Update(ctx, pvc)
93+
if err != nil {
9094
return fmt.Errorf("failed to remove finalizer (%s) from PersistentVolumeClaim resource"+
9195
" (%s/%s), %w",
9296
pvcReplicationFinalizer, pvc.Namespace, pvc.Name, err)
@@ -101,7 +105,8 @@ func (r *VolumeReplicationReconciler) addFinalizerToVG(ctx context.Context, logg
101105
if !contains(vg.ObjectMeta.Finalizers, vgReplicationFinalizer) {
102106
logger.Info("adding finalizer to VolumeGroup object", "Finalizer", vgReplicationFinalizer)
103107
vg.ObjectMeta.Finalizers = append(vg.ObjectMeta.Finalizers, vgReplicationFinalizer)
104-
if err := r.Client.Update(ctx, vg); err != nil {
108+
err := r.Client.Update(ctx, vg)
109+
if err != nil {
105110
return fmt.Errorf("failed to add finalizer (%s) to VolumeGroup resource"+
106111
" (%s/%s) %w",
107112
vgReplicationFinalizer, vg.Namespace, vg.Name, err)
@@ -117,7 +122,8 @@ func (r *VolumeReplicationReconciler) removeFinalizerFromVG(ctx context.Context,
117122
if contains(vg.ObjectMeta.Finalizers, vgReplicationFinalizer) {
118123
logger.Info("removing finalizer from VolumeGroup object", "Finalizer", vgReplicationFinalizer)
119124
vg.ObjectMeta.Finalizers = remove(vg.ObjectMeta.Finalizers, vgReplicationFinalizer)
120-
if err := r.Client.Update(ctx, vg); err != nil {
125+
err := r.Client.Update(ctx, vg)
126+
if err != nil {
121127
return fmt.Errorf("failed to remove finalizer (%s) from VolumeGroup resource"+
122128
" (%s/%s), %w",
123129
vgReplicationFinalizer, vg.Namespace, vg.Name, err)

0 commit comments

Comments
 (0)