Skip to content

Commit

Permalink
Merge pull request #163 from gibizer/full-golangci-lint
Browse files Browse the repository at this point in the history
Ensure golangci-lint runs on all files
  • Loading branch information
openshift-merge-bot[bot] authored Apr 29, 2024
2 parents a7c06ca + 44030f3 commit e07f191
Show file tree
Hide file tree
Showing 13 changed files with 56 additions and 65 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@ repos:
- repo: https://github.com/golangci/golangci-lint
rev: v1.55.2
hooks:
- id: golangci-lint
- id: golangci-lint-full
args: ["-v"]
10 changes: 5 additions & 5 deletions controllers/designate_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ func (r *DesignateReconciler) reconcileInit(
// run Designate db sync
//
dbSyncHash := instance.Status.Hash[designatev1beta1.DbSyncHash]
jobDef := designate.DbSyncJob(instance, serviceLabels)
jobDef := designate.DbSyncJob(instance, serviceLabels, serviceAnnotations)

dbSyncjob := job.NewJob(
jobDef,
Expand Down Expand Up @@ -649,15 +649,15 @@ func (r *DesignateReconciler) reconcileNormal(ctx context.Context, instance *des
}

// Handle service update
ctrlResult, err = r.reconcileUpdate(ctx, instance, helper)
ctrlResult, err = r.reconcileUpdate(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
return ctrlResult, nil
}

// Handle service upgrade
ctrlResult, err = r.reconcileUpgrade(ctx, instance, helper)
ctrlResult, err = r.reconcileUpgrade(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
Expand Down Expand Up @@ -859,7 +859,7 @@ func (r *DesignateReconciler) reconcileNormal(ctx context.Context, instance *des
return ctrl.Result{}, nil
}

func (r *DesignateReconciler) reconcileUpdate(ctx context.Context, instance *designatev1beta1.Designate, helper *helper.Helper) (ctrl.Result, error) {
func (r *DesignateReconciler) reconcileUpdate(ctx context.Context, instance *designatev1beta1.Designate) (ctrl.Result, error) {
Log := r.GetLogger(ctx)

Log.Info(fmt.Sprintf("Reconciling Service '%s' update", instance.Name))
Expand All @@ -871,7 +871,7 @@ func (r *DesignateReconciler) reconcileUpdate(ctx context.Context, instance *des
return ctrl.Result{}, nil
}

func (r *DesignateReconciler) reconcileUpgrade(ctx context.Context, instance *designatev1beta1.Designate, helper *helper.Helper) (ctrl.Result, error) {
func (r *DesignateReconciler) reconcileUpgrade(ctx context.Context, instance *designatev1beta1.Designate) (ctrl.Result, error) {
Log := r.GetLogger(ctx)

Log.Info(fmt.Sprintf("Reconciling Service '%s' upgrade", instance.Name))
Expand Down
8 changes: 4 additions & 4 deletions controllers/designateapi_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -682,15 +682,15 @@ func (r *DesignateAPIReconciler) reconcileNormal(ctx context.Context, instance *
}

// Handle service update
ctrlResult, err = r.reconcileUpdate(ctx, instance, helper)
ctrlResult, err = r.reconcileUpdate(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
return ctrlResult, nil
}

// Handle service upgrade
ctrlResult, err = r.reconcileUpgrade(ctx, instance, helper)
ctrlResult, err = r.reconcileUpgrade(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
Expand Down Expand Up @@ -775,7 +775,7 @@ func (r *DesignateAPIReconciler) reconcileNormal(ctx context.Context, instance *
return ctrl.Result{}, nil
}

func (r *DesignateAPIReconciler) reconcileUpdate(ctx context.Context, instance *designatev1beta1.DesignateAPI, helper *helper.Helper) (ctrl.Result, error) {
func (r *DesignateAPIReconciler) reconcileUpdate(ctx context.Context, instance *designatev1beta1.DesignateAPI) (ctrl.Result, error) {
Log := r.GetLogger(ctx)

Log.Info(fmt.Sprintf("Reconciling Service '%s' update", instance.Name))
Expand All @@ -787,7 +787,7 @@ func (r *DesignateAPIReconciler) reconcileUpdate(ctx context.Context, instance *
return ctrl.Result{}, nil
}

func (r *DesignateAPIReconciler) reconcileUpgrade(ctx context.Context, instance *designatev1beta1.DesignateAPI, helper *helper.Helper) (ctrl.Result, error) {
func (r *DesignateAPIReconciler) reconcileUpgrade(ctx context.Context, instance *designatev1beta1.DesignateAPI) (ctrl.Result, error) {
Log := r.GetLogger(ctx)

Log.Info(fmt.Sprintf("Reconciling Service '%s' upgrade", instance.Name))
Expand Down
20 changes: 8 additions & 12 deletions controllers/designatebackendbind9_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func (r *DesignateBackendbind9Reconciler) Reconcile(ctx context.Context, req ctr

// Handle service delete
if !instance.DeletionTimestamp.IsZero() {
return r.reconcileDelete(ctx, instance, helper)
return r.reconcileDelete(instance, helper)
}

// Handle non-deleted clusters
Expand Down Expand Up @@ -320,7 +320,7 @@ func (r *DesignateBackendbind9Reconciler) SetupWithManager(mgr ctrl.Manager) err
Complete(r)
}

func (r *DesignateBackendbind9Reconciler) reconcileDelete(ctx context.Context, instance *designatev1beta1.DesignateBackendbind9, helper *helper.Helper) (ctrl.Result, error) {
func (r *DesignateBackendbind9Reconciler) reconcileDelete(instance *designatev1beta1.DesignateBackendbind9, helper *helper.Helper) (ctrl.Result, error) {
r.Log.Info(fmt.Sprintf("Reconciling Service '%s' delete", instance.Name))

// We did all the cleanup on the objects we created so we can remove the
Expand All @@ -332,10 +332,7 @@ func (r *DesignateBackendbind9Reconciler) reconcileDelete(ctx context.Context, i
}

func (r *DesignateBackendbind9Reconciler) reconcileInit(
ctx context.Context,
instance *designatev1beta1.DesignateBackendbind9,
helper *helper.Helper,
serviceLabels map[string]string,
) (ctrl.Result, error) {
r.Log.Info(fmt.Sprintf("Reconciling Service '%s' init", instance.Name))

Expand Down Expand Up @@ -427,7 +424,7 @@ func (r *DesignateBackendbind9Reconciler) reconcileNormal(ctx context.Context, i
// create hash over all the different input resources to identify if any those changed
// and a restart/recreate is required.
//
inputHash, hashChanged, err := r.createHashOfInputHashes(ctx, instance, configMapVars)
inputHash, hashChanged, err := r.createHashOfInputHashes(instance, configMapVars)
if err != nil {
instance.Status.Conditions.Set(condition.FalseCondition(
condition.ServiceConfigReadyCondition,
Expand Down Expand Up @@ -479,23 +476,23 @@ func (r *DesignateBackendbind9Reconciler) reconcileNormal(ctx context.Context, i
}

// Handle service init
ctrlResult, err = r.reconcileInit(ctx, instance, helper, serviceLabels)
ctrlResult, err = r.reconcileInit(instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
return ctrlResult, nil
}

// Handle service update
ctrlResult, err = r.reconcileUpdate(ctx, instance, helper)
ctrlResult, err = r.reconcileUpdate(instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
return ctrlResult, nil
}

// Handle service upgrade
ctrlResult, err = r.reconcileUpgrade(ctx, instance, helper)
ctrlResult, err = r.reconcileUpgrade(instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
Expand Down Expand Up @@ -580,7 +577,7 @@ func (r *DesignateBackendbind9Reconciler) reconcileNormal(ctx context.Context, i
return ctrl.Result{}, nil
}

func (r *DesignateBackendbind9Reconciler) reconcileUpdate(ctx context.Context, instance *designatev1beta1.DesignateBackendbind9, helper *helper.Helper) (ctrl.Result, error) {
func (r *DesignateBackendbind9Reconciler) reconcileUpdate(instance *designatev1beta1.DesignateBackendbind9) (ctrl.Result, error) {
r.Log.Info(fmt.Sprintf("Reconciling Service '%s' update", instance.Name))

// TODO: should have minor update tasks if required
Expand All @@ -590,7 +587,7 @@ func (r *DesignateBackendbind9Reconciler) reconcileUpdate(ctx context.Context, i
return ctrl.Result{}, nil
}

func (r *DesignateBackendbind9Reconciler) reconcileUpgrade(ctx context.Context, instance *designatev1beta1.DesignateBackendbind9, helper *helper.Helper) (ctrl.Result, error) {
func (r *DesignateBackendbind9Reconciler) reconcileUpgrade(instance *designatev1beta1.DesignateBackendbind9) (ctrl.Result, error) {
r.Log.Info(fmt.Sprintf("Reconciling Service '%s' upgrade", instance.Name))

// TODO: should have major version upgrade tasks
Expand Down Expand Up @@ -682,7 +679,6 @@ func (r *DesignateBackendbind9Reconciler) generateServiceConfigMaps(
//
// returns the hash, whether the hash changed (as a bool) and any error
func (r *DesignateBackendbind9Reconciler) createHashOfInputHashes(
ctx context.Context,
instance *designatev1beta1.DesignateBackendbind9,
envVars map[string]env.Setter,
) (string, bool, error) {
Expand Down
12 changes: 5 additions & 7 deletions controllers/designatecentral_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,6 @@ func (r *DesignateCentralReconciler) reconcileDelete(ctx context.Context, instan
func (r *DesignateCentralReconciler) reconcileInit(
ctx context.Context,
instance *designatev1beta1.DesignateCentral,
helper *helper.Helper,
serviceLabels map[string]string,
) (ctrl.Result, error) {
Log := r.GetLogger(ctx)

Expand Down Expand Up @@ -437,23 +435,23 @@ func (r *DesignateCentralReconciler) reconcileNormal(ctx context.Context, instan
}

// Handle service init
ctrlResult, err = r.reconcileInit(ctx, instance, helper, serviceLabels)
ctrlResult, err = r.reconcileInit(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
return ctrlResult, nil
}

// Handle service update
ctrlResult, err = r.reconcileUpdate(ctx, instance, helper)
ctrlResult, err = r.reconcileUpdate(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
return ctrlResult, nil
}

// Handle service upgrade
ctrlResult, err = r.reconcileUpgrade(ctx, instance, helper)
ctrlResult, err = r.reconcileUpgrade(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
Expand Down Expand Up @@ -538,7 +536,7 @@ func (r *DesignateCentralReconciler) reconcileNormal(ctx context.Context, instan
return ctrl.Result{}, nil
}

func (r *DesignateCentralReconciler) reconcileUpdate(ctx context.Context, instance *designatev1beta1.DesignateCentral, helper *helper.Helper) (ctrl.Result, error) {
func (r *DesignateCentralReconciler) reconcileUpdate(ctx context.Context, instance *designatev1beta1.DesignateCentral) (ctrl.Result, error) {
Log := r.GetLogger(ctx)

Log.Info(fmt.Sprintf("Reconciling Service '%s' update", instance.Name))
Expand All @@ -550,7 +548,7 @@ func (r *DesignateCentralReconciler) reconcileUpdate(ctx context.Context, instan
return ctrl.Result{}, nil
}

func (r *DesignateCentralReconciler) reconcileUpgrade(ctx context.Context, instance *designatev1beta1.DesignateCentral, helper *helper.Helper) (ctrl.Result, error) {
func (r *DesignateCentralReconciler) reconcileUpgrade(ctx context.Context, instance *designatev1beta1.DesignateCentral) (ctrl.Result, error) {
Log := r.GetLogger(ctx)

Log.Info(fmt.Sprintf("Reconciling Service '%s' upgrade", instance.Name))
Expand Down
12 changes: 5 additions & 7 deletions controllers/designatemdns_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,6 @@ func (r *DesignateMdnsReconciler) reconcileDelete(ctx context.Context, instance
func (r *DesignateMdnsReconciler) reconcileInit(
ctx context.Context,
instance *designatev1beta1.DesignateMdns,
helper *helper.Helper,
serviceLabels map[string]string,
) (ctrl.Result, error) {
Log := r.GetLogger(ctx)

Expand Down Expand Up @@ -435,23 +433,23 @@ func (r *DesignateMdnsReconciler) reconcileNormal(ctx context.Context, instance
}

// Handle service init
ctrlResult, err = r.reconcileInit(ctx, instance, helper, serviceLabels)
ctrlResult, err = r.reconcileInit(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
return ctrlResult, nil
}

// Handle service update
ctrlResult, err = r.reconcileUpdate(ctx, instance, helper)
ctrlResult, err = r.reconcileUpdate(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
return ctrlResult, nil
}

// Handle service upgrade
ctrlResult, err = r.reconcileUpgrade(ctx, instance, helper)
ctrlResult, err = r.reconcileUpgrade(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
Expand Down Expand Up @@ -536,7 +534,7 @@ func (r *DesignateMdnsReconciler) reconcileNormal(ctx context.Context, instance
return ctrl.Result{}, nil
}

func (r *DesignateMdnsReconciler) reconcileUpdate(ctx context.Context, instance *designatev1beta1.DesignateMdns, helper *helper.Helper) (ctrl.Result, error) {
func (r *DesignateMdnsReconciler) reconcileUpdate(ctx context.Context, instance *designatev1beta1.DesignateMdns) (ctrl.Result, error) {
Log := r.GetLogger(ctx)

Log.Info(fmt.Sprintf("Reconciling Service '%s' update", instance.Name))
Expand All @@ -548,7 +546,7 @@ func (r *DesignateMdnsReconciler) reconcileUpdate(ctx context.Context, instance
return ctrl.Result{}, nil
}

func (r *DesignateMdnsReconciler) reconcileUpgrade(ctx context.Context, instance *designatev1beta1.DesignateMdns, helper *helper.Helper) (ctrl.Result, error) {
func (r *DesignateMdnsReconciler) reconcileUpgrade(ctx context.Context, instance *designatev1beta1.DesignateMdns) (ctrl.Result, error) {
Log := r.GetLogger(ctx)

Log.Info(fmt.Sprintf("Reconciling Service '%s' upgrade", instance.Name))
Expand Down
12 changes: 5 additions & 7 deletions controllers/designateproducer_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -288,8 +288,6 @@ func (r *DesignateProducerReconciler) reconcileDelete(ctx context.Context, insta
func (r *DesignateProducerReconciler) reconcileInit(
ctx context.Context,
instance *designatev1beta1.DesignateProducer,
helper *helper.Helper,
serviceLabels map[string]string,
) (ctrl.Result, error) {
Log := r.GetLogger(ctx)

Expand Down Expand Up @@ -437,23 +435,23 @@ func (r *DesignateProducerReconciler) reconcileNormal(ctx context.Context, insta
}

// Handle service init
ctrlResult, err = r.reconcileInit(ctx, instance, helper, serviceLabels)
ctrlResult, err = r.reconcileInit(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
return ctrlResult, nil
}

// Handle service update
ctrlResult, err = r.reconcileUpdate(ctx, instance, helper)
ctrlResult, err = r.reconcileUpdate(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
return ctrlResult, nil
}

// Handle service upgrade
ctrlResult, err = r.reconcileUpgrade(ctx, instance, helper)
ctrlResult, err = r.reconcileUpgrade(ctx, instance)
if err != nil {
return ctrlResult, err
} else if (ctrlResult != ctrl.Result{}) {
Expand Down Expand Up @@ -538,7 +536,7 @@ func (r *DesignateProducerReconciler) reconcileNormal(ctx context.Context, insta
return ctrl.Result{}, nil
}

func (r *DesignateProducerReconciler) reconcileUpdate(ctx context.Context, instance *designatev1beta1.DesignateProducer, helper *helper.Helper) (ctrl.Result, error) {
func (r *DesignateProducerReconciler) reconcileUpdate(ctx context.Context, instance *designatev1beta1.DesignateProducer) (ctrl.Result, error) {
Log := r.GetLogger(ctx)

Log.Info(fmt.Sprintf("Reconciling Service '%s' update", instance.Name))
Expand All @@ -550,7 +548,7 @@ func (r *DesignateProducerReconciler) reconcileUpdate(ctx context.Context, insta
return ctrl.Result{}, nil
}

func (r *DesignateProducerReconciler) reconcileUpgrade(ctx context.Context, instance *designatev1beta1.DesignateProducer, helper *helper.Helper) (ctrl.Result, error) {
func (r *DesignateProducerReconciler) reconcileUpgrade(ctx context.Context, instance *designatev1beta1.DesignateProducer) (ctrl.Result, error) {
Log := r.GetLogger(ctx)

Log.Info(fmt.Sprintf("Reconciling Service '%s' upgrade", instance.Name))
Expand Down
Loading

0 comments on commit e07f191

Please sign in to comment.