Merge pull request cli#3432 from cli/actions-int64

Nate Smith · web-flow · commit 057f5f26312c · 2021-04-19T13:22:49.000-05:00
use int64 explicitly in Actions support
diff --git a/pkg/cmd/run/list/list_test.go b/pkg/cmd/run/list/list_test.go
@@ -132,7 +132,7 @@ func TestListRun(t *testing.T) {
 				Limit: 101,
 			},
 			stubs: func(reg *httpmock.Registry) {
-				runID := 0
+				var runID int64
 				runs := []shared.Run{}
 				for runID < 103 {
 					runs = append(runs, shared.TestRun(fmt.Sprintf("%d", runID), runID, shared.InProgress, ""))
diff --git a/pkg/cmd/run/shared/shared.go b/pkg/cmd/run/shared/shared.go
@@ -48,7 +48,7 @@ type Run struct {
 	Status         Status
 	Conclusion     Conclusion
 	Event          string
-	ID             int
+	ID             int64
 	HeadBranch     string `json:"head_branch"`
 	JobsURL        string `json:"jobs_url"`
 	HeadCommit     Commit `json:"head_commit"`
@@ -78,15 +78,15 @@ func (r Run) CommitMsg() string {
 }
 
 type Job struct {
-	ID          int
+	ID          int64
 	Status      Status
 	Conclusion  Conclusion
 	Name        string
 	Steps       Steps
 	StartedAt   time.Time `json:"started_at"`
 	CompletedAt time.Time `json:"completed_at"`
 	URL         string    `json:"html_url"`
-	RunID       int       `json:"run_id"`
+	RunID       int64     `json:"run_id"`
 }
 
 type Step struct {
@@ -123,7 +123,7 @@ func AnnotationSymbol(cs *iostreams.ColorScheme, a Annotation) string {
 }
 
 type CheckRun struct {
-	ID int
+	ID int64
 }
 
 func GetAnnotations(client *api.Client, repo ghrepo.Interface, job Job) ([]Annotation, error) {
@@ -179,7 +179,7 @@ func GetRunsWithFilter(client *api.Client, repo ghrepo.Interface, limit int, f f
 	return filtered, nil
 }
 
-func GetRunsByWorkflow(client *api.Client, repo ghrepo.Interface, limit, workflowID int) ([]Run, error) {
+func GetRunsByWorkflow(client *api.Client, repo ghrepo.Interface, limit int, workflowID int64) ([]Run, error) {
 	path := fmt.Sprintf("repos/%s/actions/workflows/%d/runs", ghrepo.FullName(repo), workflowID)
 	return getRuns(client, repo, path, limit)
 }
diff --git a/pkg/cmd/run/shared/test.go b/pkg/cmd/run/shared/test.go
@@ -16,7 +16,7 @@ func updated() time.Time {
 	return updated
 }
 
-func TestRun(name string, id int, s Status, c Conclusion) Run {
+func TestRun(name string, id int64, s Status, c Conclusion) Run {
 	return Run{
 		Name:       name,
 		ID:         id,
diff --git a/pkg/cmd/run/view/view.go b/pkg/cmd/run/view/view.go
@@ -280,7 +280,7 @@ func runView(opts *ViewOptions) error {
 
 	var artifacts []shared.Artifact
 	if selectedJob == nil {
-		artifacts, err = shared.ListArtifacts(httpClient, repo, strconv.Itoa(run.ID))
+		artifacts, err = shared.ListArtifacts(httpClient, repo, strconv.FormatInt(int64(run.ID), 10))
 		if err != nil {
 			return fmt.Errorf("failed to get artifacts: %w", err)
 		}
diff --git a/pkg/cmd/run/watch/watch.go b/pkg/cmd/run/watch/watch.go
@@ -136,7 +136,7 @@ func watchRun(opts *WatchOptions) error {
 	// clear entire screen
 	fmt.Fprintf(out, "\x1b[2J")
 
-	annotationCache := map[int][]shared.Annotation{}
+	annotationCache := map[int64][]shared.Annotation{}
 
 	duration, err := time.ParseDuration(fmt.Sprintf("%ds", opts.Interval))
 	if err != nil {
@@ -166,7 +166,7 @@ func watchRun(opts *WatchOptions) error {
 	return nil
 }
 
-func renderRun(opts WatchOptions, client *api.Client, repo ghrepo.Interface, run *shared.Run, prNumber string, annotationCache map[int][]shared.Annotation) (*shared.Run, error) {
+func renderRun(opts WatchOptions, client *api.Client, repo ghrepo.Interface, run *shared.Run, prNumber string, annotationCache map[int64][]shared.Annotation) (*shared.Run, error) {
 	out := opts.IO.Out
 	cs := opts.IO.ColorScheme()
 
diff --git a/pkg/cmd/workflow/list/list_test.go b/pkg/cmd/workflow/list/list_test.go
@@ -148,7 +148,8 @@ func TestListRun(t *testing.T) {
 			},
 			stubs: func(reg *httpmock.Registry) {
 				workflows := []shared.Workflow{}
-				for flowID := 0; flowID < 103; flowID++ {
+				var flowID int64
+				for flowID = 0; flowID < 103; flowID++ {
 					workflows = append(workflows, shared.Workflow{
 						ID:    flowID,
 						Name:  fmt.Sprintf("flow %d", flowID),
diff --git a/pkg/cmd/workflow/shared/shared.go b/pkg/cmd/workflow/shared/shared.go
@@ -24,7 +24,7 @@ type WorkflowState string
 
 type Workflow struct {
 	Name  string
-	ID    int
+	ID    int64
 	Path  string
 	State WorkflowState
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ func updated() time.Time {`
`16`	`16`	`return updated`
`17`	`17`	`}`
`18`	`18`
`19`		`-func TestRun(name string, id int, s Status, c Conclusion) Run {`
	`19`	`+func TestRun(name string, id int64, s Status, c Conclusion) Run {`
`20`	`20`	`return Run{`
`21`	`21`	`Name: name,`
`22`	`22`	`ID: id,`
Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ func runView(opts *ViewOptions) error {`
`280`	`280`
`281`	`281`	`var artifacts []shared.Artifact`
`282`	`282`	`if selectedJob == nil {`
`283`		`- artifacts, err = shared.ListArtifacts(httpClient, repo, strconv.Itoa(run.ID))`
	`283`	`+ artifacts, err = shared.ListArtifacts(httpClient, repo, strconv.FormatInt(int64(run.ID), 10))`
`284`	`284`	`if err != nil {`
`285`	`285`	`return fmt.Errorf("failed to get artifacts: %w", err)`
`286`	`286`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ type WorkflowState string`
`24`	`24`
`25`	`25`	`type Workflow struct {`
`26`	`26`	`Name string`
`27`		`- ID int`
	`27`	`+ ID int64`
`28`	`28`	`Path string`
`29`	`29`	`State WorkflowState`
`30`	`30`	`}`