Merge pull request kubernetes#2282 from shekhar-rajak/2279_additional_query

Additional query options to kepctl query - author, approver

Author: k8s-ci-robot

cmd/kepctl/query.go

@@ -44,6 +44,8 @@ func buildQueryCommand(k *kepctl.Client) *cobra.Command {
 	f.StringSliceVar(&opts.Status, "status", nil, "Status")
 	f.StringSliceVar(&opts.Stage, "stage", nil, "Stage")
 	f.StringSliceVar(&opts.PRRApprover, "prr", nil, "Prod Readiness Approver")
+	f.StringSliceVar(&opts.Approver, "approver", nil, "Approver")
+	f.StringSliceVar(&opts.Author, "author", nil, "Author")
 	f.BoolVar(&opts.IncludePRs, "include-prs", false, "Include PRs in the results")
 	f.StringVar(&opts.Output, "output", kepctl.DefaultOutputOpt, fmt.Sprintf("Output format. Can be %v", kepctl.SupportedOutputOpts))
 

pkg/kepctl/query.go

@@ -49,6 +49,8 @@ type QueryOpts struct {
 	Status      []string
 	Stage       []string
 	PRRApprover []string
+	Author      []string
+	Approver    []string
 	IncludePRs  bool
 	Output      string
 }
@@ -121,6 +123,8 @@ func (c *Client) Query(opts QueryOpts) error {
 	allowedStatus := sliceToMap(opts.Status)
 	allowedStage := sliceToMap(opts.Stage)
 	allowedPRR := sliceToMap(opts.PRRApprover)
+	allowedAuthor := sliceToMap(opts.Author)
+	allowedApprover := sliceToMap(opts.Approver)
 
 	var keep []*keps.Proposal
 	for _, k := range allKEPs {
@@ -133,6 +137,12 @@ func (c *Client) Query(opts QueryOpts) error {
 		if len(opts.PRRApprover) > 0 && !atLeastOne(k.PRRApprovers, allowedPRR) {
 			continue
 		}
+		if len(opts.Author) > 0 && !atLeastOne(k.Authors, allowedAuthor) {
+			continue
+		}
+		if len(opts.Approver) > 0 && !atLeastOne(k.Approvers, allowedApprover) {
+			continue
+		}
 		keep = append(keep, k)
 	}