Ensure that we don't reuse the same deserialization struct over pagination iterations

mislav · mislav · commit 813fbc9b8da7 · 2020-10-14T15:38:21.000+02:00
This is to avoid subtle deserialization issues in nested slices.
diff --git a/api/queries_org.go b/api/queries_org.go
@@ -9,7 +9,7 @@ import (
 
 // OrganizationProjects fetches all open projects for an organization
 func OrganizationProjects(client *Client, repo ghrepo.Interface) ([]RepoProject, error) {
-	var query struct {
+	type responseData struct {
 		Organization struct {
 			Projects struct {
 				Nodes    []RepoProject
@@ -30,6 +30,7 @@ func OrganizationProjects(client *Client, repo ghrepo.Interface) ([]RepoProject,
 
 	var projects []RepoProject
 	for {
+		var query responseData
 		err := gql.QueryNamed(context.Background(), "OrganizationProjectList", &query, variables)
 		if err != nil {
 			return nil, err
@@ -52,7 +53,7 @@ type OrgTeam struct {
 
 // OrganizationTeams fetches all the teams in an organization
 func OrganizationTeams(client *Client, repo ghrepo.Interface) ([]OrgTeam, error) {
-	var query struct {
+	type responseData struct {
 		Organization struct {
 			Teams struct {
 				Nodes    []OrgTeam
@@ -73,6 +74,7 @@ func OrganizationTeams(client *Client, repo ghrepo.Interface) ([]OrgTeam, error)
 
 	var teams []OrgTeam
 	for {
+		var query responseData
 		err := gql.QueryNamed(context.Background(), "OrganizationTeamList", &query, variables)
 		if err != nil {
 			return nil, err
diff --git a/api/queries_repo.go b/api/queries_repo.go
@@ -657,7 +657,7 @@ type RepoProject struct {
 
 // RepoProjects fetches all open projects for a repository
 func RepoProjects(client *Client, repo ghrepo.Interface) ([]RepoProject, error) {
-	var query struct {
+	type responseData struct {
 		Repository struct {
 			Projects struct {
 				Nodes    []RepoProject
@@ -679,6 +679,7 @@ func RepoProjects(client *Client, repo ghrepo.Interface) ([]RepoProject, error)
 
 	var projects []RepoProject
 	for {
+		var query responseData
 		err := gql.QueryNamed(context.Background(), "RepositoryProjectList", &query, variables)
 		if err != nil {
 			return nil, err
@@ -701,7 +702,7 @@ type RepoAssignee struct {
 
 // RepoAssignableUsers fetches all the assignable users for a repository
 func RepoAssignableUsers(client *Client, repo ghrepo.Interface) ([]RepoAssignee, error) {
-	var query struct {
+	type responseData struct {
 		Repository struct {
 			AssignableUsers struct {
 				Nodes    []RepoAssignee
@@ -723,6 +724,7 @@ func RepoAssignableUsers(client *Client, repo ghrepo.Interface) ([]RepoAssignee,
 
 	var users []RepoAssignee
 	for {
+		var query responseData
 		err := gql.QueryNamed(context.Background(), "RepositoryAssignableUsers", &query, variables)
 		if err != nil {
 			return nil, err
@@ -745,7 +747,7 @@ type RepoLabel struct {
 
 // RepoLabels fetches all the labels in a repository
 func RepoLabels(client *Client, repo ghrepo.Interface) ([]RepoLabel, error) {
-	var query struct {
+	type responseData struct {
 		Repository struct {
 			Labels struct {
 				Nodes    []RepoLabel
@@ -767,6 +769,7 @@ func RepoLabels(client *Client, repo ghrepo.Interface) ([]RepoLabel, error) {
 
 	var labels []RepoLabel
 	for {
+		var query responseData
 		err := gql.QueryNamed(context.Background(), "RepositoryLabelList", &query, variables)
 		if err != nil {
 			return nil, err
@@ -789,7 +792,7 @@ type RepoMilestone struct {
 
 // RepoMilestones fetches all open milestones in a repository
 func RepoMilestones(client *Client, repo ghrepo.Interface) ([]RepoMilestone, error) {
-	var query struct {
+	type responseData struct {
 		Repository struct {
 			Milestones struct {
 				Nodes    []RepoMilestone
@@ -811,6 +814,7 @@ func RepoMilestones(client *Client, repo ghrepo.Interface) ([]RepoMilestone, err
 
 	var milestones []RepoMilestone
 	for {
+		var query responseData
 		err := gql.QueryNamed(context.Background(), "RepositoryMilestoneList", &query, variables)
 		if err != nil {
 			return nil, err
diff --git a/pkg/cmd/release/list/http.go b/pkg/cmd/release/list/http.go
@@ -21,7 +21,7 @@ type Release struct {
 }
 
 func fetchReleases(httpClient *http.Client, repo ghrepo.Interface, limit int) ([]Release, error) {
-	var query struct {
+	type responseData struct {
 		Repository struct {
 			Releases struct {
 				Nodes    []Release
@@ -50,6 +50,7 @@ func fetchReleases(httpClient *http.Client, repo ghrepo.Interface, limit int) ([
 	var releases []Release
 loop:
 	for {
+		var query responseData
 		err := gql.QueryNamed(context.Background(), "RepositoryReleaseList", &query, variables)
 		if err != nil {
 			return nil, err
