feat: add tree command (build, artifacts) (#449)

Co-authored-by: Manfred Touron <[email protected]>
berty · Sep 8, 2022 · 253ad21 · 253ad21
1 parent dd833d1
commit 253ad21
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 7 deletions.
diff --git a/go/cmd/yolo/main.go b/go/cmd/yolo/main.go
@@ -15,6 +15,12 @@ import (
 	"berty.tech/yolo/v2/go/pkg/bintray"
 	"berty.tech/yolo/v2/go/pkg/yolopb"
 	"berty.tech/yolo/v2/go/pkg/yolosvc"
+	"go.uber.org/zap"
+	"golang.org/x/oauth2"
+	"moul.io/godev"
+	"moul.io/hcfilters"
+	"moul.io/zapconfig"
+
 	"github.com/buildkite/go-buildkite/buildkite"
 	"github.com/google/go-github/v32/github"
 	"github.com/gregjones/httpcache"
@@ -28,11 +34,6 @@ import (
 	ff "github.com/peterbourgon/ff/v2"
 	"github.com/peterbourgon/ff/v2/ffcli"
 	"github.com/tevino/abool"
-	"go.uber.org/zap"
-	"golang.org/x/oauth2"
-	"moul.io/godev"
-	"moul.io/hcfilters"
-	"moul.io/zapconfig"
 )
 
 func main() {
@@ -264,7 +265,7 @@ func yolo(args []string) error {
 
 			ctx := context.Background()
 			input := &yolopb.DevDumpObjects_Request{
-				WithPreloading: withPreloading,
+				WithPreloading: true,
 			}
 			ret, err := svc.DevDumpObjects(ctx, input)
 			if err != nil {
@@ -276,6 +277,42 @@ func yolo(args []string) error {
 		},
 	}
 
+	tree := &ffcli.Command{
+		Name:    `tree`,
+		FlagSet: storeFlagSet,
+		Options: []ff.Option{ff.WithEnvVarNoPrefix()},
+		Exec: func(ctx context.Context, _ []string) error {
+			logger, err := loggerFromArgs(verbose, logFormat)
+			if err != nil {
+				return err
+			}
+			db, err := dbFromArgs(dbStorePath, logger)
+			if err != nil {
+				return err
+			}
+			defer db.Close()
+
+			svc, err := yolosvc.NewService(db, yolosvc.ServiceOpts{
+				Logger:  logger,
+				DevMode: true,
+			})
+			if err != nil {
+				return err
+			}
+
+			input := &yolopb.DevDumpObjects_Request{
+				WithPreloading: true,
+			}
+			ret, err := svc.DevDumpObjects(ctx, input)
+			if err != nil {
+				return err
+			}
+			fmt.Println(ret.Batch.DisplayTreeFormat())
+
+			return nil
+		},
+	}
+
 	info := &ffcli.Command{
 		Name:    `info`,
 		FlagSet: storeFlagSet,
@@ -313,7 +350,7 @@ func yolo(args []string) error {
 	root := &ffcli.Command{
 		ShortUsage:  `server [flags] <subcommand>`,
 		FlagSet:     rootFlagSet,
-		Subcommands: []*ffcli.Command{server, dumpObjects, info},
+		Subcommands: []*ffcli.Command{server, dumpObjects, info, tree},
 		Options:     []ff.Option{ff.WithEnvVarNoPrefix()},
 		Exec: func(_ context.Context, _ []string) error {
 			return flag.ErrHelp

diff --git a/go/pkg/yolopb/batch.go b/go/pkg/yolopb/batch.go
@@ -1,5 +1,10 @@
 package yolopb
 
+import (
+	"fmt"
+	"sort"
+)
+
 func NewBatch() *Batch {
 	return &Batch{
 		Builds:        []*Build{},
@@ -136,3 +141,19 @@ func (b *Batch) AllObjects() []interface{} {
 	}
 	return all
 }
+
+func (b *Batch) DisplayTreeFormat() (res string) {
+	sort.Slice(b.Builds, func(i, j int) bool {
+		return b.Builds[i].FinishedAt.Before(*b.Builds[j].FinishedAt)
+	})
+	for _, build := range b.Builds {
+		res += fmt.Sprintf(" - builds: %s from %s\n", build.ShortID, build.GetHasProjectID())
+		for _, a := range b.Artifacts {
+			if a.HasBuildID == build.ID {
+				res += fmt.Sprintf(" - > artifacts: %s\n", a.LocalPath)
+			}
+		}
+		res += "\n"
+	}
+	return
+}