Skip to content

fix(changeprovider): reject null Phabricator diffs #992

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

Open
Tmwakalasya wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(changeprovider): reject null Phabricator diffs #992

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
2 changes: 1 addition & 1 deletion submitqueue/extension/changeprovider/phabricator/conduit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func parseConduitResponse(resp *http.Response, diffIDs []int) (map[int]*diffResu
results := make(map[int]*diffResult, len(diffIDs))
for _, id := range diffIDs {
diff, ok := rawMap[strconv.Itoa(id)]
if !ok {
if !ok || diff == nil {
return nil, fmt.Errorf("diff %d not found in querydiffs response", id)
}
results[id] = diff
Expand Down
23 changes: 23 additions & 0 deletions submitqueue/extension/changeprovider/phabricator/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,29 @@ func TestProvider_Get(t *testing.T) {
}
}

func TestProvider_Get_UnavailableDiff(t *testing.T) {
for _, tt := range []struct {
name string
result map[string]*diffResult
}{
{name: "missing diff", result: validDiffResponse()},
{name: "null diff", result: map[string]*diffResult{"100": validDiffResponse()["100"], "101": nil}},
} {
t.Run(tt.name, func(t *testing.T) {
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
serveConduit(t, w, tt.result)
}))
t.Cleanup(server.Close)
p := newTestProvider(t, &http.Client{Transport: &testTransport{baseURL: server.URL}})
infos, err := p.Get(t.Context(), entity.Request{Change: change.Change{
URIs: []string{"phab://phab.example.com/D200/100", "phab://phab.example.com/D201/101"},
}})
require.Error(t, err)
assert.Nil(t, infos)
})
}
}

func TestProvider_Get_MultipleDiffs(t *testing.T) {
callCount := 0
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
Expand Down
Loading