⚠️ Only trigger discovery tasks if the Application has a repository s…

…pecified (konveyor#715) Signed-off-by: Sam Lucidi <[email protected]>
mansam · Jul 11, 2024 · 5c139ac · 5c139ac
1 parent 0e52e70
commit 5c139ac
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/migration/v14/model/application.go b/migration/v14/model/application.go
@@ -296,3 +296,11 @@ type ImportTag struct {
 	ImportID uint `gorm:"index"`
 	Import   *Import
 }
+
+type Repository struct {
+	Kind   string `json:"kind"`
+	URL    string `json:"url"`
+	Branch string `json:"branch"`
+	Tag    string `json:"tag"`
+	Path   string `json:"path"`
+}
diff --git a/model/pkg.go b/model/pkg.go
@@ -56,6 +56,7 @@ type TaskError = model.TaskError
 type TaskEvent = model.TaskEvent
 type TaskPolicy = model.TaskPolicy
 type Attachment = model.Attachment
+type Repository = model.Repository
 
 // Join tables
 type ApplicationTag = model.ApplicationTag

diff --git a/trigger/application.go b/trigger/application.go
@@ -23,14 +23,17 @@ func (r *Application) Updated(m *model.Application) (err error) {
 	if !Settings.Discovery.Enabled {
 		return
 	}
+	if len(m.Repository) == 0 || string(m.Repository) == "null" {
+		return
+	}
 	kinds, err := r.FindTasks(Settings.Discovery.Label)
 	if err != nil {
 		return
 	}
 	for _, kind := range kinds {
 		t := &tasking.Task{Task: &model.Task{}}
 		t.Kind = kind.Name
-		t.Name = fmt.Sprintf("%s-%s", m.Name, t.Name)
+		t.Name = fmt.Sprintf("%s-%s", m.Name, t.Kind)
 		t.ApplicationID = &m.ID
 		t.State = tasking.Ready
 		err = r.TaskManager.Create(r.DB, t)