Skip to content

Commit 3f0fa1d

Browse files
committed
confine change to single PR
1 parent 3ce6665 commit 3f0fa1d

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

pkg/github/pullrequests.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1168,15 +1168,12 @@ func ListPullRequests(t translations.TranslationHelperFunc) inventory.ServerTool
11681168
}
11691169
}
11701170

1171-
minimalPRs := make([]MinimalPullRequest, 0, len(prs))
1172-
for _, pr := range prs {
1173-
if pr == nil {
1174-
continue
1175-
}
1176-
minimalPRs = append(minimalPRs, convertToMinimalPullRequest(pr))
1171+
r, err := json.Marshal(prs)
1172+
if err != nil {
1173+
return utils.NewToolResultErrorFromErr("failed to marshal response", err), nil, nil
11771174
}
11781175

1179-
return MarshalledTextResult(minimalPRs), nil, nil
1176+
return utils.NewToolResultText(string(r)), nil, nil
11801177
})
11811178
}
11821179

pkg/github/pullrequests_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -670,17 +670,17 @@ func Test_ListPullRequests(t *testing.T) {
670670
// Parse the result and get the text content if no error
671671
textContent := getTextResult(t, result)
672672

673-
// Unmarshal and verify the minimal result
674-
var returnedPRs []MinimalPullRequest
673+
// Unmarshal and verify the result
674+
var returnedPRs []*github.PullRequest
675675
err = json.Unmarshal([]byte(textContent.Text), &returnedPRs)
676676
require.NoError(t, err)
677677
assert.Len(t, returnedPRs, 2)
678-
assert.Equal(t, tc.expectedPRs[0].GetNumber(), returnedPRs[0].Number)
679-
assert.Equal(t, tc.expectedPRs[0].GetTitle(), returnedPRs[0].Title)
680-
assert.Equal(t, tc.expectedPRs[0].GetState(), returnedPRs[0].State)
681-
assert.Equal(t, tc.expectedPRs[1].GetNumber(), returnedPRs[1].Number)
682-
assert.Equal(t, tc.expectedPRs[1].GetTitle(), returnedPRs[1].Title)
683-
assert.Equal(t, tc.expectedPRs[1].GetState(), returnedPRs[1].State)
678+
assert.Equal(t, *tc.expectedPRs[0].Number, *returnedPRs[0].Number)
679+
assert.Equal(t, *tc.expectedPRs[0].Title, *returnedPRs[0].Title)
680+
assert.Equal(t, *tc.expectedPRs[0].State, *returnedPRs[0].State)
681+
assert.Equal(t, *tc.expectedPRs[1].Number, *returnedPRs[1].Number)
682+
assert.Equal(t, *tc.expectedPRs[1].Title, *returnedPRs[1].Title)
683+
assert.Equal(t, *tc.expectedPRs[1].State, *returnedPRs[1].State)
684684
})
685685
}
686686
}

0 commit comments

Comments
 (0)