Merge pull request kubernetes#2756 from spiffxp/kepctl-query-flags

kepctl: add query flags and test coverage, add create flags

Author: k8s-ci-robot

pkg/kepctl/commands/create.go

@@ -28,10 +28,10 @@ func addCreate(topLevel *cobra.Command) {
 	co := proposal.CreateOpts{}
 
 	cmd := &cobra.Command{
-		Use:           "create [KEP]",
+		Use:           "create",
 		Short:         "Create a new KEP",
 		Long:          "Create a new KEP using the current KEP template for the given type",
-		Example:       `  kepctl create sig-architecture/000-mykep`,
+		Example:       `  kepctl create --name a-path --title "My KEP" --number 123 --owning-sig sig-foo`,
 		SilenceUsage:  true,
 		SilenceErrors: true,
 		PreRunE: func(cmd *cobra.Command, args []string) error {
@@ -50,6 +50,20 @@ func addCreate(topLevel *cobra.Command) {
 		"KEP Title",
 	)
 
+	cmd.PersistentFlags().StringVar(
+		&co.Number,
+		"number",
+		"",
+		"Number",
+	)
+
+	cmd.PersistentFlags().StringVar(
+		&co.Name,
+		"name",
+		"",
+		"Name",
+	)
+
 	cmd.PersistentFlags().StringArrayVar(
 		&co.Authors,
 		"authors",
@@ -79,9 +93,16 @@ func addCreate(topLevel *cobra.Command) {
 		"KEP State",
 	)
 
+	cmd.PersistentFlags().StringVar(
+		&co.SIG,
+		"owning-sig",
+		"",
+		"Owning SIG",
+	)
+
 	cmd.PersistentFlags().StringArrayVar(
-		&co.SIGS,
-		"sigs",
+		&co.ParticipatingSIGs,
+		"participating-sigs",
 		[]string{},
 		"Participating SIGs",
 	)

pkg/kepctl/commands/query.go

@@ -18,10 +18,12 @@ package commands
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
+	"k8s.io/enhancements/pkg/output"
 	"k8s.io/enhancements/pkg/repo"
 )
 
@@ -86,6 +88,13 @@ func addQuery(topLevel *cobra.Command) {
 		"Author",
 	)
 
+	cmd.PersistentFlags().StringSliceVar(
+		&qo.Participant,
+		"participating-sig",
+		nil,
+		"Participating SIG",
+	)
+
 	cmd.PersistentFlags().BoolVar(
 		&qo.IncludePRs,
 		"include-prs",
@@ -96,10 +105,8 @@ func addQuery(topLevel *cobra.Command) {
 	cmd.PersistentFlags().StringVar(
 		&qo.Output,
 		"output",
-		repo.DefaultOutputOpt,
-		fmt.Sprintf(
-			"Output format. Can be %v", repo.SupportedOutputOpts,
-		),
+		output.DefaultFormat,
+		fmt.Sprintf("Output format. Can be %v", output.ValidFormats()),
 	)
 
 	topLevel.AddCommand(cmd)
@@ -112,5 +119,14 @@ func runQuery(opts *repo.QueryOpts) error {
 	}
 	rc.TokenPath = rootOpts.TokenPath
 
-	return rc.Query(opts)
+	results, err := rc.Query(opts)
+	if err != nil {
+		return err
+	}
+	o, err := output.NewOutput(opts.Output, os.Stdout, os.Stderr)
+	if err != nil {
+		return err
+	}
+	o.PrintProposals(results)
+	return nil
 }

pkg/kepctl/kepctl.go

@@ -23,8 +23,9 @@ type Options struct {
 	TokenPath string
 
 	// KEP options
-	KEP    string // KEP name sig-xxx/xxx-name
-	Name   string
-	Number string
-	SIG    string
+	KEP              string // KEP name sig-xxx/xxx-name
+	Name             string
+	Number           string
+	SIG              string
+	ParticipatingSIG string
 }