STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8447 from cli/andyfeller/8446-run-exported-jobs

Browse source 
Fix run exported jobs error for completedAt
This commit is contained in:
Andy Feller 2023-12-11 10:11:09 -05:00 • committed by GitHub
commit df249bc16c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 100 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/cmd/run/shared/shared.go
View file

@ -186,9 +186,9 @@ func (r *Run) ExportData(fields []string) map[string]interface{} {
"number": s.Number,
})
}
var completedAt *time.Time
var completedAt time.Time
if !j.CompletedAt.IsZero() {
completedAt = &j.CompletedAt
completedAt = j.CompletedAt
}
jobs = append(jobs, map[string]interface{}{
"databaseId": j.ID,
@ -200,8 +200,8 @@ func (r *Run) ExportData(fields []string) map[string]interface{} {
"completedAt": completedAt,
"url": j.URL,
})
data[f] = jobs
}
data[f] = jobs
default:
sf := fieldByName(v, f)
data[f] = sf.Interface()

97
pkg/cmd/run/shared/shared_test.go
View file

@ -1,8 +1,10 @@
package shared
import (
"bytes"
"encoding/json"
"net/http"
"strings"
"testing"
"time"
@ -11,6 +13,7 @@ import (
"github.com/cli/cli/v2/internal/ghrepo"
"github.com/cli/cli/v2/pkg/httpmock"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestPreciseAgo(t *testing.T) {
@ -104,3 +107,97 @@ func TestRun_Duration(t *testing.T) {
})
}
}
func TestRunExportData(t *testing.T) {
oldestStartedAt, _ := time.Parse(time.RFC3339, "2022-07-20T11:20:13Z")
oldestCompletedAt, _ := time.Parse(time.RFC3339, "2022-07-20T11:21:16Z")
newestStartedAt, _ := time.Parse(time.RFC3339, "2022-07-20T11:20:55Z")
newestCompletedAt, _ := time.Parse(time.RFC3339, "2022-07-20T11:23:16Z")
tests := []struct {
name string
fields []string
run Run
output string
}{
{
name: "exports workflow run's single job",
fields: []string{"jobs"},
run: Run{
Jobs: []Job{
{
ID: 123456,
Status: "completed",
Conclusion: "success",
Name: "macos",
Steps: []Step{
{
Name: "Checkout",
Status: "completed",
Conclusion: "success",
Number: 1,
},
},
StartedAt: oldestStartedAt,
CompletedAt: oldestCompletedAt,
URL: "https://example.com/OWNER/REPO/actions/runs/123456",
},
},
},
output: `{"jobs":[{"completedAt":"2022-07-20T11:21:16Z","conclusion":"success","databaseId":123456,"name":"macos","startedAt":"2022-07-20T11:20:13Z","status":"completed","steps":[{"conclusion":"success","name":"Checkout","number":1,"status":"completed"}],"url":"https://example.com/OWNER/REPO/actions/runs/123456"}]}`,
},
{
name: "exports workflow run's multiple jobs",
fields: []string{"jobs"},
run: Run{
Jobs: []Job{
{
ID: 123456,
Status: "completed",
Conclusion: "success",
Name: "macos",
Steps: []Step{
{
Name: "Checkout",
Status: "completed",
Conclusion: "success",
Number: 1,
},
},
StartedAt: oldestStartedAt,
CompletedAt: oldestCompletedAt,
URL: "https://example.com/OWNER/REPO/actions/runs/123456",
},
{
ID: 234567,
Status: "completed",
Conclusion: "error",
Name: "windows",
Steps: []Step{
{
Name: "Checkout",
Status: "completed",
Conclusion: "error",
Number: 2,
},
},
StartedAt: newestStartedAt,
CompletedAt: newestCompletedAt,
URL: "https://example.com/OWNER/REPO/actions/runs/234567",
},
},
},
output: `{"jobs":[{"completedAt":"2022-07-20T11:21:16Z","conclusion":"success","databaseId":123456,"name":"macos","startedAt":"2022-07-20T11:20:13Z","status":"completed","steps":[{"conclusion":"success","name":"Checkout","number":1,"status":"completed"}],"url":"https://example.com/OWNER/REPO/actions/runs/123456"},{"completedAt":"2022-07-20T11:23:16Z","conclusion":"error","databaseId":234567,"name":"windows","startedAt":"2022-07-20T11:20:55Z","status":"completed","steps":[{"conclusion":"error","name":"Checkout","number":2,"status":"completed"}],"url":"https://example.com/OWNER/REPO/actions/runs/234567"}]}`,
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
exported := tt.run.ExportData(tt.fields)
buf := bytes.Buffer{}
enc := json.NewEncoder(&buf)
require.NoError(t, enc.Encode(exported))
assert.Equal(t, tt.output, strings.TrimSpace(buf.String()))
})
}
}