From 4169a9c04d6de06cfe5c4d64307ec54197563f44 Mon Sep 17 00:00:00 2001 From: YuyaKoda <29038315+ponkio-o@users.noreply.github.com> Date: Mon, 13 May 2024 20:28:29 +0900 Subject: [PATCH] feat!: Change enterprise runner to also use ListRunnersOptions (#3167) Fixes: #3166. BREAKING-CHANGE: This changes `ListOptions` to `ListRunnersOptions` in `EnterpriseService.ListRunners`. --- github/enterprise_actions_runners.go | 2 +- github/enterprise_actions_runners_test.go | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/github/enterprise_actions_runners.go b/github/enterprise_actions_runners.go index 4a6e6b52c10..a5364815324 100644 --- a/github/enterprise_actions_runners.go +++ b/github/enterprise_actions_runners.go @@ -80,7 +80,7 @@ func (s *EnterpriseService) CreateRegistrationToken(ctx context.Context, enterpr // GitHub API docs: https://docs.github.com/enterprise-cloud@latest/rest/actions/self-hosted-runners#list-self-hosted-runners-for-an-enterprise // //meta:operation GET /enterprises/{enterprise}/actions/runners -func (s *EnterpriseService) ListRunners(ctx context.Context, enterprise string, opts *ListOptions) (*Runners, *Response, error) { +func (s *EnterpriseService) ListRunners(ctx context.Context, enterprise string, opts *ListRunnersOptions) (*Runners, *Response, error) { u := fmt.Sprintf("enterprises/%v/actions/runners", enterprise) u, err := addOptions(u, opts) if err != nil { diff --git a/github/enterprise_actions_runners_test.go b/github/enterprise_actions_runners_test.go index 36b2aaefe89..3bc3c737b89 100644 --- a/github/enterprise_actions_runners_test.go +++ b/github/enterprise_actions_runners_test.go @@ -106,11 +106,14 @@ func TestEnterpriseService_ListRunners(t *testing.T) { mux.HandleFunc("/enterprises/e/actions/runners", func(w http.ResponseWriter, r *http.Request) { testMethod(t, r, "GET") - testFormValues(t, r, values{"per_page": "2", "page": "2"}) - fmt.Fprint(w, `{"total_count":2,"runners":[{"id":23,"name":"MBP","os":"macos","status":"online"},{"id":24,"name":"iMac","os":"macos","status":"offline"}]}`) + testFormValues(t, r, values{"name": "MBP", "per_page": "2", "page": "2"}) + fmt.Fprint(w, `{"total_count":1,"runners":[{"id":23,"name":"MBP","os":"macos","status":"online"}]}`) }) - opts := &ListOptions{Page: 2, PerPage: 2} + opts := &ListRunnersOptions{ + Name: String("MBP"), + ListOptions: ListOptions{Page: 2, PerPage: 2}, + } ctx := context.Background() runners, _, err := client.Enterprise.ListRunners(ctx, "e", opts) if err != nil { @@ -118,10 +121,9 @@ func TestEnterpriseService_ListRunners(t *testing.T) { } want := &Runners{ - TotalCount: 2, + TotalCount: 1, Runners: []*Runner{ {ID: Int64(23), Name: String("MBP"), OS: String("macos"), Status: String("online")}, - {ID: Int64(24), Name: String("iMac"), OS: String("macos"), Status: String("offline")}, }, } if !cmp.Equal(runners, want) { @@ -130,7 +132,7 @@ func TestEnterpriseService_ListRunners(t *testing.T) { const methodName = "ListRunners" testBadOptions(t, methodName, func() (err error) { - _, _, err = client.Enterprise.ListRunners(ctx, "\n", &ListOptions{}) + _, _, err = client.Enterprise.ListRunners(ctx, "\n", &ListRunnersOptions{}) return err })