Skip to content

fix: propagate errors from repository resource completions #3584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pei711 wants to merge 1 commit into from
Closed

fix: propagate errors from repository resource completions #3584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions pkg/github/repository_resource_completions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,10 @@ func completeBranch(ctx context.Context, client *github.Client, resolved map[str
if owner == "" || repo == "" {
return values, errors.New("owner or repo not specified")
}
branches, _, _ := client.Repositories.ListBranches(ctx, owner, repo, nil)
branches, _, err := client.Repositories.ListBranches(ctx, owner, repo, nil)
if err != nil {
return nil, err
}

for _, branch := range branches {
if argValue == "" || strings.HasPrefix(branch.GetName(), argValue) {
Expand All @@ -174,7 +177,10 @@ func completeSHA(ctx context.Context, client *github.Client, resolved map[string
if owner == "" || repo == "" {
return values, errors.New("owner or repo not specified")
}
commits, _, _ := client.Repositories.ListCommits(ctx, owner, repo, nil)
commits, _, err := client.Repositories.ListCommits(ctx, owner, repo, nil)
if err != nil {
return nil, err
}

for _, commit := range commits {
sha := commit.GetSHA()
Expand All @@ -194,7 +200,10 @@ func completeTag(ctx context.Context, client *github.Client, resolved map[string
if owner == "" || repo == "" {
return nil, errors.New("owner or repo not specified")
}
tags, _, _ := client.Repositories.ListTags(ctx, owner, repo, nil)
tags, _, err := client.Repositories.ListTags(ctx, owner, repo, nil)
if err != nil {
return nil, err
}
var values []string
for _, tag := range tags {
if argValue == "" || strings.Contains(tag.GetName(), argValue) {
Expand Down
38 changes: 38 additions & 0 deletions pkg/github/repository_resource_completions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"
"net/http"
"testing"

"github.com/google/go-github/v92/github"
Expand Down Expand Up @@ -169,6 +170,43 @@ func TestCompleteTag_MissingDependencies(t *testing.T) {
assert.Nil(t, result)
}

func TestRepositoryResourceCompletions_PropagateRepositoryErrors(t *testing.T) {
tests := []struct {
name string
endpoint EndpointPattern
complete CompleteHandler
}{
{
name: "branch",
endpoint: GetReposBranchesByOwnerByRepo,
complete: completeBranch,
},
{
name: "commit SHA",
endpoint: GetReposCommitsByOwnerByRepo,
complete: completeSHA,
},
{
name: "tag",
endpoint: GetReposTagsByOwnerByRepo,
complete: completeTag,
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
client := mustNewGHClient(t, NewMockedHTTPClient(WithRequestMatchHandler(tt.endpoint, func(w http.ResponseWriter, _ *http.Request) {
http.Error(w, `{"message":"rate limited"}`, http.StatusForbidden)
})))

values, err := tt.complete(t.Context(), client, map[string]string{"owner": "test", "repo": "repo"}, "")

require.Error(t, err)
assert.Nil(t, values)
})
}
}

func TestCompletePRNumber_MissingDependencies(t *testing.T) {
ctx := t.Context()

Expand Down