feat: Refactor repositories download contents#4153
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #4153 +/- ##
==========================================
- Coverage 93.83% 93.68% -0.15%
==========================================
Files 209 210 +1
Lines 19685 19695 +10
==========================================
- Hits 18472 18452 -20
- Misses 1015 1047 +32
+ Partials 198 196 -2 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
@gmlewis can we get this merged? |
gmlewis
left a comment
There was a problem hiding this comment.
I'm quite concerned about this PR because it appears to me that the behavior of following redirects has been deleted and there are many unit tests that have also simply been deleted without comment or explanation. One of the great things about unit tests is that when major refactors are performed like this one, if the unit tests are left alone we can easily detect regressions. As it is in this PR, however, where a major refactor happens and unit tests are also heavily refactored and/or deleted, it is hard to tell what is actually happening.
Can this be broken down into 3 PRs?
- Update the openapi_operations.yaml file - I'll do that myself momentarily.
- Refactor the download methods without modifying unit tests
- Refactor and/or delete unit tests
|
@gmlewis let me take a look, but the main problem here is that the tests appear to be tightly coupled to the implementation with mocks designed to make the test pass rather than to mirror the actual API. I'll add the deleted tests back, but the mocks will need to be refactored to add the schema required download_url to the content payload. On a slight tangent, shouldn't the mock payloads be validated against the schema? |
Yes, they probably should. I don't remember when GitHub v3 API docs started sharing schemas for endpoints, but it is possible that these were written prior to that. I think my biggest concern is following redirects because I remember a bunch of issues devoted solely to this topic, and to my shock and disappointment, I don't see any of the unit tests actually testing out following redirects and I could have sworn that it took a good deal of effort to get those unit tests to pass at one point. :-( |
@gmlewis there are no redirects in the removed tests. The old code pattern was just ignoring the presence of FYI the following example snippet will error using the current code but pass with the updated code as the last file requested is at an index greater than 1000 and has a size of greater than 1mb so won't have returned content. package main
import (
"context"
"fmt"
"io"
"os"
"github.com/google/go-github/v84/github"
)
// downloadContents downloads the contents of a file in a repository and returns it as a byte slice.
func downloadContents(ctx context.Context, client *github.Client, owner, repo, path, ref string) ([]byte, error) {
rc, _, err := client.Repositories.DownloadContents(ctx, owner, repo, path, &github.RepositoryContentGetOptions{Ref: ref})
if err != nil {
return nil, err
}
defer rc.Close()
by, err := io.ReadAll(rc)
if err != nil {
return nil, err
}
fmt.Printf("Downloaded %v/%v/%v as %d bytes\n", owner, repo, path, len(by))
return by, nil
}
func main() {
client := github.NewClient(nil)
t := []struct {
owner string
repo string
path string
ref string
}{
{"google", "go-github", "README.md", "master"},
{"github", "rest-api-description", "descriptions/api.github.com/api.github.com.2026-03-10.yaml", "main"},
{"ScoopInstaller", "Main", "bucket/yq.json", "master"},
{"stevehipwell", "scoop-main-bucket", "bucket/zzztest.bin", "test-content"},
}
for _, v := range t {
if _, err := downloadContents(context.Background(), client, v.owner, v.repo, v.path, v.ref); err != nil {
fmt.Printf("Error: %v\n", err)
os.Exit(1)
}
}
} |
|
@gmlewis I've added back the removed tests and undone some of the cosmetic changes to make the diff clearer that none of the actual tests have changed (it's only the mocks). I haven't rebased to fix the conflict yet in case you want to look at anything first? |
Thank you, @stevehipwell! |
Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com>
Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com>
19bc2aa to
d25a1ae
Compare
|
@gmlewis I've rebased this and it should be good to go. @alexandear I've updated the example to be closer to the other patterns and to have a valid comment. |
Signed-off-by: Steve Hipwell <steve.hipwell@gmail.com>
280f864 to
52d75be
Compare
gmlewis
left a comment
There was a problem hiding this comment.
Thank you, @stevehipwell and @alexandear.
Merging.
This PR refactors the behaviour of
DownloadContents&DownloadContentsWithMetawith the former now being a direct passthrough to the latter as the only difference was the signature. The code has been refactored to use the API directly instead of via an unnecessary layer of indirection.I've added an OpenAPI update to this PR as it proves that the updated code works against GitHub.
This change is required for #4151.