Merge remote-tracking branch 'origin' into ghe-api

humphd · Jul 27, 2020 · 0cbcf8a · 0cbcf8a
2 parents 8909a3e + 7512034
commit 0cbcf8a
Show file tree

Hide file tree

Showing 19 changed files with 1,251 additions and 742 deletions.
diff --git a/api/queries_repo.go b/api/queries_repo.go
@@ -3,7 +3,6 @@ package api
 import (
 	"bytes"
 	"context"
-	"encoding/base64"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -407,37 +406,6 @@ func RepoCreate(client *Client, input RepoCreateInput) (*Repository, error) {
 	return initRepoHostname(&response.CreateRepository.Repository, "github.com"), nil
 }
 
-type RepoReadme struct {
-	Filename string
-	Content  string
-}
-
-func RepositoryReadme(client *Client, repo ghrepo.Interface) (*RepoReadme, error) {
-	var response struct {
-		Name    string
-		Content string
-	}
-
-	err := client.REST(repo.RepoHost(), "GET", fmt.Sprintf("repos/%s/readme", ghrepo.FullName(repo)), nil, &response)
-	if err != nil {
-		var httpError HTTPError
-		if errors.As(err, &httpError) && httpError.StatusCode == 404 {
-			return nil, &NotFoundError{err}
-		}
-		return nil, err
-	}
-
-	decoded, err := base64.StdEncoding.DecodeString(response.Content)
-	if err != nil {
-		return nil, fmt.Errorf("failed to decode readme: %w", err)
-	}
-
-	return &RepoReadme{
-		Filename: response.Name,
-		Content:  string(decoded),
-	}, nil
-}
-
 type RepoMetadataResult struct {
 	AssignableUsers []RepoAssignee
 	Labels          []RepoLabel

diff --git a/command/issue.go b/command/issue.go
@@ -227,7 +227,7 @@ func issueList(cmd *cobra.Command, args []string) error {
 	}
 
 	if web {
-		issueListURL := generateRepoURL(baseRepo, "issues")
+		issueListURL := ghrepo.GenerateRepoURL(baseRepo, "issues")
 		openURL, err := listURLWithQuery(issueListURL, filterOptions{
 			entity:    "issue",
 			state:     state,
@@ -240,7 +240,7 @@ func issueList(cmd *cobra.Command, args []string) error {
 		if err != nil {
 			return err
 		}
-		fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", displayURL(openURL))
+		fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", utils.DisplayURL(openURL))
 		return utils.OpenInBrowser(openURL)
 	}
 
@@ -504,7 +504,7 @@ func issueCreate(cmd *cobra.Command, args []string) error {
 	}
 
 	if isWeb, err := cmd.Flags().GetBool("web"); err == nil && isWeb {
-		openURL := generateRepoURL(baseRepo, "issues/new")
+		openURL := ghrepo.GenerateRepoURL(baseRepo, "issues/new")
 		if title != "" || body != "" {
 			milestone := ""
 			if len(milestoneTitles) > 0 {
@@ -518,7 +518,7 @@ func issueCreate(cmd *cobra.Command, args []string) error {
 			openURL += "/choose"
 		}
 		if connectedToTerminal(cmd) {
-			cmd.Printf("Opening %s in your browser.\n", displayURL(openURL))
+			cmd.Printf("Opening %s in your browser.\n", utils.DisplayURL(openURL))
 		}
 		return utils.OpenInBrowser(openURL)
 	}
@@ -582,7 +582,7 @@ func issueCreate(cmd *cobra.Command, args []string) error {
 	}
 
 	if action == PreviewAction {
-		openURL := generateRepoURL(baseRepo, "issues/new")
+		openURL := ghrepo.GenerateRepoURL(baseRepo, "issues/new")
 		milestone := ""
 		if len(milestoneTitles) > 0 {
 			milestone = milestoneTitles[0]
@@ -592,7 +592,7 @@ func issueCreate(cmd *cobra.Command, args []string) error {
 			return err
 		}
 		// TODO could exceed max url length for explorer
-		fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", displayURL(openURL))
+		fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", utils.DisplayURL(openURL))
 		return utils.OpenInBrowser(openURL)
 	} else if action == SubmitAction {
 		params := map[string]interface{}{
@@ -618,14 +618,6 @@ func issueCreate(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func generateRepoURL(repo ghrepo.Interface, p string, args ...interface{}) string {
-	baseURL := fmt.Sprintf("https://%s/%s/%s", repo.RepoHost(), repo.RepoOwner(), repo.RepoName())
-	if p != "" {
-		return baseURL + "/" + fmt.Sprintf(p, args...)
-	}
-	return baseURL
-}
-
 func addMetadataToIssueParams(client *api.Client, baseRepo ghrepo.Interface, params map[string]interface{}, tb *issueMetadataState) error {
 	if !tb.HasMetadata() {
 		return nil
@@ -844,11 +836,3 @@ func issueReopen(cmd *cobra.Command, args []string) error {
 
 	return nil
 }
-
-func displayURL(urlStr string) string {
-	u, err := url.Parse(urlStr)
-	if err != nil {
-		return urlStr
-	}
-	return u.Hostname() + u.Path
-}
diff --git a/command/pr.go b/command/pr.go
@@ -235,7 +235,7 @@ func prList(cmd *cobra.Command, args []string) error {
 	}
 
 	if web {
-		prListURL := generateRepoURL(baseRepo, "pulls")
+		prListURL := ghrepo.GenerateRepoURL(baseRepo, "pulls")
 		openURL, err := listURLWithQuery(prListURL, filterOptions{
 			entity:     "pr",
 			state:      state,
@@ -246,7 +246,7 @@ func prList(cmd *cobra.Command, args []string) error {
 		if err != nil {
 			return err
 		}
-		fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", displayURL(openURL))
+		fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", utils.DisplayURL(openURL))
 		return utils.OpenInBrowser(openURL)
 	}
 

diff --git a/command/pr_create.go b/command/pr_create.go
@@ -367,7 +367,7 @@ func prCreate(cmd *cobra.Command, _ []string) error {
 		}
 		if connectedToTerminal(cmd) {
 			// TODO could exceed max url length for explorer
-			fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", displayURL(openURL))
+			fmt.Fprintf(cmd.ErrOrStderr(), "Opening %s in your browser.\n", utils.DisplayURL(openURL))
 		}
 		return utils.OpenInBrowser(openURL)
 	} else {
@@ -447,7 +447,7 @@ func withPrAndIssueQueryParams(baseURL, title, body string, assignees, labels, p
 }
 
 func generateCompareURL(r ghrepo.Interface, base, head, title, body string, assignees, labels, projects []string, milestone string) (string, error) {
-	u := generateRepoURL(r, "compare/%s...%s?expand=1", base, head)
+	u := ghrepo.GenerateRepoURL(r, "compare/%s...%s?expand=1", base, head)
 	url, err := withPrAndIssueQueryParams(u, title, body, assignees, labels, projects, milestone)
 	if err != nil {
 		return "", err