From a3203ef284716af81efae2afba38f9bbcf94576d Mon Sep 17 00:00:00 2001 From: Ansuman Satapathy Date: Tue, 30 Jul 2024 08:14:49 +0000 Subject: [PATCH] feat: [CDE-195]: missing repo type is treated as unknown for gitspaces (#2317) * feat: [CDE-195]: missing repo type is treated as unknown for gitspaces --- app/gitspace/scm/public_scm.go | 11 ++++++----- app/gitspace/scm/scm.go | 4 ++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/gitspace/scm/public_scm.go b/app/gitspace/scm/public_scm.go index 4ceefbc35..3a9cf246c 100644 --- a/app/gitspace/scm/public_scm.go +++ b/app/gitspace/scm/public_scm.go @@ -104,14 +104,15 @@ func (s GenericSCM) ResolveCredentials( _ context.Context, gitspaceConfig *types.GitspaceConfig, ) (*ResolvedCredentials, error) { - var resolvedDetails = &ResolvedDetails{} - resolvedDetails.Branch = gitspaceConfig.Branch - resolvedDetails.CloneURL = gitspaceConfig.CodeRepoURL + var resolvedCredentials = &ResolvedCredentials{ + Branch: gitspaceConfig.Branch, + CloneURL: gitspaceConfig.CodeRepoURL, + } repoURL, err := url.Parse(gitspaceConfig.CodeRepoURL) if err != nil { return nil, fmt.Errorf("failed to parse repository URL %s: %w", gitspaceConfig.CodeRepoURL, err) } repoName := strings.TrimSuffix(path.Base(repoURL.Path), ".git") - resolvedDetails.RepoName = repoName - return nil, err + resolvedCredentials.RepoName = repoName + return resolvedCredentials, err } diff --git a/app/gitspace/scm/scm.go b/app/gitspace/scm/scm.go index 0584f1223..66c94e9dd 100644 --- a/app/gitspace/scm/scm.go +++ b/app/gitspace/scm/scm.go @@ -26,6 +26,7 @@ import ( "github.com/harness/gitness/git/command" "github.com/harness/gitness/types" + "github.com/harness/gitness/types/enum" ) var ( @@ -88,6 +89,9 @@ func (s scm) GetSCMRepoDetails( gitspaceConfig *types.GitspaceConfig, ) (*ResolvedDetails, error) { filePath := devcontainerDefaultPath + if gitspaceConfig.CodeRepoType == "" { + gitspaceConfig.CodeRepoType = enum.CodeRepoTypeUnknown + } scmProvider, err := s.scmProviderFactory.GetSCMProvider(gitspaceConfig.CodeRepoType) if err != nil { return nil, fmt.Errorf("failed to resolve scm provider: %w", err)