separate error and nil conditions for clarity

commercetools · Oct 9, 2024 · 9874680 · 9874680
1 parent 1a5819d
commit 9874680
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/internal/pkg/argocd/argocd.go b/internal/pkg/argocd/argocd.go
@@ -324,9 +324,12 @@ func SetArgoCDAppRevision(ctx context.Context, componentPath string, revision st
 		return fmt.Errorf("Error creating ArgoCD clients: %w", err)
 	}
 	foundApp, err = findArgocdApp(ctx, componentPath, repo, ac.app, useSHALabelForArgoDicovery)
-	if foundApp == nil || err != nil {
+	if err != nil {
 		return fmt.Errorf("error finding ArgoCD application for component path %s: %w", componentPath, err)
 	}
+	if foundApp == nil {
+		return fmt.Errorf("no ArgoCD application was found for component path: %s", componentPath)
+	}
 	if foundApp.Spec.Source.TargetRevision == revision {
 		log.Infof("App %s already has revision %s", foundApp.Name, revision)
 		return nil