Skip to content

Commit e8a20cb

Browse files
austenstoneaustenstone
committed
Fix images JSON tag and add state_details field per review
1 parent 29b8b22 commit e8a20cb

5 files changed

Lines changed: 66 additions & 34 deletions

‎github/actions_hosted_runners.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,16 +174,17 @@ type HostedRunnerCustomImage struct {
174174

175175
// HostedRunnerCustomImages represents a collection of custom images for GitHub-hosted runners.
176176
type HostedRunnerCustomImages struct {
177-
TotalCount int `json:"total_count"`
178-
ImageVersions []*HostedRunnerCustomImage `json:"image_versions"`
177+
TotalCount int `json:"total_count"`
178+
Images []*HostedRunnerCustomImage `json:"images"`
179179
}
180180

181181
// HostedRunnerCustomImageVersion represents a version of a custom image for GitHub-hosted runners.
182182
type HostedRunnerCustomImageVersion struct {
183-
Version *string `json:"version,omitempty"`
184-
SizeGB *int `json:"size_gb,omitempty"`
185-
State *string `json:"state,omitempty"`
186-
CreatedOn *Timestamp `json:"created_on,omitempty"`
183+
Version *string `json:"version,omitempty"`
184+
SizeGB *int `json:"size_gb,omitempty"`
185+
State *string `json:"state,omitempty"`
186+
StateDetails *string `json:"state_details,omitempty"`
187+
CreatedOn *Timestamp `json:"created_on,omitempty"`
187188
}
188189

189190
// HostedRunnerCustomImageVersions represents a collection of versions of a custom image.

‎github/actions_hosted_runners_test.go‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,7 @@ func TestActionsService_ListHostedRunnerCustomImages(t *testing.T) {
867867
testMethod(t, r, "GET")
868868
fmt.Fprint(w, `{
869869
"total_count": 2,
870-
"image_versions": [
870+
"images": [
871871
{
872872
"id": 1,
873873
"platform": "linux-x64",
@@ -900,7 +900,7 @@ func TestActionsService_ListHostedRunnerCustomImages(t *testing.T) {
900900

901901
want := &HostedRunnerCustomImages{
902902
TotalCount: 2,
903-
ImageVersions: []*HostedRunnerCustomImage{
903+
Images: []*HostedRunnerCustomImage{
904904
{
905905
ID: Ptr(int64(1)),
906906
Platform: Ptr("linux-x64"),
@@ -1035,12 +1035,14 @@ func TestActionsService_ListHostedRunnerCustomImageVersions(t *testing.T) {
10351035
"version": "1.1.0",
10361036
"size_gb": 75,
10371037
"state": "Ready",
1038+
"state_details": "None",
10381039
"created_on": "2024-11-09T23:39:01Z"
10391040
},
10401041
{
10411042
"version": "1.0.0",
10421043
"size_gb": 75,
10431044
"state": "Ready",
1045+
"state_details": "None",
10441046
"created_on": "2024-11-08T20:39:01Z"
10451047
}
10461048
]
@@ -1057,16 +1059,18 @@ func TestActionsService_ListHostedRunnerCustomImageVersions(t *testing.T) {
10571059
TotalCount: 2,
10581060
ImageVersions: []*HostedRunnerCustomImageVersion{
10591061
{
1060-
Version: Ptr("1.1.0"),
1061-
SizeGB: Ptr(75),
1062-
State: Ptr("Ready"),
1063-
CreatedOn: &Timestamp{time.Date(2024, 11, 9, 23, 39, 1, 0, time.UTC)},
1062+
Version: Ptr("1.1.0"),
1063+
SizeGB: Ptr(75),
1064+
State: Ptr("Ready"),
1065+
StateDetails: Ptr("None"),
1066+
CreatedOn: &Timestamp{time.Date(2024, 11, 9, 23, 39, 1, 0, time.UTC)},
10641067
},
10651068
{
1066-
Version: Ptr("1.0.0"),
1067-
SizeGB: Ptr(75),
1068-
State: Ptr("Ready"),
1069-
CreatedOn: &Timestamp{time.Date(2024, 11, 8, 20, 39, 1, 0, time.UTC)},
1069+
Version: Ptr("1.0.0"),
1070+
SizeGB: Ptr(75),
1071+
State: Ptr("Ready"),
1072+
StateDetails: Ptr("None"),
1073+
CreatedOn: &Timestamp{time.Date(2024, 11, 8, 20, 39, 1, 0, time.UTC)},
10701074
},
10711075
},
10721076
}
@@ -1100,6 +1104,7 @@ func TestActionsService_GetHostedRunnerCustomImageVersion(t *testing.T) {
11001104
"version": "1.0.0",
11011105
"size_gb": 75,
11021106
"state": "Ready",
1107+
"state_details": "None",
11031108
"created_on": "2024-11-08T20:39:01Z"
11041109
}`)
11051110
})
@@ -1111,10 +1116,11 @@ func TestActionsService_GetHostedRunnerCustomImageVersion(t *testing.T) {
11111116
}
11121117

11131118
want := &HostedRunnerCustomImageVersion{
1114-
Version: Ptr("1.0.0"),
1115-
SizeGB: Ptr(75),
1116-
State: Ptr("Ready"),
1117-
CreatedOn: &Timestamp{time.Date(2024, 11, 8, 20, 39, 1, 0, time.UTC)},
1119+
Version: Ptr("1.0.0"),
1120+
SizeGB: Ptr(75),
1121+
State: Ptr("Ready"),
1122+
StateDetails: Ptr("None"),
1123+
CreatedOn: &Timestamp{time.Date(2024, 11, 8, 20, 39, 1, 0, time.UTC)},
11181124
}
11191125

11201126
if !cmp.Equal(version, want) {

‎github/enterprise_actions_hosted_runners_test.go‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ func TestEnterpriseService_ListHostedRunnerCustomImages(t *testing.T) {
866866
testMethod(t, r, "GET")
867867
fmt.Fprint(w, `{
868868
"total_count": 2,
869-
"image_versions": [
869+
"images": [
870870
{
871871
"id": 1,
872872
"platform": "linux-x64",
@@ -899,7 +899,7 @@ func TestEnterpriseService_ListHostedRunnerCustomImages(t *testing.T) {
899899

900900
want := &HostedRunnerCustomImages{
901901
TotalCount: 2,
902-
ImageVersions: []*HostedRunnerCustomImage{
902+
Images: []*HostedRunnerCustomImage{
903903
{
904904
ID: Ptr(int64(1)),
905905
Platform: Ptr("linux-x64"),
@@ -1034,12 +1034,14 @@ func TestEnterpriseService_ListHostedRunnerCustomImageVersions(t *testing.T) {
10341034
"version": "1.1.0",
10351035
"size_gb": 75,
10361036
"state": "Ready",
1037+
"state_details": "None",
10371038
"created_on": "2024-11-09T23:39:01Z"
10381039
},
10391040
{
10401041
"version": "1.0.0",
10411042
"size_gb": 75,
10421043
"state": "Ready",
1044+
"state_details": "None",
10431045
"created_on": "2024-11-08T20:39:01Z"
10441046
}
10451047
]
@@ -1056,16 +1058,18 @@ func TestEnterpriseService_ListHostedRunnerCustomImageVersions(t *testing.T) {
10561058
TotalCount: 2,
10571059
ImageVersions: []*HostedRunnerCustomImageVersion{
10581060
{
1059-
Version: Ptr("1.1.0"),
1060-
SizeGB: Ptr(75),
1061-
State: Ptr("Ready"),
1062-
CreatedOn: &Timestamp{time.Date(2024, 11, 9, 23, 39, 1, 0, time.UTC)},
1061+
Version: Ptr("1.1.0"),
1062+
SizeGB: Ptr(75),
1063+
State: Ptr("Ready"),
1064+
StateDetails: Ptr("None"),
1065+
CreatedOn: &Timestamp{time.Date(2024, 11, 9, 23, 39, 1, 0, time.UTC)},
10631066
},
10641067
{
1065-
Version: Ptr("1.0.0"),
1066-
SizeGB: Ptr(75),
1067-
State: Ptr("Ready"),
1068-
CreatedOn: &Timestamp{time.Date(2024, 11, 8, 20, 39, 1, 0, time.UTC)},
1068+
Version: Ptr("1.0.0"),
1069+
SizeGB: Ptr(75),
1070+
State: Ptr("Ready"),
1071+
StateDetails: Ptr("None"),
1072+
CreatedOn: &Timestamp{time.Date(2024, 11, 8, 20, 39, 1, 0, time.UTC)},
10691073
},
10701074
},
10711075
}
@@ -1099,6 +1103,7 @@ func TestEnterpriseService_GetHostedRunnerCustomImageVersion(t *testing.T) {
10991103
"version": "1.0.0",
11001104
"size_gb": 75,
11011105
"state": "Ready",
1106+
"state_details": "None",
11021107
"created_on": "2024-11-08T20:39:01Z"
11031108
}`)
11041109
})
@@ -1110,10 +1115,11 @@ func TestEnterpriseService_GetHostedRunnerCustomImageVersion(t *testing.T) {
11101115
}
11111116

11121117
want := &HostedRunnerCustomImageVersion{
1113-
Version: Ptr("1.0.0"),
1114-
SizeGB: Ptr(75),
1115-
State: Ptr("Ready"),
1116-
CreatedOn: &Timestamp{time.Date(2024, 11, 8, 20, 39, 1, 0, time.UTC)},
1118+
Version: Ptr("1.0.0"),
1119+
SizeGB: Ptr(75),
1120+
State: Ptr("Ready"),
1121+
StateDetails: Ptr("None"),
1122+
CreatedOn: &Timestamp{time.Date(2024, 11, 8, 20, 39, 1, 0, time.UTC)},
11171123
}
11181124

11191125
if !cmp.Equal(version, want) {

‎github/github-accessors.go‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎github/github-accessors_test.go‎

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)