Skip to content

Commit f67922e

Browse files
author
Ariel Kass
committed
fix golang-lint warnings for contextcheck
Signed-off-by: Ariel Kass <[email protected]>
1 parent 54088c6 commit f67922e

File tree

8 files changed

+54
-49
lines changed

8 files changed

+54
-49
lines changed

‎controllers/finalizers.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ const (
3434
)
3535

3636
// addFinalizerToVR adds the VR finalizer on the VolumeReplication instance.
37-
func (r *VolumeReplicationReconciler) addFinalizerToVR(logger logr.Logger, vr *replicationv1alpha1.VolumeReplication,
37+
func (r *VolumeReplicationReconciler) addFinalizerToVR(ctx context.Context, logger logr.Logger, vr *replicationv1alpha1.VolumeReplication,
3838
) error {
3939
if !contains(vr.ObjectMeta.Finalizers, volumeReplicationFinalizer) {
4040
logger.Info("adding finalizer to volumeReplication object", "Finalizer", volumeReplicationFinalizer)
4141
vr.ObjectMeta.Finalizers = append(vr.ObjectMeta.Finalizers, volumeReplicationFinalizer)
42-
if err := r.Client.Update(context.TODO(), vr); err != nil {
42+
if err := r.Client.Update(ctx, vr); err != nil {
4343
return fmt.Errorf("failed to add finalizer (%s) to VolumeReplication resource"+
4444
" (%s/%s) %w",
4545
volumeReplicationFinalizer, vr.Namespace, vr.Name, err)
@@ -50,11 +50,11 @@ func (r *VolumeReplicationReconciler) addFinalizerToVR(logger logr.Logger, vr *r
5050
}
5151

5252
// removeFinalizerFromVR removes the VR finalizer from the VolumeReplication instance.
53-
func (r *VolumeReplicationReconciler) removeFinalizerFromVR(logger logr.Logger, vr *replicationv1alpha1.VolumeReplication) error {
53+
func (r *VolumeReplicationReconciler) removeFinalizerFromVR(ctx context.Context, logger logr.Logger, vr *replicationv1alpha1.VolumeReplication) error {
5454
if contains(vr.ObjectMeta.Finalizers, volumeReplicationFinalizer) {
5555
logger.Info("removing finalizer from volumeReplication object", "Finalizer", volumeReplicationFinalizer)
5656
vr.ObjectMeta.Finalizers = remove(vr.ObjectMeta.Finalizers, volumeReplicationFinalizer)
57-
if err := r.Client.Update(context.TODO(), vr); err != nil {
57+
if err := r.Client.Update(ctx, vr); err != nil {
5858
return fmt.Errorf("failed to remove finalizer (%s) from VolumeReplication resource"+
5959
" (%s/%s), %w",
6060
volumeReplicationFinalizer, vr.Namespace, vr.Name, err)
@@ -65,11 +65,11 @@ func (r *VolumeReplicationReconciler) removeFinalizerFromVR(logger logr.Logger,
6565
}
6666

6767
// addFinalizerToPVC adds the VR finalizer on the PersistentVolumeClaim.
68-
func (r *VolumeReplicationReconciler) addFinalizerToPVC(logger logr.Logger, pvc *corev1.PersistentVolumeClaim) error {
68+
func (r *VolumeReplicationReconciler) addFinalizerToPVC(ctx context.Context, logger logr.Logger, pvc *corev1.PersistentVolumeClaim) error {
6969
if !contains(pvc.ObjectMeta.Finalizers, pvcReplicationFinalizer) {
7070
logger.Info("adding finalizer to PersistentVolumeClaim object", "Finalizer", pvcReplicationFinalizer)
7171
pvc.ObjectMeta.Finalizers = append(pvc.ObjectMeta.Finalizers, pvcReplicationFinalizer)
72-
if err := r.Client.Update(context.TODO(), pvc); err != nil {
72+
if err := r.Client.Update(ctx, pvc); err != nil {
7373
return fmt.Errorf("failed to add finalizer (%s) to PersistentVolumeClaim resource"+
7474
" (%s/%s) %w",
7575
pvcReplicationFinalizer, pvc.Namespace, pvc.Name, err)
@@ -80,12 +80,12 @@ func (r *VolumeReplicationReconciler) addFinalizerToPVC(logger logr.Logger, pvc
8080
}
8181

8282
// removeFinalizerFromPVC removes the VR finalizer on PersistentVolumeClaim.
83-
func (r *VolumeReplicationReconciler) removeFinalizerFromPVC(logger logr.Logger, pvc *corev1.PersistentVolumeClaim,
83+
func (r *VolumeReplicationReconciler) removeFinalizerFromPVC(ctx context.Context, logger logr.Logger, pvc *corev1.PersistentVolumeClaim,
8484
) error {
8585
if contains(pvc.ObjectMeta.Finalizers, pvcReplicationFinalizer) {
8686
logger.Info("removing finalizer from PersistentVolumeClaim object", "Finalizer", pvcReplicationFinalizer)
8787
pvc.ObjectMeta.Finalizers = remove(pvc.ObjectMeta.Finalizers, pvcReplicationFinalizer)
88-
if err := r.Client.Update(context.TODO(), pvc); err != nil {
88+
if err := r.Client.Update(ctx, pvc); err != nil {
8989
return fmt.Errorf("failed to remove finalizer (%s) from PersistentVolumeClaim resource"+
9090
" (%s/%s), %w",
9191
pvcReplicationFinalizer, pvc.Namespace, pvc.Name, err)
@@ -96,11 +96,11 @@ func (r *VolumeReplicationReconciler) removeFinalizerFromPVC(logger logr.Logger,
9696
}
9797

9898
// addFinalizerToVG adds the VR finalizer on the VolumeGroup.
99-
func (r *VolumeReplicationReconciler) addFinalizerToVG(logger logr.Logger, vg *volumegroupv1.VolumeGroup) error {
99+
func (r *VolumeReplicationReconciler) addFinalizerToVG(ctx context.Context, logger logr.Logger, vg *volumegroupv1.VolumeGroup) error {
100100
if !contains(vg.ObjectMeta.Finalizers, vgReplicationFinalizer) {
101101
logger.Info("adding finalizer to VolumeGroup object", "Finalizer", vgReplicationFinalizer)
102102
vg.ObjectMeta.Finalizers = append(vg.ObjectMeta.Finalizers, vgReplicationFinalizer)
103-
if err := r.Client.Update(context.TODO(), vg); err != nil {
103+
if err := r.Client.Update(ctx, vg); err != nil {
104104
return fmt.Errorf("failed to add finalizer (%s) to VolumeGroup resource"+
105105
" (%s/%s) %w",
106106
vgReplicationFinalizer, vg.Namespace, vg.Name, err)
@@ -111,12 +111,12 @@ func (r *VolumeReplicationReconciler) addFinalizerToVG(logger logr.Logger, vg *v
111111
}
112112

113113
// removeFinalizerFromVG removes the VR finalizer on VolumeGroup.
114-
func (r *VolumeReplicationReconciler) removeFinalizerFromVG(logger logr.Logger, vg *volumegroupv1.VolumeGroup,
114+
func (r *VolumeReplicationReconciler) removeFinalizerFromVG(ctx context.Context, logger logr.Logger, vg *volumegroupv1.VolumeGroup,
115115
) error {
116116
if contains(vg.ObjectMeta.Finalizers, vgReplicationFinalizer) {
117117
logger.Info("removing finalizer from VolumeGroup object", "Finalizer", vgReplicationFinalizer)
118118
vg.ObjectMeta.Finalizers = remove(vg.ObjectMeta.Finalizers, vgReplicationFinalizer)
119-
if err := r.Client.Update(context.TODO(), vg); err != nil {
119+
if err := r.Client.Update(ctx, vg); err != nil {
120120
return fmt.Errorf("failed to remove finalizer (%s) from VolumeGroup resource"+
121121
" (%s/%s), %w",
122122
vgReplicationFinalizer, vg.Namespace, vg.Name, err)

‎controllers/pvc.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727
)
2828

2929
// getPVCDataSource get pvc, pv object from the request.
30-
func (r VolumeReplicationReconciler) getPVCDataSource(logger logr.Logger, req types.NamespacedName) (*corev1.PersistentVolumeClaim, *corev1.PersistentVolume, error) {
30+
func (r VolumeReplicationReconciler) getPVCDataSource(ctx context.Context, logger logr.Logger, req types.NamespacedName) (*corev1.PersistentVolumeClaim, *corev1.PersistentVolume, error) {
3131
pvc := &corev1.PersistentVolumeClaim{}
32-
err := r.Client.Get(context.TODO(), req, pvc)
32+
err := r.Client.Get(ctx, req, pvc)
3333
if err != nil {
3434
if errors.IsNotFound(err) {
3535
logger.Error(err, "PVC not found", "PVC Name", req.Name)
@@ -45,7 +45,7 @@ func (r VolumeReplicationReconciler) getPVCDataSource(logger logr.Logger, req ty
4545
// Get PV object for the PVC
4646
pvName := pvc.Spec.VolumeName
4747
pv := &corev1.PersistentVolume{}
48-
err = r.Client.Get(context.TODO(), types.NamespacedName{Name: pvName}, pv)
48+
err = r.Client.Get(ctx, types.NamespacedName{Name: pvName}, pv)
4949
if err != nil {
5050
if errors.IsNotFound(err) {
5151
logger.Error(err, "PV not found", "PV Name", pvName)

‎controllers/pvc_test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ import (
2929
"k8s.io/apimachinery/pkg/types"
3030
"sigs.k8s.io/controller-runtime/pkg/client/fake"
3131
logf "sigs.k8s.io/controller-runtime/pkg/log"
32+
33+
"context"
3234
)
3335

3436
const (
@@ -166,7 +168,7 @@ func TestGetVolumeHandle(t *testing.T) {
166168
}
167169

168170
reconciler := createFakeVolumeReplicationReconciler(t, testPV, testPVC, volumeReplication)
169-
resultPVC, resultPV, err := reconciler.getPVCDataSource(reconciler.Log, namespacedName)
171+
resultPVC, resultPV, err := reconciler.getPVCDataSource(context.TODO(), reconciler.Log, namespacedName)
170172
if tc.errorExpected {
171173
assert.Error(t, err)
172174
} else {

‎controllers/secret.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import (
2626
)
2727

2828
// getSecret retrieves the secrets based on name and namespace input.
29-
func (r *VolumeReplicationReconciler) getSecret(logger logr.Logger, name, namespace string) (map[string]string, error) {
29+
func (r *VolumeReplicationReconciler) getSecret(ctx context.Context, logger logr.Logger, name, namespace string) (map[string]string, error) {
3030
namespacedName := types.NamespacedName{Name: name, Namespace: namespace}
3131
secret := &corev1.Secret{}
32-
err := r.Client.Get(context.TODO(), namespacedName, secret)
32+
err := r.Client.Get(ctx, namespacedName, secret)
3333
if err != nil {
3434
if apierrors.IsNotFound(err) {
3535
logger.Error(err, "secret not found", "Secret Name", name, "Secret Namespace", namespace)

‎controllers/vg.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626
)
2727

2828
// getVGDataSource get vg content, vg object from the request.
29-
func (r VolumeReplicationReconciler) getVGDataSource(logger logr.Logger, req types.NamespacedName) (*volumegroupv1.VolumeGroup, *volumegroupv1.VolumeGroupContent, error) {
29+
func (r VolumeReplicationReconciler) getVGDataSource(ctx context.Context, logger logr.Logger, req types.NamespacedName) (*volumegroupv1.VolumeGroup, *volumegroupv1.VolumeGroupContent, error) {
3030
vg := &volumegroupv1.VolumeGroup{}
31-
err := r.Client.Get(context.TODO(), req, vg)
31+
err := r.Client.Get(ctx, req, vg)
3232
if err != nil {
3333
if errors.IsNotFound(err) {
3434
logger.Error(err, "VG not found", "VG Name", req.Name)
@@ -40,7 +40,7 @@ func (r VolumeReplicationReconciler) getVGDataSource(logger logr.Logger, req typ
4040
vgc := &volumegroupv1.VolumeGroupContent{}
4141
volumeGroupContentName := *vg.Spec.Source.VolumeGroupContentName
4242
namespacedVGC := types.NamespacedName{Name: volumeGroupContentName, Namespace: vg.Namespace}
43-
err = r.Client.Get(context.TODO(), namespacedVGC, vgc)
43+
err = r.Client.Get(ctx, namespacedVGC, vgc)
4444
if err != nil {
4545
if errors.IsNotFound(err) {
4646
logger.Error(err, "VolumeGroupContent not found", "VolumeGroupContent Name", volumeGroupContentName)

0 commit comments

Comments
 (0)