From 102720cfbbe4e3245efc856917fe89bc79ab09b2 Mon Sep 17 00:00:00 2001 From: Klesh Wong Date: Thu, 16 May 2024 15:00:41 +0800 Subject: [PATCH] fix: should not throw error on any shallow cloned repo --- backend/plugins/gitextractor/parser/clone_gitcli.go | 9 ++------- backend/plugins/gitextractor/tasks/repo_cloner.go | 5 +---- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/backend/plugins/gitextractor/parser/clone_gitcli.go b/backend/plugins/gitextractor/parser/clone_gitcli.go index 745af661a03..49ce4c4ad6e 100644 --- a/backend/plugins/gitextractor/parser/clone_gitcli.go +++ b/backend/plugins/gitextractor/parser/clone_gitcli.go @@ -34,8 +34,7 @@ import ( ) var _ RepoCloner = (*GitcliCloner)(nil) -var ErrShallowInfoProcessing = errors.BadInput.New("No data found for the selected time range. Please revise the 'Time Range' on your Project/Blueprint/Configuration page or in the API parameter.") -var ErrNoDataOnIncrementalMode = errors.NotModified.New("No data found since the previous run.") +var ErrNoData = errors.NotModified.New("No data to be collected") type GitcliCloner struct { logger log.Logger @@ -84,10 +83,6 @@ func (g *GitcliCloner) CloneRepo(ctx plugin.SubTaskContext, localDir string) err } err = g.execCloneCommand(cmd) if err != nil { - // it is likely that nothing to collect on incrmental mode - if errors.Is(err, ErrShallowInfoProcessing) && g.stateManager != nil && g.stateManager.IsIncremental() { - return ErrNoDataOnIncrementalMode - } return err } // deepen the commits by 1 more step to avoid https://github.com/apache/incubator-devlake/issues/7426 @@ -222,7 +217,7 @@ func (g *GitcliCloner) execCloneCommand(cmd *exec.Cmd) errors.Error { g.logger.Error(err, "git exited with error\n%s", combinedOutput.String()) if strings.Contains(combinedOutput.String(), "stderr: fatal: error processing shallow info: 4") || strings.Contains(combinedOutput.String(), "stderr: fatal: the remote end hung up unexpectedly") { - return ErrShallowInfoProcessing + return ErrNoData } return errors.Default.New("git exit error") } diff --git a/backend/plugins/gitextractor/tasks/repo_cloner.go b/backend/plugins/gitextractor/tasks/repo_cloner.go index cf5e03ca539..a00b447b32f 100644 --- a/backend/plugins/gitextractor/tasks/repo_cloner.go +++ b/backend/plugins/gitextractor/tasks/repo_cloner.go @@ -56,13 +56,10 @@ func CloneGitRepo(subTaskCtx plugin.SubTaskContext) errors.Error { repoCloner := parser.NewGitcliCloner(subTaskCtx) err = repoCloner.CloneRepo(subTaskCtx, localDir) if err != nil { - if errors.Is(err, parser.ErrNoDataOnIncrementalMode) { + if errors.Is(err, parser.ErrNoData) { taskData.SkipAllSubtasks = true return nil } - if errors.Is(err, parser.ErrShallowInfoProcessing) { - return nil - } return err }