Merge pull request devstream-io#1184 from merico-dev/fix-reposcaffolding-owner-field

daniel-hutao · web-flow · commit c81ae2a12d40 · 2022-10-17T22:53:05.000+08:00
fix: reposcaffold not valid for orgization
diff --git a/pkg/util/scm/git/repoinfo.go b/pkg/util/scm/git/repoinfo.go
@@ -22,7 +22,6 @@ type RepoInfo struct {
 	NeedAuth bool
 }
 
-// unused
 func (r *RepoInfo) GetRepoOwner() string {
 	if r.Org != "" {
 		return r.Org
diff --git a/pkg/util/scm/github/repo.go b/pkg/util/scm/github/repo.go
@@ -21,7 +21,7 @@ const (
 // DownloadRepo will download repo, return repo local path and error
 func (c *Client) DownloadRepo() (string, error) {
 	latestCodeZipfileDownloadURL := fmt.Sprintf(
-		defaultLatestCodeZipfileDownloadUrlFormat, c.Owner, c.Repo, c.Branch,
+		defaultLatestCodeZipfileDownloadUrlFormat, c.GetRepoOwner(), c.Repo, c.Branch,
 	)
 	log.Debugf("github get repo download url: %s.", latestCodeZipfileDownloadURL)
 	getterClient := downloader.ResourceClient{

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ type RepoInfo struct {`
`22`	`22`	`NeedAuth bool`
`23`	`23`	`}`
`24`	`24`
`25`		`-// unused`
`26`	`25`	`func (r *RepoInfo) GetRepoOwner() string {`
`27`	`26`	`if r.Org != "" {`
`28`	`27`	`return r.Org`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ const (`
`21`	`21`	`// DownloadRepo will download repo, return repo local path and error`
`22`	`22`	`func (c *Client) DownloadRepo() (string, error) {`
`23`	`23`	`latestCodeZipfileDownloadURL := fmt.Sprintf(`
`24`		`- defaultLatestCodeZipfileDownloadUrlFormat, c.Owner, c.Repo, c.Branch,`
	`24`	`+ defaultLatestCodeZipfileDownloadUrlFormat, c.GetRepoOwner(), c.Repo, c.Branch,`
`25`	`25`	`)`
`26`	`26`	`log.Debugf("github get repo download url: %s.", latestCodeZipfileDownloadURL)`
`27`	`27`	`getterClient := downloader.ResourceClient{`