Merge pull request #1528 from flanksource/fix-del-topology

fix: gorm query for deleting topology
flanksource · Dec 26, 2023 · 97db195 · 97db195
2 parents 98b8811 + 45136fa
commit 97db195
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/pkg/db/topology.go b/pkg/db/topology.go
@@ -310,12 +310,10 @@ func UpdateStatusAndSummaryForComponent(id uuid.UUID, status types.ComponentStat
 
 func DeleteTopology(t *v1.Topology) error {
 	logger.Infof("Deleting topology %s/%s", t.Namespace, t.Name)
-	model := pkg.TopologyFromV1(t)
 	deleteTime := time.Now()
 
-	tx := Gorm.Table("topologies").Find(model, "id = ?", t.GetPersistedID()).UpdateColumn("deleted_at", deleteTime)
-	if tx.Error != nil {
-		return tx.Error
+	if err := Gorm.Table("topologies").Where("id = ?", t.GetPersistedID()).UpdateColumn("deleted_at", deleteTime).Error; err != nil {
+		return fmt.Errorf("failed to update deleted_at for topology[%s]: %w", t.GetPersistedID(), err)
 	}
 	return DeleteComponentsOfTopology(t.GetPersistedID(), deleteTime)
 }