a
/
agola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cmd: fix run list

This commit is contained in:
Simone Gotti 2019-07-04 16:22:11 +02:00
parent 929a6fb654
commit f861e2a647
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cmd/agola/cmd/runlist.go
View File

@ -17,8 +17,10 @@ package cmd
import ( import (
"context" "context"
"fmt" "fmt"
"path"
"agola.io/agola/internal/services/gateway/api" "agola.io/agola/internal/services/gateway/api"
errors "golang.org/x/xerrors"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -34,10 +36,10 @@ var cmdRunList = &cobra.Command{
} }
type runListOptions struct { type runListOptions struct {
statusFilter []string projectRef string
labelFilter []string phaseFilter []string
limit int limit int
start string start string
} }
var runListOpts runListOptions var runListOpts runListOptions
@ -45,11 +47,15 @@ var runListOpts runListOptions
func init() { func init() {
flags := cmdRunList.Flags() flags := cmdRunList.Flags()
flags.StringSliceVarP(&runListOpts.statusFilter, "status", "s", nil, "filter runs matching the provided status. This option can be repeated multiple times") flags.StringVar(&runListOpts.projectRef, "project", "", "project id or full path")
flags.StringArrayVarP(&runListOpts.labelFilter, "label", "l", nil, "filter runs matching the provided label. This option can be repeated multiple times, in this case only runs matching all the labels will be returned") flags.StringSliceVarP(&runListOpts.phaseFilter, "phase", "s", nil, "filter runs matching the provided phase. This option can be repeated multiple times")
flags.IntVar(&runListOpts.limit, "limit", 10, "max number of runs to show") flags.IntVar(&runListOpts.limit, "limit", 10, "max number of runs to show")
flags.StringVar(&runListOpts.start, "start", "", "starting run id (excluded) to fetch") flags.StringVar(&runListOpts.start, "start", "", "starting run id (excluded) to fetch")
if err := cmdRunList.MarkFlagRequired("project"); err != nil {
log.Fatal(err)
}
cmdRun.AddCommand(cmdRunList) cmdRun.AddCommand(cmdRunList)
} }
@ -65,7 +71,12 @@ func printRuns(runs []*api.RunResponse) {
func runList(cmd *cobra.Command, args []string) error { func runList(cmd *cobra.Command, args []string) error {
gwclient := api.NewClient(gatewayURL, token) gwclient := api.NewClient(gatewayURL, token)
runsResp, _, err := gwclient.GetRuns(context.TODO(), runListOpts.statusFilter, runListOpts.labelFilter, []string{}, runListOpts.start, runListOpts.limit, false) project, _, err := gwclient.GetProject(context.TODO(), runListOpts.projectRef)
if err != nil {
return errors.Errorf("failed to get project %s: %v", runListOpts.projectRef, err)
}
groups := []string{path.Join("/project", project.ID)}
runsResp, _, err := gwclient.GetRuns(context.TODO(), runListOpts.phaseFilter, groups, nil, runListOpts.start, runListOpts.limit, false)
if err != nil { if err != nil {
return err return err
} }