STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

slight refactor

Browse source 
I didn't initially use GitHubRepo because it had the weird error
wrapping. I poked around and I think this function is leftover from a
vestigial GitHubRepoID function that used to be more single-purpose. I
took out the weird error handling so it could be reused and then used it
from the new GitHubRepoExists.
This commit is contained in:
vilmibm 2020-02-26 16:48:29 -06:00
parent e38c15e2c9
commit 256bdabf03
2 changed files with 5 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

28
api/queries_repo.go
View file

@ -60,23 +60,8 @@ func (r Repository) ViewerCanPush() bool {
}
}
func RepoExistsOnGitHub(client *Client, repo ghrepo.Interface) (bool, error) {
query := `
query($owner: String!, $name: String!) {
repository(owner: $owner, name: $name) {
id
}
}
`
variables := map[string]interface{}{
"owner": repo.RepoOwner(),
"name": repo.RepoName(),
}
result := struct {
Repository Repository
}{}
err := client.GraphQL(query, variables, &result)
func GitHubRepoExists(client *Client, repo ghrepo.Interface) (bool, error) {
repo, err := GitHubRepo(client, repo)
if err == nil {
// we found it.
@ -100,7 +85,6 @@ func RepoExistsOnGitHub(client *Client, repo ghrepo.Interface) (bool, error) {
return false, err
}
// GitHubRepo looks up the node ID of a named repository
func GitHubRepo(client *Client, repo ghrepo.Interface) (*Repository, error) {
query := `
query($owner: String!, $name: String!) {
@ -119,12 +103,8 @@ func GitHubRepo(client *Client, repo ghrepo.Interface) (*Repository, error) {
}{}
err := client.GraphQL(query, variables, &result)
if err != nil || result.Repository.ID == "" {
newErr := fmt.Errorf("failed to determine repository ID for '%s'", ghrepo.FullName(repo))
if err != nil {
newErr = fmt.Errorf("%s: %w", newErr, err)
}
return nil, newErr
if err != nil {
return nil, err
}
return &result.Repository, nil

2
command/repo.go
View file

@ -148,7 +148,7 @@ func repoFork(cmd *cobra.Command, args []string) error {
}
possibleFork := ghrepo.New(authLogin, toFork.RepoName())
exists, err := api.RepoExistsOnGitHub(apiClient, possibleFork)
exists, err := api.GitHubRepoExists(apiClient, possibleFork)
if err != nil {
s.Stop()
return fmt.Errorf("problem with API request: %w", err)