fix: webhook don't refresh apps pointing to HEAD (#4717)

argoproj · Oct 30, 2020 · 97003ca · 97003ca
1 parent 42ebb22
commit 97003ca
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/util/webhook/webhook.go b/util/webhook/webhook.go
@@ -307,9 +307,7 @@ func ensureAbsPath(input string) string {
 func appRevisionHasChanged(app *v1alpha1.Application, revision string, touchedHead bool) bool {
 	targetRev := app.Spec.Source.TargetRevision
 	if targetRev == "HEAD" || targetRev == "" { // revision is head
-		if !touchedHead { // and head has not updated
-			return false // revision has not changed
-		}
+		return touchedHead
 	}
 
 	return targetRev == revision

diff --git a/util/webhook/webhook_test.go b/util/webhook/webhook_test.go
@@ -155,3 +155,25 @@ func Test_getAppRefreshPrefix(t *testing.T) {
 		})
 	}
 }
+
+func TestAppRevisionHasChanged(t *testing.T) {
+	assert.True(t, appRevisionHasChanged(&v1alpha1.Application{Spec: v1alpha1.ApplicationSpec{
+		Source: v1alpha1.ApplicationSource{},
+	}}, "master", true))
+
+	assert.False(t, appRevisionHasChanged(&v1alpha1.Application{Spec: v1alpha1.ApplicationSpec{
+		Source: v1alpha1.ApplicationSource{},
+	}}, "master", false))
+
+	assert.False(t, appRevisionHasChanged(&v1alpha1.Application{Spec: v1alpha1.ApplicationSpec{
+		Source: v1alpha1.ApplicationSource{
+			TargetRevision: "dev",
+		},
+	}}, "master", true))
+
+	assert.True(t, appRevisionHasChanged(&v1alpha1.Application{Spec: v1alpha1.ApplicationSpec{
+		Source: v1alpha1.ApplicationSource{
+			TargetRevision: "dev",
+		},
+	}}, "dev", false))
+}