Skip to content

Modern Docker Management, Designed for Everyone

fix: projects retain gitManagedBy after the git sync is removed (#1613)

Kyle Mendell9a6d3d0c8e60
diff --git a/backend/internal/services/gitops_sync_service.go b/backend/internal/services/gitops_sync_service.go
index 75d8973b1..01ce57156 100644
--- a/backend/internal/services/gitops_sync_service.go
+++ b/backend/internal/services/gitops_sync_service.go
@@ -246,8 +246,22 @@ func (s *GitOpsSyncService) DeleteSync(ctx context.Context, environmentID, id st
return err
}
- if err := s.db.WithContext(ctx).Where("id = ?", id).Delete(&models.GitOpsSync{}).Error; err != nil {
- return fmt.Errorf("failed to delete sync: %w", err)
+ if err := s.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+ // Clear gitops_managed_by for the associated project, if any.
+ if sync.ProjectID != nil && *sync.ProjectID != "" {
+ if err := tx.Model(&models.Project{}).
+ Where("id = ? AND gitops_managed_by = ?", *sync.ProjectID, id).
+ Update("gitops_managed_by", nil).Error; err != nil {
+ return fmt.Errorf("failed to clear gitops_managed_by: %w", err)
+ }
+ }
+
+ if err := tx.Where("id = ?", id).Delete(&models.GitOpsSync{}).Error; err != nil {
+ return fmt.Errorf("failed to delete sync: %w", err)
+ }
+ return nil
+ }); err != nil {
+ return err
}
// Log event