[repo-assist] refactor(srcinfo): deduplicate VCS updates (#2917)

* refactor(srcinfo): deduplicate VCS updates

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* fix broken test

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Jo Garnier <me@jguer.space>

Author: 3 people

pkg/sync/srcinfo/service.go

@@ -75,26 +75,31 @@ func (s *Service) CheckPGPKeys(ctx context.Context) error {
 
 func (s *Service) UpdateVCSStore(ctx context.Context, targets []map[string]*dep.InstallInfo, ignore map[string]error,
 ) error {
+	targetPackages := make(map[string]struct{})
+	for _, target := range targets {
+		for pkgName := range target {
+			targetPackages[pkgName] = struct{}{}
+		}
+	}
+
 	for _, srcinfo := range s.srcInfos {
 		if srcinfo.Source == nil {
 			continue
 		}
 
-		// TODO: high complexity - refactor
 		for i := range srcinfo.Packages {
-			for j := range targets {
-				if _, ok := targets[j][srcinfo.Packages[i].Pkgname]; !ok {
-					s.log.Debugln("skipping VCS update for", srcinfo.Packages[i].Pkgname, "not in targets")
-					continue
-				}
-				if _, ok := ignore[srcinfo.Packages[i].Pkgname]; ok {
-					s.log.Debugln("skipping VCS update for", srcinfo.Packages[i].Pkgname, "due to install error")
-					continue
-				}
-
-				s.log.Debugln("checking VCS entry for", srcinfo.Packages[i].Pkgname, fmt.Sprintf("source: %v", srcinfo.Source))
-				s.vcsStore.Update(ctx, srcinfo.Packages[i].Pkgname, srcinfo.Source)
+			pkgName := srcinfo.Packages[i].Pkgname
+			if _, ok := targetPackages[pkgName]; !ok {
+				s.log.Debugln("skipping VCS update for", pkgName, "not in targets")
+				continue
 			}
+			if _, ok := ignore[pkgName]; ok {
+				s.log.Debugln("skipping VCS update for", pkgName, "due to install error")
+				continue
+			}
+
+			s.log.Debugln("checking VCS entry for", pkgName, fmt.Sprintf("source: %v", srcinfo.Source))
+			s.vcsStore.Update(ctx, pkgName, srcinfo.Source)
 		}
 	}
 

pkg/sync/srcinfo/service_test.go

@@ -103,30 +103,42 @@ func TestService_CheckPGPKeys(t *testing.T) {
 }
 
 func TestService_UpdateVCSStore(t *testing.T) {
+	vcsStore := &vcs.Mock{}
 	srv := &Service{
+		log: newTestLogger(),
 		srcInfos: map[string]*gosrc.Srcinfo{
 			"pkg1": {
 				Packages: []gosrc.Package{
 					{Pkgname: "pkg1"},
 				},
+				PackageBase: gosrc.PackageBase{
+					Source: []gosrc.ArchString{{Value: "git+https://example.com/pkg1.git"}},
+				},
 			},
 			"pkg2": {
 				Packages: []gosrc.Package{
 					{Pkgname: "pkg2"},
 				},
+				PackageBase: gosrc.PackageBase{
+					Source: []gosrc.ArchString{{Value: "git+https://example.com/pkg2.git"}},
+				},
 			},
 		},
-		vcsStore: &vcs.Mock{},
+		vcsStore: vcsStore,
 	}
 
 	targets := []map[string]*dep.InstallInfo{
 		{
 			"pkg1": {},
 			"pkg2": {},
 		},
+		{
+			"pkg1": {},
+		},
 	}
 	ignore := map[string]error{}
 
 	err := srv.UpdateVCSStore(context.Background(), targets, ignore)
 	assert.NoError(t, err)
+	assert.ElementsMatch(t, []string{"pkg1", "pkg2"}, vcsStore.Updates)
 }

pkg/vcs/mock.go

@@ -11,13 +11,15 @@ import (
 type Mock struct {
 	OriginsByPackage map[string]OriginInfoByURL
 	ToUpgradeReturn  []string
+	Updates          []string
 }
 
 func (m *Mock) ToUpgrade(ctx context.Context, pkgName string) bool {
 	return slices.Contains(m.ToUpgradeReturn, pkgName)
 }
 
 func (m *Mock) Update(ctx context.Context, pkgName string, sources []gosrc.ArchString) {
+	m.Updates = append(m.Updates, pkgName)
 }
 
 func (m *Mock) Save() error {