Merge pull request #1353 from merico-dev/fix-app-golang-error

fix: scm cant get repo name when use url

Author: IronCore864

internal/pkg/plugin/installer/reposcaffolding/option.go

@@ -24,9 +24,9 @@ func NewOptions(options configmanager.RawOptions) (*Options, error) {
 func (opts *Options) renderTplConfig() map[string]interface{} {
 	// default render value from repo
 	renderConfig := map[string]any{
-		"AppName": opts.DestinationRepo.Repo,
+		"AppName": opts.DestinationRepo.GetRepoName(),
 		"Repo": map[string]string{
-			"Name":  opts.DestinationRepo.Repo,
+			"Name":  opts.DestinationRepo.GetRepoName(),
 			"Owner": opts.DestinationRepo.GetRepoOwner(),
 		},
 	}

pkg/util/scm/git/repoinfo.go

@@ -55,14 +55,26 @@ func (r *RepoInfo) SetDefault() error {
 }
 
 func (r *RepoInfo) GetRepoOwner() string {
+	// if org or owner is not empty, return org/owner
 	if r.Org != "" {
 		return r.Org
 	}
-	return r.Owner
+	if r.Owner != "" {
+		return r.Owner
+	}
+	// else return owner extract from url
+	if r.CloneURL != "" {
+		owner, _, err := r.CloneURL.extractRepoOwnerAndName()
+		if err != nil {
+			log.Warnf("git GetRepoName failed %s", err)
+		}
+		return owner
+	}
+	return ""
 }
 
 func (r *RepoInfo) GetRepoPath() string {
-	return fmt.Sprintf("%s/%s", r.GetRepoOwner(), r.Repo)
+	return fmt.Sprintf("%s/%s", r.GetRepoOwner(), r.GetRepoName())
 }
 
 func (r *RepoInfo) GetRepoName() string {
@@ -82,7 +94,7 @@ func (r *RepoInfo) GetRepoName() string {
 func (r *RepoInfo) GetCloneURL() string {
 	var cloneURL string
 	if r.CloneURL != "" {
-		cloneURL = string(r.CloneURL)
+		cloneURL = string(r.CloneURL.addGithubURLScheme())
 	} else {
 		cloneURL = string(r.buildScmURL())
 	}
@@ -107,10 +119,9 @@ func (r *RepoInfo) getBranchWithDefault() string {
 	if branch != "" {
 		return branch
 	}
-	switch r.RepoType {
-	case "github":
+	if r.IsGithubRepo() {
 		branch = "main"
-	case "gitlab":
+	} else {
 		branch = "master"
 	}
 	return branch
@@ -143,7 +154,6 @@ func (r *RepoInfo) updateFieldsFromURLField() error {
 	// 1. config basic info for different repo type
 	if r.IsGithubRepo() {
 		r.RepoType = "github"
-		r.CloneURL = r.CloneURL.addGithubURLScheme()
 	} else {
 		r.RepoType = "gitlab"
 		// extract gitlab baseURL from url string
@@ -205,7 +215,7 @@ func (r *RepoInfo) checkValid() error {
 // extractRepoOwnerAndName will get repoOwner and repoName from ScmURL
 func (u ScmURL) extractRepoOwnerAndName() (string, string, error) {
 	var paths string
-	ScmURLStr := string(u)
+	ScmURLStr := string(u.addGithubURLScheme())
 	c, err := url.ParseRequestURI(ScmURLStr)
 	if err != nil {
 		if strings.Contains(ScmURLStr, "git@") {
@@ -232,7 +242,7 @@ func (u ScmURL) extractRepoOwnerAndName() (string, string, error) {
 	return repoOwner, repoName, nil
 }
 
-// formatGithubCloneURL will add "https://"  in github url config if it doesn't contain schme
+// addGithubURLScheme will add "https://"  in github url config if it doesn't contain schme
 func (u ScmURL) addGithubURLScheme() ScmURL {
 	cloneURL := string(u)
 	if !strings.Contains(cloneURL, "git@") && !strings.HasPrefix(cloneURL, "http") {

pkg/util/scm/git/repoinfo_test.go

@@ -397,6 +397,18 @@ var _ = Describe("ScmURL type", func() {
 					Expect(err.Error()).Should(ContainSubstring("git url repo path is not valid"))
 				})
 			})
+			When("url is path doesn't have scheme", func() {
+				BeforeEach(func() {
+					cloneURL = "test.com/test_user/test_repo"
+				})
+				It("should add scheme auto", func() {
+					owner, repo, err := cloneURL.extractRepoOwnerAndName()
+					Expect(err).Error().ShouldNot(HaveOccurred())
+					Expect(owner).Should(Equal("test_user"))
+					Expect(repo).Should(Equal("test_repo"))
+				})
+			})
+
 		})
 		When("cloneURL is git ssh format", func() {
 			When("ssh format is valid", func() {