Error should be the last type when returning multiple items

nginxinc · Jul 1, 2021 · c6ab8ed · c6ab8ed
1 parent a42e3ba
commit c6ab8ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/controllers/nginxingresscontroller_controller.go b/controllers/nginxingresscontroller_controller.go
@@ -255,13 +255,13 @@ func (r *NginxIngressControllerReconciler) Reconcile(ctx context.Context, req ct
 }
 
 // createIfNotExists creates a new object. If the object exists, does nothing. It returns whether the object existed before or not.
-func (r *NginxIngressControllerReconciler) createIfNotExists(object client.Object) (error, bool) {
+func (r *NginxIngressControllerReconciler) createIfNotExists(object client.Object) (bool, error) {
 	err := r.Create(context.TODO(), object)
 	if err != nil && errors.IsAlreadyExists(err) {
-		return nil, true
+		return true, nil
 	}
 
-	return err, false
+	return false, err
 }
 
 func (r *NginxIngressControllerReconciler) finalizeNginxIngressController(log logr.Logger, instance *k8sv1alpha1.NginxIngressController) error {

diff --git a/controllers/prerequisites.go b/controllers/prerequisites.go
@@ -18,7 +18,7 @@ func (r *NginxIngressControllerReconciler) checkPrerequisites(log logr.Logger, i
 	if err != nil {
 		return err
 	}
-	err, existed := r.createIfNotExists(sa)
+	existed, err := r.createIfNotExists(sa)
 	if err != nil {
 		return err
 	}
@@ -62,7 +62,7 @@ func (r *NginxIngressControllerReconciler) checkPrerequisites(log logr.Logger, i
 		}
 		ic := ingressClassForNginxIngressController(instance)
 
-		err, existed = r.createIfNotExists(ic)
+		existed, err = r.createIfNotExists(ic)
 		if err != nil {
 			return err
 		}