style: separate utils between pkg and internal

Author: BoxBoxJason

.gitignore

@@ -59,3 +59,4 @@ go.sum
 sonar-project.properties
 unit-tests.xml
 coverage.out
+republisher.sh

cmd/main.go

@@ -8,6 +8,7 @@ import (
 
 	"gitlab-sync/internal/mirroring"
 	"gitlab-sync/internal/utils"
+	"gitlab-sync/pkg/helpers"
 
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
@@ -58,14 +59,14 @@ func main() {
 			zap.L().Debug("Parsing mirror mapping file")
 			mapping, mappingErrors := utils.OpenMirrorMapping(mirrorMappingPath)
 			if mappingErrors != nil {
-				zap.L().Fatal("Error opening mirror mapping file", zap.Array("errors", utils.ErrorArray(mappingErrors)))
+				zap.L().Fatal("Error opening mirror mapping file", zap.Array("errors", helpers.ErrorArray(mappingErrors)))
 			}
 			zap.L().Debug("Mirror mapping file parsed successfully")
 			args.MirrorMapping = mapping
 
 			mirroringErrors := mirroring.MirrorGitlabs(&args)
 			if mirroringErrors != nil {
-				zap.L().Error("Error during mirroring process", zap.Array("errors", utils.ErrorArray(mirroringErrors)))
+				zap.L().Error("Error during mirroring process", zap.Array("errors", helpers.ErrorArray(mirroringErrors)))
 			}
 			zap.L().Info("Mirroring completed")
 		},

internal/mirroring/get.go

@@ -3,6 +3,7 @@ package mirroring
 import (
 	"fmt"
 	"gitlab-sync/internal/utils"
+	"gitlab-sync/pkg/helpers"
 	"path/filepath"
 	"strings"
 	"sync"
@@ -39,7 +40,7 @@ func (g *GitlabInstance) fetchAll(projectFilters map[string]struct{}, groupFilte
 	wg.Wait()
 	close(errCh)
 
-	return utils.MergeErrors(errCh)
+	return helpers.MergeErrors(errCh)
 }
 
 // getParentNamespaceID retrieves the parent namespace ID for a given project or group path.

internal/mirroring/get_group.go

@@ -3,6 +3,7 @@ package mirroring
 import (
 	"fmt"
 	"gitlab-sync/internal/utils"
+	"gitlab-sync/pkg/helpers"
 	"path/filepath"
 	"sync"
 
@@ -166,7 +167,7 @@ func (g *GitlabInstance) fetchAndProcessGroupsLargeInstance(groupFilters *map[st
 	// Wait for all goroutines to finish
 	wg.Wait()
 	close(errChan)
-	return utils.MergeErrors(errs)
+	return helpers.MergeErrors(errs)
 }
 
 // fetchAndProcessGroupRecursive fetches a group and its projects recursively

internal/mirroring/get_project.go

@@ -6,6 +6,7 @@ import (
 	"sync"
 
 	"gitlab-sync/internal/utils"
+	"gitlab-sync/pkg/helpers"
 
 	gitlab "gitlab.com/gitlab-org/api/client-go"
 	"go.uber.org/zap"
@@ -170,7 +171,7 @@ func (g *GitlabInstance) fetchAndProcessProjectsBigInstance(projectFilters *map[
 	for project := range projectsChan {
 		g.storeProject(project, project.PathWithNamespace, mirrorMapping)
 	}
-	return utils.MergeErrors(errCh)
+	return helpers.MergeErrors(errCh)
 }
 
 // fetchAndProcessGroupProjects retrieves all projects from the group and processes them to store in the instance cache.

internal/mirroring/main.go

@@ -6,6 +6,7 @@ import (
 	"sync"
 
 	"gitlab-sync/internal/utils"
+	"gitlab-sync/pkg/helpers"
 
 	gitlab "gitlab.com/gitlab-org/api/client-go"
 	"go.uber.org/zap"
@@ -80,7 +81,7 @@ func MirrorGitlabs(gitlabMirrorArgs *utils.ParserArgs) []error {
 	errCh <- destinationGitlabInstance.createProjects(sourceGitlabInstance, gitlabMirrorArgs.MirrorMapping)
 
 	close(errCh)
-	return utils.MergeErrors(errCh)
+	return helpers.MergeErrors(errCh)
 }
 
 // processFilters processes the filters for groups and projects.

internal/mirroring/post.go

@@ -6,6 +6,7 @@ import (
 	"sync"
 
 	"gitlab-sync/internal/utils"
+	"gitlab-sync/pkg/helpers"
 
 	gitlab "gitlab.com/gitlab-org/api/client-go"
 	"go.uber.org/zap"
@@ -33,7 +34,7 @@ func (destinationGitlab *GitlabInstance) createGroups(sourceGitlab *GitlabInstan
 		}
 	}
 	close(errorChan)
-	return utils.MergeErrors(errorChan)
+	return helpers.MergeErrors(errorChan)
 }
 
 // createGroup creates a GitLab group in the destination GitLab instance based on the source group and mirror mapping.
@@ -147,7 +148,7 @@ func (destinationGitlab *GitlabInstance) createProjects(sourceGitlab *GitlabInst
 	wg.Wait()
 	close(errorChan)
 
-	return utils.MergeErrors(errorChan)
+	return helpers.MergeErrors(errorChan)
 }
 
 // createProject creates a GitLab project in the destination GitLab instance based on the source project and mirror mapping.
@@ -285,7 +286,7 @@ func (destinationGitlab *GitlabInstance) mirrorReleases(sourceGitlab *GitlabInst
 	close(errorChan)
 
 	zap.L().Info("Releases mirroring completed", zap.String(ROLE_SOURCE, sourceProject.HTTPURLToRepo), zap.String(ROLE_DESTINATION, destinationProject.HTTPURLToRepo))
-	return utils.MergeErrors(errorChan)
+	return helpers.MergeErrors(errorChan)
 }
 
 // ============================================================ //

internal/mirroring/put.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"gitlab-sync/internal/utils"
+	"gitlab-sync/pkg/helpers"
 
 	gitlab "gitlab.com/gitlab-org/api/client-go"
 	"go.uber.org/zap"
@@ -193,7 +194,7 @@ func (destinationGitlabInstance *GitlabInstance) updateGroupFromSource(sourceGit
 	wg.Wait()
 	close(errorChan)
 
-	return utils.MergeErrors(errorChan)
+	return helpers.MergeErrors(errorChan)
 }
 
 // copyGroupAvatar copies the avatar from the source group to the destination group.

internal/utils/types.go

@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"gitlab-sync/pkg/helpers"
 	"os"
 	"path/filepath"
 	"strings"
@@ -139,7 +140,7 @@ func (m *MirrorMapping) check() []error {
 	m.checkGroups(errChan)
 
 	close(errChan)
-	return MergeErrors(errChan)
+	return helpers.MergeErrors(errChan)
 }
 
 // checkProjects checks if the projects are valid

internal/utils/types_test.go

@@ -2,6 +2,7 @@ package utils
 
 import (
 	"fmt"
+	"gitlab-sync/pkg/helpers"
 	"os"
 	"reflect"
 	"testing"
@@ -245,7 +246,7 @@ func TestCheck(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			errs := tt.mapping.check() // now returns []error
-			got := toStrings(errs)
+			got := helpers.ToStrings(errs)
 			if !reflect.DeepEqual(got, tt.wantMsgs) {
 				t.Errorf("check() = %v, want %v", got, tt.wantMsgs)
 			}