fix(governctl): Tidy up command parsing

Signed-off-by: Cezar Craciunoiu <cezar.craciunoiu@gmail.com>

Author: craciunoiuc

cmd/governctl/main.go

@@ -76,12 +76,7 @@ func main() {
 	ctx = kitcfg.WithConfigManager(ctx, cfgm)
 
 	// Attribute all configuration flags and command-line argument values
-	cmd, args, err := cmd.Find(os.Args[1:])
-	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
-	}
-	if err := cmdfactory.AttributeFlags(cmd, &cfg, args...); err != nil {
+	if err := cmdfactory.AttributeFlags(cmd, &cfg, os.Args[1:]...); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}

cmd/governctl/pr/check/merable.go

@@ -50,7 +50,7 @@ func NewMergable() *cobra.Command {
 	cmd, err := cmdfactory.New(&Mergable{}, cobra.Command{
 		Use:   "mergable [OPTIONS] ORG/REPO/PRID",
 		Short: "Check whether a PR satisfies the provided merge requirements",
-		Args:  cmdutils.OrgRepoAndPullRequestNumber(),
+		Args:  cobra.MaximumNArgs(2),
 		Annotations: map[string]string{
 			cmdfactory.AnnotationHelpGroup: "pr",
 		},

cmd/governctl/pr/check/patch.go

@@ -49,7 +49,7 @@ func NewPatch() *cobra.Command {
 	cmd, err := cmdfactory.New(&Patch{}, cobra.Command{
 		Use:   "patch [OPTIONS] ORG/REPO/PRID",
 		Short: "Run checkpatch against a pull request",
-		Args:  cmdutils.OrgRepoAndPullRequestNumber(),
+		Args:  cobra.MaximumNArgs(2),
 		Annotations: map[string]string{
 			cmdfactory.AnnotationHelpGroup: "pr",
 		},
@@ -68,6 +68,8 @@ func NewPatch() *cobra.Command {
 func (opts *Patch) Run(ctx context.Context, args []string) error {
 	var extraIgnores []string
 
+	fmt.Printf("args: %v\n", args)
+
 	ghOrg, ghRepo, ghPrId, err := cmdutils.ParseOrgRepoAndPullRequestArgs(args)
 	if err != nil {
 		return err

cmd/governctl/pr/merge.go

@@ -64,7 +64,7 @@ func NewMerge() *cobra.Command {
 	cmd, err := cmdfactory.New(&Merge{}, cobra.Command{
 		Use:   "merge [OPTIONS] ORG/REPO/PRID",
 		Short: "Merge a pull request",
-		Args:  cmdutils.OrgRepoAndPullRequestNumber(),
+		Args:  cobra.MaximumNArgs(2),
 		Annotations: map[string]string{
 			cmdfactory.AnnotationHelpGroup: "pr",
 		},

cmd/governctl/pr/sync/labels.go

@@ -34,7 +34,7 @@ func NewLabels() *cobra.Command {
 	cmd, err := cmdfactory.New(&Labels{}, cobra.Command{
 		Use:   "labels [OPTIONS] ORG/REPO/PRID",
 		Short: "Synchronise a pull request's labels",
-		Args:  cmdutils.OrgRepoAndPullRequestNumber(),
+		Args:  cobra.MaximumNArgs(2),
 		Annotations: map[string]string{
 			cmdfactory.AnnotationHelpGroup: "pr",
 		},

cmd/governctl/pr/sync/reviewers.go

@@ -42,7 +42,7 @@ func NewReviewers() *cobra.Command {
 	cmd, err := cmdfactory.New(&Reviewers{}, cobra.Command{
 		Use:   "reviewers [OPTIONS] ORG/REPO/PRID",
 		Short: "Synchronise a pull request's assignees (maintainers) and reviewers",
-		Args:  cmdutils.OrgRepoAndPullRequestNumber(),
+		Args:  cobra.MaximumNArgs(2),
 		Annotations: map[string]string{
 			cmdfactory.AnnotationHelpGroup: "pr",
 		},

internal/cmdutils/args.go

@@ -11,22 +11,8 @@ import (
 	"os"
 	"strconv"
 	"strings"
-
-	"github.com/spf13/cobra"
-	"kraftkit.sh/cmdfactory"
 )
 
-// OrgRepoAndPullRequestNumber
-func OrgRepoAndPullRequestNumber() cobra.PositionalArgs {
-	return func(_ *cobra.Command, args []string) error {
-		if _, _, _, err := ParseOrgRepoAndPullRequestArgs(args); err != nil {
-			return cmdfactory.FlagErrorf("%w", err)
-		}
-
-		return nil
-	}
-}
-
 // ParseOrgRepoAndPullRequestArgs accepts input command-line arguments in the
 // following forms:
 //