Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: improve flags parsing #461

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

feat: improve flags parsing #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b4ab12c
fix: upgrade ffcli version v2->v3
Doozers Sep 15, 2022
a82b084
fix: upgrade moul/u version
Doozers Sep 15, 2022
42eb923
feat: implement moul/climan
Doozers Sep 15, 2022
d0ef6ca
feat: use commonFlagsBuilder as a method
Doozers Sep 15, 2022
c0c27bd
fix: apply review comments
Doozers Sep 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions go.mod
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

53 changes: 36 additions & 17 deletions go/cmd/yolo/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package main
import (
"context"
"flag"
"fmt"
"log"
"math/rand"
"net/http"
Expand All @@ -13,6 +14,7 @@ import (
"berty.tech/yolo/v2/go/pkg/bintray"
"go.uber.org/zap"
"golang.org/x/oauth2"
"moul.io/climan"
"moul.io/hcfilters"
"moul.io/zapconfig"

Expand All @@ -25,19 +27,34 @@ import (
_ "github.com/jinzhu/gorm/dialects/sqlite"
circleci "github.com/jszwedko/go-circleci"
"github.com/peterbourgon/diskv"
ff "github.com/peterbourgon/ff/v2"
"github.com/peterbourgon/ff/v2/ffcli"
ff "github.com/peterbourgon/ff/v3"
)

var (
verbose bool
logFormat string
dbStorePath string
withPreloading bool
)
type globalOptions struct {
verbose bool
logFormat string
dbStorePath string

server serverOpts
}

func (g *globalOptions) applyDefaults() {
g.verbose = false
g.logFormat = "console"
g.dbStorePath = ":memory:"
}

func (g *globalOptions) commonFlagsBuilder(fs *flag.FlagSet) {
fs.BoolVar(&g.verbose, "v", g.verbose, "increase log verbosity")
fs.StringVar(&g.logFormat, "log-format", g.logFormat, strings.Join(zapconfig.AvailablePresets, ", "))
fs.StringVar(&g.dbStorePath, "db-path", g.dbStorePath, "DB Store path")
}

var glOpts = &globalOptions{}

func main() {
err := yolo(os.Args)
glOpts.applyDefaults()
err := yolo(os.Args[1:])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you check how things are going when you run yolo without additional parameter?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

if err != nil {
log.Fatalf("err: %+v", err)
os.Exit(1)
Expand All @@ -49,25 +66,27 @@ func yolo(args []string) error {
rootFlagSet := flag.NewFlagSet("yolo", flag.ExitOnError)
rand.Seed(time.Now().UnixNano())
rootFlagSet.SetOutput(os.Stderr)
rootFlagSet.BoolVar(&verbose, "v", false, "increase log verbosity")
rootFlagSet.StringVar(&logFormat, "log-format", "console", strings.Join(zapconfig.AvailablePresets, ", "))

root := &ffcli.Command{
ShortUsage: `server [flags] <subcommand>`,
FlagSet: rootFlagSet,
Subcommands: []*ffcli.Command{
root := &climan.Command{
ShortUsage: `yolo [flags] <subcommand>`,
FlagSetBuilder: glOpts.commonFlagsBuilder,
Subcommands: []*climan.Command{
serverCommand(),
dumpObjectsCommand(),
infoCommand(),
treeCommand(),
},
Options: []ff.Option{ff.WithEnvVarNoPrefix()},
FFOptions: []ff.Option{ff.WithEnvVarNoPrefix()},
Exec: func(_ context.Context, _ []string) error {
return flag.ErrHelp
},
}

return root.ParseAndRun(context.Background(), os.Args[1:])
if err := root.Parse(args); err != nil {
return fmt.Errorf("parse error: %w", err)
}

return root.Run(context.Background())
}

func bintrayClientFromArgs(username, token string, logger *zap.Logger) (*bintray.Client, error) {
Expand Down
Loading