api: prevent repeating GET parameters when paginating

mislav · mislav · commit 01adff037f44 · 2021-10-18T20:18:23.000+02:00
diff --git a/pkg/cmd/api/api.go b/pkg/cmd/api/api.go
@@ -319,6 +319,7 @@ func apiRun(opts *ApiOptions) error {
 			}
 		} else {
 			requestPath, hasNextPage = findNextPage(resp)
+			requestBody = nil // prevent repeating GET parameters
 		}
 
 		if hasNextPage && opts.ShowResponseHeaders {
diff --git a/pkg/cmd/api/api_test.go b/pkg/cmd/api/api_test.go
@@ -577,8 +577,11 @@ func Test_apiRun_paginationREST(t *testing.T) {
 			return config.NewBlankConfig(), nil
 		},
 
-		RequestPath: "issues",
-		Paginate:    true,
+		RequestMethod:       "GET",
+		RequestMethodPassed: true,
+		RequestPath:         "issues",
+		Paginate:            true,
+		RawFields:           []string{"per_page=50", "page=1"},
 	}
 
 	err := apiRun(&options)
@@ -587,7 +590,7 @@ func Test_apiRun_paginationREST(t *testing.T) {
 	assert.Equal(t, `{"page":1}{"page":2}{"page":3}`, stdout.String(), "stdout")
 	assert.Equal(t, "", stderr.String(), "stderr")
 
-	assert.Equal(t, "https://api.github.com/issues?per_page=100", responses[0].Request.URL.String())
+	assert.Equal(t, "https://api.github.com/issues?page=1&per_page=50", responses[0].Request.URL.String())
 	assert.Equal(t, "https://api.github.com/repositories/1227/issues?page=2", responses[1].Request.URL.String())
 	assert.Equal(t, "https://api.github.com/repositories/1227/issues?page=3", responses[2].Request.URL.String())
 }

Original file line number	Diff line number	Diff line change
`@@ -319,6 +319,7 @@ func apiRun(opts *ApiOptions) error {`
`319`	`319`	`}`
`320`	`320`	`} else {`
`321`	`321`	`requestPath, hasNextPage = findNextPage(resp)`
	`322`	`+ requestBody = nil // prevent repeating GET parameters`
`322`	`323`	`}`
`323`	`324`
`324`	`325`	`if hasNextPage && opts.ShowResponseHeaders {`