Fix generated URLs for github.localhost repositories

mislav · mislav · commit 5f5df817be70 · 2021-10-18T20:01:18.000+02:00
diff --git a/internal/ghrepo/repo.go b/internal/ghrepo/repo.go
@@ -103,7 +103,7 @@ func IsSame(a, b Interface) bool {
 }
 
 func GenerateRepoURL(repo Interface, p string, args ...interface{}) string {
-	baseURL := fmt.Sprintf("https://%s/%s/%s", repo.RepoHost(), repo.RepoOwner(), repo.RepoName())
+	baseURL := fmt.Sprintf("%s%s/%s", ghinstance.HostPrefix(repo.RepoHost()), repo.RepoOwner(), repo.RepoName())
 	if p != "" {
 		return baseURL + "/" + fmt.Sprintf(p, args...)
 	}
@@ -116,7 +116,7 @@ func FormatRemoteURL(repo Interface, protocol string) string {
 		return fmt.Sprintf("git@%s:%s/%s.git", repo.RepoHost(), repo.RepoOwner(), repo.RepoName())
 	}
 
-	return fmt.Sprintf("https://%s/%s/%s.git", repo.RepoHost(), repo.RepoOwner(), repo.RepoName())
+	return fmt.Sprintf("%s%s/%s.git", ghinstance.HostPrefix(repo.RepoHost()), repo.RepoOwner(), repo.RepoName())
 }
 
 type ghRepo struct {

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ func IsSame(a, b Interface) bool {`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`func GenerateRepoURL(repo Interface, p string, args ...interface{}) string {`
`106`		`- baseURL := fmt.Sprintf("https://%s/%s/%s", repo.RepoHost(), repo.RepoOwner(), repo.RepoName())`
	`106`	`+ baseURL := fmt.Sprintf("%s%s/%s", ghinstance.HostPrefix(repo.RepoHost()), repo.RepoOwner(), repo.RepoName())`
`107`	`107`	`if p != "" {`
`108`	`108`	`return baseURL + "/" + fmt.Sprintf(p, args...)`
`109`	`109`	`}`
`@@ -116,7 +116,7 @@ func FormatRemoteURL(repo Interface, protocol string) string {`
`116`	`116`	`return fmt.Sprintf("git@%s:%s/%s.git", repo.RepoHost(), repo.RepoOwner(), repo.RepoName())`
`117`	`117`	`}`
`118`	`118`
`119`		`- return fmt.Sprintf("https://%s/%s/%s.git", repo.RepoHost(), repo.RepoOwner(), repo.RepoName())`
	`119`	`+ return fmt.Sprintf("%s%s/%s.git", ghinstance.HostPrefix(repo.RepoHost()), repo.RepoOwner(), repo.RepoName())`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`type ghRepo struct {`