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

Merge pull request #13172 from cli/sammorrowdrums/fix-url-encode-parent-path

Browse source 
URL-encode parentPath in skills discovery API call
This commit is contained in:
Sam Morrow 2026-04-16 00:16:20 +02:00 • committed by GitHub
commit ce3e08169c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/skills/discovery/discovery.go
View file

@ -491,7 +491,7 @@ func DiscoverSkillByPath(client *api.Client, host, owner, repo, commitSHA, skill
}
parentPath := path.Dir(skillPath)
apiPath := fmt.Sprintf("repos/%s/%s/contents/%s?ref=%s", url.PathEscape(owner), url.PathEscape(repo), parentPath, commitSHA)
apiPath := fmt.Sprintf("repos/%s/%s/contents/%s?ref=%s", url.PathEscape(owner), url.PathEscape(repo), url.PathEscape(parentPath), commitSHA)
var contents []struct {
Name string `json:"name"`

27
internal/skills/discovery/discovery_test.go
View file

@ -699,7 +699,7 @@ func TestDiscoverSkillByPath(t *testing.T) {
skillPath: "skills/monalisa/issue-triage",
stubs: func(reg *httpmock.Registry) {
reg.Register(
httpmock.REST("GET", "repos/monalisa/octocat-skills/contents/skills/monalisa"),
httpmock.REST("GET", "repos/monalisa/octocat-skills/contents/skills%2Fmonalisa"),
httpmock.JSONResponse([]map[string]interface{}{
{"name": "issue-triage", "path": "skills/monalisa/issue-triage", "sha": "tree-sha", "type": "dir"},
}))
@ -720,6 +720,31 @@ func TestDiscoverSkillByPath(t *testing.T) {
wantName: "issue-triage",
wantNS: "monalisa",
},
{
name: "parent path with spaces is URL encoded",
skillPath: "my skills/code-review",
stubs: func(reg *httpmock.Registry) {
reg.Register(
httpmock.REST("GET", "repos/monalisa/octocat-skills/contents/my%20skills"),
httpmock.JSONResponse([]map[string]interface{}{
{"name": "code-review", "path": "my skills/code-review", "sha": "tree-sha", "type": "dir"},
}))
reg.Register(
httpmock.REST("GET", "repos/monalisa/octocat-skills/git/trees/tree-sha"),
httpmock.JSONResponse(map[string]interface{}{
"sha": "tree-sha", "truncated": false,
"tree": []map[string]interface{}{
{"path": "SKILL.md", "type": "blob", "sha": "blob-sha"},
},
}))
reg.Register(
httpmock.REST("GET", "repos/monalisa/octocat-skills/git/blobs/blob-sha"),
httpmock.JSONResponse(map[string]interface{}{
"sha": "blob-sha", "encoding": "base64", "content": "IyBTa2lsbA==",
}))
},
wantName: "code-review",
},
{
name: "strips trailing SKILL.md from path",
skillPath: "skills/code-review/SKILL.md",