Merge pull request #1594 from flanksource/find-correct-component-pers…

…istence

fix: filter components by agent when persisting them

pkg/db/topology.go

@@ -227,7 +227,7 @@ func DeleteInlineCanariesForComponent(db *gorm.DB, componentID string) error {
 }
 
 func GetActiveComponentsIDsOfTopology(db *gorm.DB, topologyID string) (compIDs []uuid.UUID, err error) {
-	if err := db.Table("components").Where("deleted_at is NULL and topology_id = ?", topologyID).Select("id").Find(&compIDs).Error; err != nil {
+	if err := db.Table("components").Where("deleted_at is NULL AND topology_id = ?", topologyID).Select("id").Find(&compIDs).Error; err != nil {
 		return nil, err
 	}
 	return

pkg/system_api.go

@@ -156,7 +156,7 @@ type Component struct {
 
 func (component *Component) FindExisting(db *gorm.DB) (*models.Component, error) {
 	var existing models.Component
-	tx := db.Model(component).Select("id", "deleted_at")
+	tx := db.Model(component).Select("id", "deleted_at").Where("agent_id = ?", uuid.Nil)
 	if component.ID == uuid.Nil {
 		if component.ParentId == nil {
 			tx = tx.Find(&existing, "name = ? AND type = ? and parent_id is NULL", component.Name, component.Type)