From cbdad33e1c534e3111c8c8245b5e290ff758b2ce Mon Sep 17 00:00:00 2001
From: Peter Grlica <peter.grlica@gmail.com>
Date: Fri, 22 Dec 2023 12:13:23 +0100
Subject: [PATCH] Remove enabled setting on record deduplication

---
 server/compose/service/record.go | 6 +-----
 server/compose/types/module.go   | 2 --
 server/pkg/provision/dedup.go    | 4 +++-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/server/compose/service/record.go b/server/compose/service/record.go
index 5d752d929..6b96e5383 100644
--- a/server/compose/service/record.go
+++ b/server/compose/service/record.go
@@ -2025,11 +2025,7 @@ func (svc record) DupDetection(ctx context.Context, m *types.Module, rec *types.
 		config = m.Config.RecordDeDup
 	)
 
-	if !config.Enabled {
-		return
-	}
-
-	if len(config.Rules) > 0 {
+	if len(config.Rules) > 0 && config.Rules.Validate() == nil {
 		records, _, err = svc.Find(ctx, types.RecordFilter{
 			ModuleID:    m.ID,
 			NamespaceID: m.NamespaceID,
diff --git a/server/compose/types/module.go b/server/compose/types/module.go
index 00f431fa0..8ec430d9c 100644
--- a/server/compose/types/module.go
+++ b/server/compose/types/module.go
@@ -90,8 +90,6 @@ type (
 	}
 
 	ModuleConfigRecordDeDup struct {
-		Enabled bool `json:"enabled"`
-
 		// strictly restrict record saving
 		// 		otherwise show a warning with list of duplicated records
 		Strict bool `json:"-"`
diff --git a/server/pkg/provision/dedup.go b/server/pkg/provision/dedup.go
index 635a2481c..b992bef93 100644
--- a/server/pkg/provision/dedup.go
+++ b/server/pkg/provision/dedup.go
@@ -15,12 +15,14 @@ func invalidateDedupRules(ctx context.Context, log *zap.Logger, s store.Storer)
 		return
 	}
 
+	// find only the invalid ones and empty the rules, leave the valid ones
+	// as they were
 	ll, _ = ll.Filter(func(m *types.Module) (bool, error) {
 		return m.Config.RecordDeDup.Rules.Validate() != nil, nil
 	})
 
 	ll.Walk(func(m *types.Module) error {
-		m.Config.RecordDeDup.Enabled = false
+		m.Config.RecordDeDup.Rules = types.DeDupRuleSet{}
 		return nil
 	})