cleanup: address golangci 'funcorder' linter problems

The new 'funcorder' linter expects all public functions to be placed
before private functions of a struct. Many private functions needed
moving further down into their files.

Some files had many issues reported. To reduce the churn in those files,
they have been annotated with a `//nolint:funcorder` comment.

Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos
2025-04-29 11:32:43 +02:00
committed by mergify[bot]
parent 0907f39d95
commit 0a22e3a186
29 changed files with 921 additions and 914 deletions

View File

@ -150,6 +150,29 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
return nil
}
// Reconcile reconciles the VolumeGroupReplicationContent object and creates a new omap entries
// for the volume group.
func (r *ReconcileVGRContent) Reconcile(ctx context.Context,
request reconcile.Request,
) (reconcile.Result, error) {
vgrc := &replicationv1alpha1.VolumeGroupReplicationContent{}
err := r.client.Get(ctx, request.NamespacedName, vgrc)
if err != nil {
if apierrors.IsNotFound(err) {
return reconcile.Result{}, nil
}
return reconcile.Result{}, err
}
// Proceed with reconciliation only if the object is not marked for deletion.
if vgrc.GetDeletionTimestamp().IsZero() {
err = r.reconcileVGRContent(ctx, vgrc)
}
return reconcile.Result{}, err
}
func (r *ReconcileVGRContent) getSecrets(
ctx context.Context,
name,
@ -222,26 +245,3 @@ func (r *ReconcileVGRContent) reconcileVGRContent(ctx context.Context, obj runti
return nil
}
// Reconcile reconciles the VolumeGroupReplicationContent object and creates a new omap entries
// for the volume group.
func (r *ReconcileVGRContent) Reconcile(ctx context.Context,
request reconcile.Request,
) (reconcile.Result, error) {
vgrc := &replicationv1alpha1.VolumeGroupReplicationContent{}
err := r.client.Get(ctx, request.NamespacedName, vgrc)
if err != nil {
if apierrors.IsNotFound(err) {
return reconcile.Result{}, nil
}
return reconcile.Result{}, err
}
// Proceed with reconciliation only if the object is not marked for deletion.
if vgrc.GetDeletionTimestamp().IsZero() {
err = r.reconcileVGRContent(ctx, vgrc)
}
return reconcile.Result{}, err
}