pkg/repo: Make PRR validation errors non-blocking when querying

Signed-off-by: Stephen Augustus <[email protected]>

Author: justaugustus

pkg/proposal/create.go

@@ -54,6 +54,7 @@ type CreateOpts struct {
 // kep # and name to populate the create opts
 func (c *CreateOpts) Validate(args []string) error {
 	// TODO: Populate logic
+	// nolint:gocritic
 	/*
 		err := repoOpts.ValidateAndPopulateKEP(args)
 		if err != nil {

pkg/proposal/promote.go

@@ -39,7 +39,8 @@ type PromoteOpts struct {
 // Validate checks the args provided to the promote command populates the promote opts
 func (o *PromoteOpts) Validate(args []string) error {
 	// TODO: Populate logic
-	return nil //o.Repo.ValidateAndPopulateKEP(args)
+	// nolint:gocritic
+	return nil // o.Repo.ValidateAndPopulateKEP(args)
 }
 
 // Promote changes the stage and target release for a specified KEP based on the

pkg/repo/repo.go

@@ -35,6 +35,7 @@ import (
 	"gopkg.in/yaml.v3"
 
 	"k8s.io/enhancements/api"
+	"k8s.io/enhancements/pkg/kepval"
 	krgh "k8s.io/release/pkg/github"
 	"k8s.io/test-infra/prow/git"
 )
@@ -264,9 +265,9 @@ func (r *Repo) LoadLocalKEPs(sig string) ([]*api.Proposal, error) {
 					"reading KEP %s from yaml",
 					k,
 				)
-			} else {
-				allKEPs = append(allKEPs, kep)
 			}
+
+			allKEPs = append(allKEPs, kep)
 		} else {
 			kep, err := r.loadKEPFromOldStyle(k)
 			if err != nil {
@@ -275,9 +276,9 @@ func (r *Repo) LoadLocalKEPs(sig string) ([]*api.Proposal, error) {
 					"reading KEP %s from markdown",
 					k,
 				)
-			} else {
-				allKEPs = append(allKEPs, kep)
 			}
+
+			allKEPs = append(allKEPs, kep)
 		}
 	}
 
@@ -458,54 +459,55 @@ func (r *Repo) loadKEPFromYaml(kepPath string) (*api.Proposal, error) {
 	// Read the PRR approval file and add any listed PRR approvers in there
 	// to the PRR approvers list in the KEP. this is a hack while we transition
 	// away from PRR approvers listed in kep.yaml
-	prrPath := filepath.Dir(kepPath)
-	prrPath = filepath.Dir(prrPath)
-	sig := filepath.Base(prrPath)
-	prrPath = filepath.Join(
-		filepath.Dir(prrPath),
-		PRRApprovalPathStub,
-		sig,
-		p.Number+".yaml",
-	)
-
-	prrFile, err := os.Open(prrPath)
-	if os.IsNotExist(err) {
-		return &p, nil
-	}
-
+	handler := r.PRRHandler
+	err = kepval.ValidatePRR(&p, handler, r.PRRApprovalPath)
 	if err != nil {
-		return nil, errors.Wrapf(err, "opening PRR approval %s", prrPath)
-	}
+		logrus.Errorf(
+			"%v",
+			errors.Wrapf(err, "validating PRR for %s", p.Name),
+		)
+	} else {
+		prrPath := filepath.Dir(kepPath)
+		prrPath = filepath.Dir(prrPath)
+		sig := filepath.Base(prrPath)
+		prrPath = filepath.Join(
+			filepath.Dir(prrPath),
+			PRRApprovalPathStub,
+			sig,
+			p.Number+".yaml",
+		)
 
-	handler := r.PRRHandler
+		prrFile, err := os.Open(prrPath)
+		if os.IsNotExist(err) {
+			return &p, nil
+		}
 
-	approval, err := handler.Parse(prrFile)
-	if err != nil {
-		return nil, errors.Wrapf(err, "parsing PRR")
-	}
+		if err != nil {
+			return nil, errors.Wrapf(err, "opening PRR approval %s", prrPath)
+		}
 
-	if approval.Error != nil {
-		fmt.Fprintf(
-			r.Err,
-			"WARNING: could not parse prod readiness request for KEP %s: %s\n",
-			p.Number,
-			approval.Error,
-		)
-	}
+		approval, err := handler.Parse(prrFile)
+		if err != nil {
+			return nil, errors.Wrapf(err, "parsing PRR")
+		}
 
-	approver, err := approval.ApproverForStage(p.Stage)
-	if err != nil {
-		return nil, errors.Wrapf(err, "getting PRR approver for %s stage", p.Stage)
-	}
+		approver, err := approval.ApproverForStage(p.Stage)
+		if err != nil {
+			logrus.Errorf(
+				"%v",
+				errors.Wrapf(err, "getting PRR approver for %s stage", p.Stage),
+			)
+		}
 
-	for _, a := range p.PRRApprovers {
-		if a == approver {
-			approver = ""
+		for _, a := range p.PRRApprovers {
+			if a == approver {
+				approver = ""
+			}
 		}
-	}
 
-	if approver != "" {
-		p.PRRApprovers = append(p.PRRApprovers, approver)
+		if approver != "" {
+			p.PRRApprovers = append(p.PRRApprovers, approver)
+		}
 	}
 
 	return &p, nil

pkg/repo/validate.go

@@ -38,7 +38,7 @@ func (r *Repo) Validate() (
 	err error,
 ) {
 	kepDir := r.ProposalPath
-	var files = []string{}
+	files := []string{}
 
 	// Find all the KEPs
 	err = filepath.Walk(