fix: sensor controller validate sensor (#1378)

Signed-off-by: luca-iachini <[email protected]>
argoproj · Oct 14, 2021 · 79c472d · 79c472d
1 parent 790ab8d
commit 79c472d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/controllers/sensor/validate.go b/controllers/sensor/validate.go
@@ -54,13 +54,13 @@ func validateTriggers(triggers []v1alpha1.Trigger) error {
 	trigNames := make(map[string]bool)
 
 	for _, trigger := range triggers {
+		if err := validateTriggerTemplate(trigger.Template); err != nil {
+			return err
+		}
 		if _, ok := trigNames[trigger.Template.Name]; ok {
 			return fmt.Errorf("duplicate trigger name: %s", trigger.Template.Name)
 		}
 		trigNames[trigger.Template.Name] = true
-		if err := validateTriggerTemplate(trigger.Template); err != nil {
-			return err
-		}
 		if err := validateTriggerPolicy(&trigger); err != nil {
 			return err
 		}

diff --git a/controllers/sensor/validate_test.go b/controllers/sensor/validate_test.go
@@ -115,4 +115,15 @@ func TestValidTriggers(t *testing.T) {
 		assert.NotNil(t, err)
 		assert.Equal(t, true, strings.Contains(err.Error(), "duplicate trigger name:"))
 	})
+
+	t.Run("empty trigger template", func(t *testing.T) {
+		triggers := []v1alpha1.Trigger{
+			{
+				Template: nil,
+			},
+		}
+		err := validateTriggers(triggers)
+		assert.NotNil(t, err)
+		assert.Equal(t, true, strings.Contains(err.Error(), "trigger template can't be nil"))
+	})
 }