Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions pkg/github/repository_resource_completions.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"
"strconv"
"strings"

"github.com/google/go-github/v92/github"
Expand Down Expand Up @@ -249,6 +250,12 @@ func completePath(ctx context.Context, client *github.Client, resolved map[strin
if refVal == "" {
refVal = resolved["tag"]
}
if refVal == "" && resolved["prNumber"] != "" {
if _, err := strconv.Atoi(resolved["prNumber"]); err != nil {
return nil, fmt.Errorf("invalid pull request number: %w", err)
}
refVal = "refs/pull/" + resolved["prNumber"] + "/head"
}
if refVal == "" {
refVal = "HEAD"
}
Expand Down
80 changes: 80 additions & 0 deletions pkg/github/repository_resource_completions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import (
"encoding/json"
"errors"
"fmt"
"maps"
"net/http"
"strings"
"testing"

"github.com/google/go-github/v92/github"
Expand Down Expand Up @@ -268,6 +271,83 @@ func TestCompletePath_RefSelection(t *testing.T) {
assert.Nil(t, result)
}

func TestCompletePath_RequestsTreeForResolvedRef(t *testing.T) {
tests := []struct {
name string
resolved map[string]string
expectedTree string
}{
{
name: "branch",
resolved: map[string]string{"branch": "main"},
expectedTree: "main",
},
{
name: "sha",
resolved: map[string]string{"sha": "abc123"},
expectedTree: "abc123",
},
{
name: "tag",
resolved: map[string]string{"tag": "v1.0.0"},
expectedTree: "v1.0.0",
},
{
name: "pull request head",
resolved: map[string]string{"prNumber": "42"},
expectedTree: "refs/pull/42/head",
},
{
name: "default branch",
resolved: map[string]string{},
expectedTree: "HEAD",
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
var requestedTrees []string
client := mustNewGHClient(t, NewMockedHTTPClient(func(handlers map[string]http.HandlerFunc) {
handlers[""] = func(w http.ResponseWriter, r *http.Request) {
tree, ok := strings.CutPrefix(r.URL.Path, "/repos/owner/repo/git/trees/")
if !ok {
w.WriteHeader(http.StatusNotFound)
return
}
requestedTrees = append(requestedTrees, tree)
mockResponse(t, http.StatusOK, &github.Tree{
Entries: []*github.TreeEntry{{Path: new("README.md"), Type: new("blob")}},
})(w, r)
}
}))

resolved := map[string]string{"owner": "owner", "repo": "repo"}
maps.Copy(resolved, tt.resolved)

values, err := completePath(t.Context(), client, resolved, "")
require.NoError(t, err)
assert.Equal(t, []string{tt.expectedTree}, requestedTrees)
assert.Equal(t, []string{"README.md"}, values)
})
}
}

func TestCompletePath_InvalidPRNumber(t *testing.T) {
client := mustNewGHClient(t, NewMockedHTTPClient(func(handlers map[string]http.HandlerFunc) {
handlers[""] = func(_ http.ResponseWriter, r *http.Request) {
t.Errorf("unexpected request: %s %s", r.Method, r.URL.Path)
}
}))

values, err := completePath(t.Context(), client, map[string]string{
"owner": "owner",
"repo": "repo",
"prNumber": "42/../../main",
}, "")
require.Error(t, err)
assert.Nil(t, values)
}

func TestRepositoryResourceArgumentResolvers_Existence(t *testing.T) {
// Test that all expected resolvers are present
expectedResolvers := []string{
Expand Down