[ArgoCD] Fixing webhook typo in case of error in GetManifests (#9671)

nfillot · Nicolas Fillot · crenshaw-dev · commit 4871daae6c26 · 2022-06-23T09:26:55.000-04:00
Signed-off-by: Nicolas Fillot &lt;nfillot@weborama.com&gt;

Co-authored-by: Nicolas Fillot &lt;nfillot@weborama.com&gt;
Signed-off-by: Michael Crenshaw &lt;michael@crenshaw.dev&gt;
diff --git a/util/webhook/webhook.go b/util/webhook/webhook.go
@@ -270,7 +270,7 @@ func (a *ArgoCDWebhookHandler) storePreviouslyCachedManifests(app *v1alpha1.Appl
 		return err
 	}
 	var cachedManifests cache.CachedManifestResponse
-	if err := a.repoCache.GetManifests(change.shaBefore, &app.Spec.Source, &clusterInfo, app.Spec.Destination.Namespace, trackingMethod, appInstanceLabelKey, app.Name, &cachedManifests); err == nil {
+	if err := a.repoCache.GetManifests(change.shaBefore, &app.Spec.Source, &clusterInfo, app.Spec.Destination.Namespace, trackingMethod, appInstanceLabelKey, app.Name, &cachedManifests); err != nil {
 		return err
 	}
 	if err = a.repoCache.SetManifests(change.shaAfter, &app.Spec.Source, &clusterInfo, app.Spec.Destination.Namespace, trackingMethod, appInstanceLabelKey, app.Name, &cachedManifests); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ func (a ArgoCDWebhookHandler) storePreviouslyCachedManifests(app v1alpha1.Appl`
`270`	`270`	`return err`
`271`	`271`	`}`
`272`	`272`	`var cachedManifests cache.CachedManifestResponse`
`273`		`- if err := a.repoCache.GetManifests(change.shaBefore, &app.Spec.Source, &clusterInfo, app.Spec.Destination.Namespace, trackingMethod, appInstanceLabelKey, app.Name, &cachedManifests); err == nil {`
	`273`	`+ if err := a.repoCache.GetManifests(change.shaBefore, &app.Spec.Source, &clusterInfo, app.Spec.Destination.Namespace, trackingMethod, appInstanceLabelKey, app.Name, &cachedManifests); err != nil {`
`274`	`274`	`return err`
`275`	`275`	`}`
`276`	`276`	`if err = a.repoCache.SetManifests(change.shaAfter, &app.Spec.Source, &clusterInfo, app.Spec.Destination.Namespace, trackingMethod, appInstanceLabelKey, app.Name, &cachedManifests); err != nil {`