Fix code

vshn · Mar 25, 2024 · 69f1fea · 69f1fea
1 parent ef44644
commit 69f1fea
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 31 deletions.
diff --git a/controllers/database_controller.go b/controllers/database_controller.go
@@ -192,9 +192,8 @@ func (r *DatabaseReconciler) deleteDatabase(dr *DatabaseReconciliation, instance
 	r.Log.V(1).Info("setup Stardog Client from ", "ref", instance)
 	auth, disabled, err := dr.reconciliationContext.initStardogClientFromRef(r.Client, instance)
 	if err != nil || disabled {
-		if err != nil {
-			return fmt.Errorf("cannot initialize stardog client: %v", err)
-		}
+		r.Log.Info("skipping resource from reconciliation", "instance", instance.Name, "resource", srr.resource.Name)
+		return nil
 		r.Log.Info("skipping resource from reconciliation", "instance", instance.Name, "resource", dr.resource.Name)
 		return nil
 	}
@@ -338,10 +337,10 @@ func (r *DatabaseReconciler) sync(dr *DatabaseReconciliation, instance stardogv1
 	customUserEnabled := customUser != ""
 
 	auth, disabled, err := rc.initStardogClientFromRef(r.Client, instance)
-	if err != nil || disabled {
-		if err != nil {
-			return fmt.Errorf("cannot initialize stardog client: %v", err)
-		}
+	if err != nil {
+		return fmt.Errorf("cannot initialize stardog client: %v", err)
+	}
+	if disabled {
 		r.Log.Info("skipping resource from reconciliation", "instance", instance.Name, "resource", dr.resource.Name)
 		return nil
 	}

diff --git a/controllers/organization_controller.go b/controllers/organization_controller.go
@@ -208,10 +208,10 @@ func (r *OrganizationReconciler) sync(or *OrganizationReconciliation, instance s
 	stardogClient := or.reconciliationContext.stardogClient
 
 	auth, disabled, err := rc.initStardogClientFromRef(r.Client, instance)
-	if err != nil || disabled {
-		if err != nil {
-			return fmt.Errorf("cannot initialize stardog client: %v", err)
-		}
+	if err != nil {
+		return fmt.Errorf("cannot initialize stardog client: %v", err)
+	}
+	if disabled {
 		r.Log.Info("skipping resource from reconciliation", "instance", instance.Name, "resource", or.resource.Name)
 		return nil
 	}
@@ -423,10 +423,11 @@ func (r *OrganizationReconciler) deleteOrganization(or *OrganizationReconciliati
 
 	r.Log.V(1).Info("setup Stardog Client from ", "ref", instance)
 	auth, disabled, err := or.reconciliationContext.initStardogClientFromRef(r.Client, instance)
-	if err != nil || disabled {
-		if err != nil {
-			return fmt.Errorf("cannot initialize stardog client: %v", err)
-		}
+	if err != nil {
+		return fmt.Errorf("cannot initialize stardog client: %v", err)
+
+	}
+	if disabled {
 		r.Log.Info("skipping resource from reconciliation", "instance", instance.Name, "resource", or.resource.Name)
 		return nil
 	}

diff --git a/controllers/stardogrole_controller.go b/controllers/stardogrole_controller.go
@@ -124,10 +124,10 @@ func (r *StardogRoleReconciler) syncRole(srr *StardogRoleReconciliation) error {
 
 	r.Log.V(1).Info("init Stardog Client from ", "ref", spec.StardogInstanceRef)
 	auth, disabled, err := srr.reconciliationContext.initStardogClientFromRef(r.Client, instance)
-	if err != nil || disabled {
-		if err != nil {
-			return fmt.Errorf("cannot initialize stardog client: %v", err)
-		}
+	if err != nil {
+		return fmt.Errorf("cannot initialize stardog client: %v", err)
+	}
+	if disabled {
 		r.Log.Info("skipping resource from reconciliation", "instance", instance.Name, "resource", srr.resource.Name)
 		return nil
 	}
@@ -258,10 +258,10 @@ func (r *StardogRoleReconciler) finalize(srr *StardogRoleReconciliation) error {
 	instance := v1beta1.NewStardogInstanceRef(spec.StardogInstanceRef, namespace)
 	r.Log.V(1).Info("setup Stardog Client from ", "ref", spec.StardogInstanceRef)
 	auth, disabled, err := srr.reconciliationContext.initStardogClientFromRef(r.Client, instance)
-	if err != nil || disabled {
-		if err != nil {
-			return fmt.Errorf("cannot initialize stardog client: %v", err)
-		}
+	if err != nil {
+		return fmt.Errorf("cannot initialize stardog client: %v", err)
+	}
+	if disabled {
 		r.Log.Info("skipping resource from reconciliation", "instance", instance.Name, "resource", srr.resource.Name)
 		return nil
 	}

diff --git a/controllers/stardoguser_controller.go b/controllers/stardoguser_controller.go
@@ -141,10 +141,10 @@ func (r *StardogUserReconciler) finalize(sur *StardogUserReconciliation) error {
 
 	r.Log.V(1).Info("setup Stardog Client from ", "ref", spec.StardogInstanceRef)
 	auth, disabled, err := rc.initStardogClientFromRef(r.Client, instance)
-	if err != nil || disabled {
-		if err != nil {
-			return fmt.Errorf("cannot initialize stardog client: %v", err)
-		}
+	if err != nil {
+		return fmt.Errorf("cannot initialize stardog client: %v", err)
+	}
+	if disabled {
 		r.Log.Info("skipping resource from reconciliation", "instance", instance.Name, "resource", sur.resource.Name)
 		return nil
 	}
@@ -176,10 +176,10 @@ func (r *StardogUserReconciler) syncUser(sur *StardogUserReconciliation) error {
 
 	r.Log.V(1).Info("init Stardog Client from ", "ref", spec.StardogInstanceRef)
 	auth, disabled, err := rc.initStardogClientFromRef(r.Client, instance)
-	if err != nil || disabled {
-		if err != nil {
-			return fmt.Errorf("cannot initialize stardog client: %v", err)
-		}
+	if err != nil {
+		return fmt.Errorf("cannot initialize stardog client: %v", err)
+	}
+	if disabled {
 		r.Log.Info("skipping resource from reconciliation", "instance", instance.Name, "resource", sur.resource.Name)
 		return nil
 	}