use simple logging

Author: cuotos

.gitignore

@@ -1 +1,2 @@
 dist/
+main_sandbox_test.go

go.mod

@@ -20,6 +20,7 @@ require (
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
+	github.com/hashicorp/logutils v1.0.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	golang.org/x/crypto v0.9.0 // indirect
 	golang.org/x/net v0.10.0 // indirect

go.sum

@@ -26,6 +26,8 @@ github.com/google/go-github/v33 v33.0.0/go.mod h1:GMdDnVZY/2TsWgp/lkYnpSAh6TrzhA
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
+github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y=
+github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8=
 github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

main.go

@@ -17,6 +17,7 @@ import (
 
 	"github.com/cuotos/outstanding-prs/filter"
 	"github.com/google/go-github/v33/github"
+	"github.com/hashicorp/logutils"
 	"github.com/kelseyhightower/envconfig"
 	"github.com/zalando/go-keyring"
 	"golang.org/x/oauth2"
@@ -59,28 +60,47 @@ type PullRequest struct {
 	Draft     bool
 }
 
-func init() {
-	log.SetOutput(os.Stdout)
-	log.SetFlags(log.LstdFlags | log.Lshortfile)
+type flags struct {
+	version         *bool
+	jsonOutput      *bool
+	all             *bool
+	incApproved     *bool
+	searchWholeTeam *bool
+	incDrafts       *bool
+	reauth          *bool
+	logLevel        *string
 }
 
 func main() {
-	if err := run(); err != nil {
-		log.Fatal(err)
+	flags := flags{}
+	flags.version = flag.Bool("v", false, "prints version")
+	flags.jsonOutput = flag.Bool("json", false, "print output in JSON format")
+	flags.all = flag.Bool("all", false, "include PRs ready to merge. DEPRECATED: use -approved")
+	flags.incApproved = flag.Bool("approved", false, "include PRs ready to merge")
+	flags.searchWholeTeam = flag.Bool("team", false, "should look up all members of the team. defaults to just calling user")
+	flags.incDrafts = flag.Bool("drafts", false, "include PRs that are in draft")
+	flags.reauth = flag.Bool("reauth", false, "clears tokens and authorise against Github.com")
+	flags.logLevel = flag.String("log-level", "INFO", "set log level DEBUG, INFO, WARN, or ERROR")
+
+	flag.Parse()
+
+	log.SetOutput(os.Stdout)
+	log.SetFlags(log.LstdFlags | log.Lshortfile)
+	logFilter := &logutils.LevelFilter{
+		Levels:   []logutils.LogLevel{"DEBUG", "INFO", "WARN", "ERROR"},
+		MinLevel: logutils.LogLevel(strings.ToUpper(*flags.logLevel)),
+		Writer:   os.Stderr,
+	}
+	log.SetOutput(logFilter)
+
+	if err := run(flags); err != nil {
+		log.Printf("[ERROR] %s", err)
 	}
 }
 
-func run() error {
-	v := flag.Bool("v", false, "prints version")
-	jsonOutput := flag.Bool("json", false, "print output in JSON format")
-	all := flag.Bool("all", false, "include PRs ready to merge. DEPRECATED: use -approved")
-	incApproved := flag.Bool("approved", false, "include PRs ready to merge")
-	searchWholeTeam := flag.Bool("team", false, "should look up all members of the team. defaults to just calling user")
-	incDrafts := flag.Bool("drafts", false, "include PRs that are in draft")
-	reauth := flag.Bool("reauth", false, "clears tokens and authorise against Github.com")
+func run(flags flags) error {
 
-	flag.Parse()
-	if *v {
+	if *flags.version {
 		fmt.Printf("%s-%s", version, commit)
 		os.Exit(0)
 	}
@@ -91,15 +111,15 @@ func run() error {
 		return err
 	}
 
-	accessToken, err := getGithubOAuthAccessToken(*reauth)
+	accessToken, err := getGithubOAuthAccessToken(*flags.reauth)
 	if err != nil {
 		return err
 	}
 
 	client := getGithubClient(accessToken)
 
 	members := []*github.User{}
-	if *searchWholeTeam {
+	if *flags.searchWholeTeam {
 		members, err = getOrgTeamMembers(client, conf.GithubOrg, conf.GithubTeam)
 		if err != nil {
 			return err
@@ -112,22 +132,22 @@ func run() error {
 		members = append(members, user)
 	}
 
-	queryString, err := generateQueryString(conf.GithubOrg, members, filter.WithIncludeApproved(*all || *incApproved), filter.WithIncludeDraft(*incDrafts))
+	queryString, err := generateQueryString(conf.GithubOrg, members, filter.WithIncludeApproved(*flags.all || *flags.incApproved), filter.WithIncludeDraft(*flags.incDrafts))
 	if err != nil {
 		return err
 	}
 
-	log.Printf(`Looking for PRs with the following query: "%s"`, queryString)
+	log.Printf(`[DEBUG] Looking for PRs with the following query: "%s"`, queryString)
 
 	prs, err := getPullRequests(client, queryString)
 	if err != nil {
 		return err
 	}
 
-	if *jsonOutput {
+	if *flags.jsonOutput {
 		printOutputJSON(prs)
 	} else {
-		printOutput(prs, conf.GithubOrg, conf.GithubTeam, *incDrafts)
+		printOutput(prs, conf.GithubOrg, conf.GithubTeam, *flags.incDrafts)
 	}
 
 	return nil
@@ -319,7 +339,7 @@ func getGithubOAuthAccessToken(reauth bool) (string, error) {
 	if err == keyring.ErrNotFound || reauth {
 		// Token file does not exists
 
-		log.Println("token not found, begin auth flow")
+		log.Println("[WARN] token not found, begin auth flow")
 
 		flow := &oauth.Flow{
 			Host:     oauth.GitHubHost("https://github.com"),
@@ -329,6 +349,9 @@ func getGithubOAuthAccessToken(reauth bool) (string, error) {
 
 		fmt.Println(flow.Host.DeviceCodeURL)
 		ghToken, err := flow.DeviceFlow()
+		if err != nil {
+			return token, err
+		}
 		token = ghToken.Token
 
 		if errors.Is(err, device.ErrUnsupported) {