fix: change interface of Clone

Author: scastlara

internal/patrol/patrol.go

@@ -198,7 +198,7 @@ func (s *sheriffService) scanProject(project repository.Project) (report *scanne
 
 	// Clone the project
 	log.Info().Str("project", project.Path).Str("dir", dir).Str("url", project.RepoUrl).Msg("Cloning project")
-	if err := s.repoService.Provide(project.Repository).Clone(project.RepoUrl, dir); err != nil {
+	if err := s.repoService.Provide(project.Repository).Clone(project, dir); err != nil {
 		return nil, errors.Join(fmt.Errorf("failed to clone project %v", project.Path), err)
 	}
 

internal/patrol/patrol_test.go

@@ -239,8 +239,8 @@ func (c *mockClient) OpenVulnerabilityIssue(project repository.Project, report s
 	return args.Get(0).(*repository.Issue), args.Error(1)
 }
 
-func (c *mockClient) Clone(url string, dir string) error {
-	args := c.Called(url, dir)
+func (c *mockClient) Clone(project repository.Project, dir string) error {
+	args := c.Called(project.RepoUrl, dir)
 	return args.Error(0)
 }
 

internal/publish/to_issue_test.go

@@ -242,7 +242,7 @@ func (c *mockGitlabService) OpenVulnerabilityIssue(project repository.Project, r
 	return args.Get(0).(*repository.Issue), args.Error(1)
 }
 
-func (c *mockGitlabService) Clone(url string, dir string) error {
-	args := c.Called(url, dir)
+func (c *mockGitlabService) Clone(project repository.Project, dir string) error {
+	args := c.Called(project.RepoUrl, dir)
 	return args.Error(0)
 }

internal/repository/github/github.go

@@ -67,9 +67,9 @@ func (s githubService) OpenVulnerabilityIssue(project repository.Project, report
 	return nil, errors.New("OpenVulnerabilityIssue not yet implemented") // TODO #9 Add github support
 }
 
-func (s githubService) Clone(url string, dir string) (err error) {
+func (s githubService) Clone(project repository.Project, dir string) (err error) {
 	_, err = git.PlainClone(dir, false, &git.CloneOptions{
-		URL: url,
+		URL: project.RepoUrl,
 		Auth: &http.BasicAuth{
 			Username: "N/A",
 			Password: s.token,

internal/repository/gitlab/gitlab.go

@@ -2,11 +2,11 @@ package gitlab
 
 import (
 	"archive/tar"
+	"bytes"
 	"compress/gzip"
 	"errors"
 	"fmt"
 	"io"
-	"net/url"
 	"os"
 	"path/filepath"
 	"sheriff/internal/repository"
@@ -120,16 +120,8 @@ func (s gitlabService) OpenVulnerabilityIssue(project repository.Project, report
 	return
 }
 
-func (s gitlabService) Clone(url string, dir string) (err error) {
-	// Extract project ID from GitLab URL
-	projectID, err := s.extractProjectIDFromURL(url)
-	if err != nil {
-		return fmt.Errorf("failed to extract project ID from URL: %w", err)
-	}
-
-	log.Debug().Str("url", url).Str("extractedProjectID", projectID).Msg("Attempting to download archive")
-
-	archiveData, _, err := s.client.Archive(projectID, &gitlab.ArchiveOptions{})
+func (s gitlabService) Clone(project repository.Project, dir string) (err error) {
+	archiveData, _, err := s.client.Archive(project.ID, &gitlab.ArchiveOptions{})
 	if err != nil {
 		return fmt.Errorf("failed to download archive: %w", err)
 	}
@@ -360,22 +352,9 @@ func mapIssuePtr(i *gitlab.Issue) *repository.Issue {
 	return &issue
 }
 
-// extractProjectIDFromURL extracts the project ID from a GitLab repository URL
-func (s gitlabService) extractProjectIDFromURL(repoURL string) (string, error) {
-	// Parse URL to extract the project path
-	u, err := url.Parse(repoURL)
-	if err != nil {
-		return "", err
-	}
-
-	// Remove .git suffix if present and leading/trailing slashes
-	path := strings.TrimSuffix(strings.Trim(u.Path, "/"), ".git")
-
-	return path, nil
-}
-
 // extractTarGz extracts a tar.gz archive
 func (s gitlabService) extractTarGz(reader io.Reader, destDir string) error {
+	// TODO(#52): Move to a separate package when implementing GitHub "clone" through downloading archives
 	gzReader, err := gzip.NewReader(reader)
 	if err != nil {
 		return fmt.Errorf("failed to create gzip reader: %w", err)

internal/repository/gitlab/gitlab_test.go

@@ -202,44 +202,28 @@ func TestDereferenceProjectsPointers(t *testing.T) {
 	assert.Equal(t, 2, dereferencedProjects[1].ID)
 	assert.Equal(t, 2, errCount)
 }
-
-func TestExtractProjectIDFromURL(t *testing.T) {
-	svc := gitlabService{}
-
-	// Test basic GitLab URL with .git suffix
-	result, err := svc.extractProjectIDFromURL("https://gitlab.com/group/project.git")
-	assert.NoError(t, err)
-	assert.Equal(t, "group/project", result)
-
-	// Test GitLab URL without .git suffix
-	result, err = svc.extractProjectIDFromURL("https://gitlab.com/group/project")
-	assert.NoError(t, err)
-	assert.Equal(t, "group/project", result)
-
-	// Test nested group project
-	result, err = svc.extractProjectIDFromURL("https://gitlab.com/group/subgroup/project.git")
-	assert.NoError(t, err)
-	assert.Equal(t, "group/subgroup/project", result)
-}
-
 func TestCloneCompleteFlow(t *testing.T) {
 	// Create temporary directory for testing
 	tempDir, err := os.MkdirTemp("", "sheriff-clone-test-")
 	require.NoError(t, err)
 	defer os.RemoveAll(tempDir)
 
-	// Load the stub tar.gz file
 	stubArchive, err := os.ReadFile("testdata/sample-archive.tar.gz")
 	require.NoError(t, err)
 
-	// Setup mock client
 	mockClient := mockClient{}
-	mockClient.On("Archive", "group/project", mock.Anything, mock.Anything).Return(stubArchive, &gitlab.Response{}, nil)
+	mockClient.On("Archive", 123, mock.Anything, mock.Anything).Return(stubArchive, &gitlab.Response{}, nil)
 
 	svc := gitlabService{client: &mockClient}
 
-	// Test the complete Clone flow
-	err = svc.Clone("https://gitlab.com/group/project.git", tempDir)
+	// Create a test project
+	testProject := repository.Project{
+		ID:   123,
+		Name: "test-project",
+		Path: "group/project",
+	}
+
+	err = svc.Clone(testProject, tempDir)
 
 	// Verify no errors
 	assert.NoError(t, err)

internal/repository/repository.go

@@ -30,5 +30,5 @@ type IRepositoryService interface {
 	GetProjectList(paths []string) (projects []Project, warn error)
 	CloseVulnerabilityIssue(project Project) error
 	OpenVulnerabilityIssue(project Project, report string) (*Issue, error)
-	Clone(url string, dir string) error
+	Clone(project Project, dir string) error
 }