Skip to content

Commit ceb848b

Browse files
austenstoneaustenstone
committed
fix: ListHostedRunnerCustomImages return type should be HostedRunnerCustomImages not HostedRunnerCustomImageVersions
1 parent f48c67e commit ceb848b

4 files changed

Lines changed: 72 additions & 40 deletions

‎github/actions_hosted_runners.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,14 +403,14 @@ func (s *ActionsService) DeleteHostedRunner(ctx context.Context, org string, run
403403
// GitHub API docs: https://docs.github.com/rest/actions/hosted-runners#list-custom-images-for-an-organization
404404
//
405405
//meta:operation GET /orgs/{org}/actions/hosted-runners/images/custom
406-
func (s *ActionsService) ListHostedRunnerCustomImages(ctx context.Context, org string) (*HostedRunnerCustomImageVersions, *Response, error) {
406+
func (s *ActionsService) ListHostedRunnerCustomImages(ctx context.Context, org string) (*HostedRunnerCustomImages, *Response, error) {
407407
u := fmt.Sprintf("orgs/%v/actions/hosted-runners/images/custom", org)
408408
req, err := s.client.NewRequest("GET", u, nil)
409409
if err != nil {
410410
return nil, nil, err
411411
}
412412

413-
images := new(HostedRunnerCustomImageVersions)
413+
images := new(HostedRunnerCustomImages)
414414
resp, err := s.client.Do(ctx, req, images)
415415
if err != nil {
416416
return nil, resp, err

‎github/actions_hosted_runners_test.go‎

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -869,16 +869,24 @@ func TestActionsService_ListHostedRunnerCustomImages(t *testing.T) {
869869
"total_count": 2,
870870
"image_versions": [
871871
{
872-
"version": "1.1.0",
873-
"size_gb": 75,
874-
"state": "Ready",
875-
"created_on": "2024-11-09T23:39:01Z"
872+
"id": 1,
873+
"platform": "linux-x64",
874+
"name": "CustomImage1",
875+
"source": "custom",
876+
"versions_count": 4,
877+
"total_versions_size": 200,
878+
"latest_version": "1.3.0",
879+
"state": "Ready"
876880
},
877881
{
878-
"version": "1.0.0",
879-
"size_gb": 75,
880-
"state": "Ready",
881-
"created_on": "2024-11-08T20:39:01Z"
882+
"id": 2,
883+
"platform": "linux-x64",
884+
"name": "CustomImage2",
885+
"source": "custom",
886+
"versions_count": 2,
887+
"total_versions_size": 150,
888+
"latest_version": "1.0.0",
889+
"state": "Ready"
882890
}
883891
]
884892
}`)
@@ -890,20 +898,28 @@ func TestActionsService_ListHostedRunnerCustomImages(t *testing.T) {
890898
t.Errorf("Actions.ListHostedRunnerCustomImages returned error: %v", err)
891899
}
892900

893-
want := &HostedRunnerCustomImageVersions{
901+
want := &HostedRunnerCustomImages{
894902
TotalCount: 2,
895-
ImageVersions: []*HostedRunnerCustomImageVersion{
903+
ImageVersions: []*HostedRunnerCustomImage{
896904
{
897-
Version: Ptr("1.1.0"),
898-
SizeGB: Ptr(75),
899-
State: Ptr("Ready"),
900-
CreatedOn: &Timestamp{time.Date(2024, 11, 9, 23, 39, 1, 0, time.UTC)},
905+
ID: Ptr(int64(1)),
906+
Platform: Ptr("linux-x64"),
907+
Name: Ptr("CustomImage1"),
908+
Source: Ptr("custom"),
909+
VersionsCount: Ptr(4),
910+
TotalVersionsSize: Ptr(200),
911+
LatestVersion: Ptr("1.3.0"),
912+
State: Ptr("Ready"),
901913
},
902914
{
903-
Version: Ptr("1.0.0"),
904-
SizeGB: Ptr(75),
905-
State: Ptr("Ready"),
906-
CreatedOn: &Timestamp{time.Date(2024, 11, 8, 20, 39, 1, 0, time.UTC)},
915+
ID: Ptr(int64(2)),
916+
Platform: Ptr("linux-x64"),
917+
Name: Ptr("CustomImage2"),
918+
Source: Ptr("custom"),
919+
VersionsCount: Ptr(2),
920+
TotalVersionsSize: Ptr(150),
921+
LatestVersion: Ptr("1.0.0"),
922+
State: Ptr("Ready"),
907923
},
908924
},
909925
}

‎github/enterprise_actions_hosted_runners.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,14 +234,14 @@ func (s *EnterpriseService) DeleteHostedRunner(ctx context.Context, enterprise s
234234
// GitHub API docs: https://docs.github.com/enterprise-cloud@latest/rest/actions/hosted-runners#list-custom-images-for-an-enterprise
235235
//
236236
//meta:operation GET /enterprises/{enterprise}/actions/hosted-runners/images/custom
237-
func (s *EnterpriseService) ListHostedRunnerCustomImages(ctx context.Context, enterprise string) (*HostedRunnerCustomImageVersions, *Response, error) {
237+
func (s *EnterpriseService) ListHostedRunnerCustomImages(ctx context.Context, enterprise string) (*HostedRunnerCustomImages, *Response, error) {
238238
u := fmt.Sprintf("enterprises/%v/actions/hosted-runners/images/custom", enterprise)
239239
req, err := s.client.NewRequest("GET", u, nil)
240240
if err != nil {
241241
return nil, nil, err
242242
}
243243

244-
images := new(HostedRunnerCustomImageVersions)
244+
images := new(HostedRunnerCustomImages)
245245
resp, err := s.client.Do(ctx, req, images)
246246
if err != nil {
247247
return nil, resp, err

‎github/enterprise_actions_hosted_runners_test.go‎

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -868,16 +868,24 @@ func TestEnterpriseService_ListHostedRunnerCustomImages(t *testing.T) {
868868
"total_count": 2,
869869
"image_versions": [
870870
{
871-
"version": "1.1.0",
872-
"size_gb": 75,
873-
"state": "Ready",
874-
"created_on": "2024-11-09T23:39:01Z"
871+
"id": 1,
872+
"platform": "linux-x64",
873+
"name": "CustomImage1",
874+
"source": "custom",
875+
"versions_count": 4,
876+
"total_versions_size": 200,
877+
"latest_version": "1.3.0",
878+
"state": "Ready"
875879
},
876880
{
877-
"version": "1.0.0",
878-
"size_gb": 75,
879-
"state": "Ready",
880-
"created_on": "2024-11-08T20:39:01Z"
881+
"id": 2,
882+
"platform": "linux-x64",
883+
"name": "CustomImage2",
884+
"source": "custom",
885+
"versions_count": 2,
886+
"total_versions_size": 150,
887+
"latest_version": "1.0.0",
888+
"state": "Ready"
881889
}
882890
]
883891
}`)
@@ -889,20 +897,28 @@ func TestEnterpriseService_ListHostedRunnerCustomImages(t *testing.T) {
889897
t.Errorf("Enterprise.ListHostedRunnerCustomImages returned error: %v", err)
890898
}
891899

892-
want := &HostedRunnerCustomImageVersions{
900+
want := &HostedRunnerCustomImages{
893901
TotalCount: 2,
894-
ImageVersions: []*HostedRunnerCustomImageVersion{
902+
ImageVersions: []*HostedRunnerCustomImage{
895903
{
896-
Version: Ptr("1.1.0"),
897-
SizeGB: Ptr(75),
898-
State: Ptr("Ready"),
899-
CreatedOn: &Timestamp{time.Date(2024, 11, 9, 23, 39, 1, 0, time.UTC)},
904+
ID: Ptr(int64(1)),
905+
Platform: Ptr("linux-x64"),
906+
Name: Ptr("CustomImage1"),
907+
Source: Ptr("custom"),
908+
VersionsCount: Ptr(4),
909+
TotalVersionsSize: Ptr(200),
910+
LatestVersion: Ptr("1.3.0"),
911+
State: Ptr("Ready"),
900912
},
901913
{
902-
Version: Ptr("1.0.0"),
903-
SizeGB: Ptr(75),
904-
State: Ptr("Ready"),
905-
CreatedOn: &Timestamp{time.Date(2024, 11, 8, 20, 39, 1, 0, time.UTC)},
914+
ID: Ptr(int64(2)),
915+
Platform: Ptr("linux-x64"),
916+
Name: Ptr("CustomImage2"),
917+
Source: Ptr("custom"),
918+
VersionsCount: Ptr(2),
919+
TotalVersionsSize: Ptr(150),
920+
LatestVersion: Ptr("1.0.0"),
921+
State: Ptr("Ready"),
906922
},
907923
},
908924
}

0 commit comments

Comments
 (0)