Do repo check in application trigger

Signed-off-by: Sam Lucidi <[email protected]>
mansam · Jul 10, 2024 · 81b6daf · 81b6daf
1 parent 7c85d47
commit 81b6daf
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 44 deletions.
diff --git a/api/application.go b/api/application.go
@@ -249,20 +249,18 @@ func (h ApplicationHandler) Create(ctx *gin.Context) {
 		return
 	}
 
-	if r.Repository != nil {
-		rtx := RichContext(ctx)
-		tr := trigger.Application{
-			Trigger: trigger.Trigger{
-				TaskManager: rtx.TaskManager,
-				Client:      rtx.Client,
-				DB:          h.DB(ctx),
-			},
-		}
-		err = tr.Created(m)
-		if err != nil {
-			_ = ctx.Error(err)
-			return
-		}
+	rtx := RichContext(ctx)
+	tr := trigger.Application{
+		Trigger: trigger.Trigger{
+			TaskManager: rtx.TaskManager,
+			Client:      rtx.Client,
+			DB:          h.DB(ctx),
+		},
+	}
+	err = tr.Created(m)
+	if err != nil {
+		_ = ctx.Error(err)
+		return
 	}
 
 	h.Respond(ctx, http.StatusCreated, r)
@@ -390,20 +388,18 @@ func (h ApplicationHandler) Update(ctx *gin.Context) {
 		}
 	}
 
-	if r.Repository != nil {
-		rtx := RichContext(ctx)
-		tr := trigger.Application{
-			Trigger: trigger.Trigger{
-				TaskManager: rtx.TaskManager,
-				Client:      rtx.Client,
-				DB:          h.DB(ctx),
-			},
-		}
-		err = tr.Updated(m)
-		if err != nil {
-			_ = ctx.Error(err)
-			return
-		}
+	rtx := RichContext(ctx)
+	tr := trigger.Application{
+		Trigger: trigger.Trigger{
+			TaskManager: rtx.TaskManager,
+			Client:      rtx.Client,
+			DB:          h.DB(ctx),
+		},
+	}
+	err = tr.Updated(m)
+	if err != nil {
+		_ = ctx.Error(err)
+		return
 	}
 
 	h.Status(ctx, http.StatusNoContent)

diff --git a/importer/manager.go b/importer/manager.go
@@ -344,22 +344,19 @@ func (m *Manager) createApplication(imp *model.Import) (ok bool) {
 		imp.ErrorMessage = result.Error.Error()
 		return
 	}
-
-	if repository.URL != "" {
-		// best effort
-		tr := trigger.Application{
-			Trigger: trigger.Trigger{
-				TaskManager: m.TaskManager,
-				Client:      m.Client,
-				DB:          m.DB,
-			},
-		}
-		err := tr.Created(app)
-		if err != nil {
-			imp.ErrorMessage = fmt.Sprintf(
-				"Failed to launch discovery tasks for Application '%s'.",
-				app.Name)
-		}
+	// best effort
+	tr := trigger.Application{
+		Trigger: trigger.Trigger{
+			TaskManager: m.TaskManager,
+			Client:      m.Client,
+			DB:          m.DB,
+		},
+	}
+	err := tr.Created(app)
+	if err != nil {
+		imp.ErrorMessage = fmt.Sprintf(
+			"Failed to launch discovery tasks for Application '%s'.",
+			app.Name)
 	}
 
 	ok = true

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,6 +23,9 @@ 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