chore: fix transformed checks deleting logic

flanksource · Jul 11, 2023 · 5906b72 · 5906b72
1 parent 189f346
commit 5906b72
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/pkg/db/canary.go b/pkg/db/canary.go
@@ -96,10 +96,6 @@ func PersistCheck(check pkg.Check, canaryID uuid.UUID) (uuid.UUID, error) {
 		"deleted_at":  nil,
 	}
 
-	// Deletions for transformed checks are handled separately
-	if check.Transformed {
-		delete(assignments, "deleted_at")
-	}
 	tx := Gorm.Clauses(clause.OnConflict{
 		Columns:   []clause.Column{{Name: "canary_id"}, {Name: "type"}, {Name: "name"}, {Name: "agent_id"}},
 		DoUpdates: clause.Assignments(assignments),
@@ -178,13 +174,10 @@ func DeleteChecks(id []string) error {
 	return Gorm.Table("checks").Where("id IN (?)", id).UpdateColumn("deleted_at", time.Now()).Error
 }
 
-func GetCanary(id string) (*pkg.Canary, error) {
-	var model *pkg.Canary
-	if err := Gorm.Where("id = ?", id).First(&model).Error; err != nil {
-		return nil, err
-	}
-
-	return model, nil
+func GetCanary(id string) (pkg.Canary, error) {
+	var model pkg.Canary
+	err := Gorm.Where("id = ?", id).First(&model).Error
+	return model, err
 }
 
 func FindCanaryByID(id string) (*pkg.Canary, error) {

diff --git a/pkg/jobs/canary/canary_jobs.go b/pkg/jobs/canary/canary_jobs.go
@@ -51,7 +51,8 @@ func StartScanCanaryConfigs(dataFile string, configFiles []string) {
 type CanaryJob struct {
 	*kommons.Client
 	Kubernetes kubernetes.Interface
-	v1.Canary
+	Canary     v1.Canary
+	DBCanary   pkg.Canary
 	// model   pkg.Canary
 	LogPass bool
 	LogFail bool
@@ -216,7 +217,7 @@ type CanaryStatusPayload struct {
 
 func findCronEntry(id string) *cron.Entry {
 	for _, entry := range CanaryScheduler.Entries() {
-		if entry.Job.(CanaryJob).GetPersistedID() == id {
+		if entry.Job.(CanaryJob).Canary.GetPersistedID() == id {
 			return &entry
 		}
 	}
@@ -268,6 +269,7 @@ func SyncCanaryJob(canary v1.Canary) error {
 		Client:     Kommons,
 		Kubernetes: Kubernetes,
 		Canary:     canary,
+		DBCanary:   dbCanary,
 		LogPass:    canary.IsTrace() || canary.IsDebug() || LogPass,
 		LogFail:    canary.IsTrace() || canary.IsDebug() || LogFail,
 	}
@@ -361,7 +363,7 @@ func DeleteCanaryJob(id string) {
 }
 
 func ReconcileDeletedCanaryChecks() {
-	jobHistory := models.NewJobHistory("ReconcileDeletedTopologyComponents", "", "").Start()
+	jobHistory := models.NewJobHistory("ReconcileDeletedCanaryChecks", "", "").Start()
 	_ = db.PersistJobHistory(jobHistory)
 	defer func() { _ = db.PersistJobHistory(jobHistory.End()) }()