pkg: Replace kepval/** imports with legacy packages

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

Author: justaugustus

api/approval.go

@@ -31,6 +31,19 @@ type PRRApproval struct {
 	Error error `json:"-" yaml:"-"`
 }
 
+func (p *PRRApproval) ApproverForStage(stage string) string {
+	switch stage {
+	case "alpha":
+		return p.Alpha.Approver
+	case "beta":
+		return p.Beta.Approver
+	case "stable":
+		return p.Stable.Approver
+	}
+
+	return ""
+}
+
 // TODO(api): Can we refactor the proposal `Milestone` to retrieve this?
 type PRRMilestone struct {
 	Approver string `json:"approver" yaml:"approver"`

cmd/kepify/main.go

@@ -26,7 +26,7 @@ import (
 	"strings"
 
 	"k8s.io/enhancements/api"
-	"k8s.io/enhancements/pkg/kepval/keps"
+	"k8s.io/enhancements/pkg/legacy/keps"
 )
 
 func Usage() {

pkg/kepctl/kepctl.go

@@ -37,8 +37,8 @@ import (
 	"gopkg.in/yaml.v3"
 
 	"k8s.io/enhancements/api"
-	"k8s.io/enhancements/pkg/kepval/keps"
-	"k8s.io/enhancements/pkg/kepval/prrs"
+	"k8s.io/enhancements/pkg/legacy/keps"
+	"k8s.io/enhancements/pkg/legacy/prrs"
 	"k8s.io/test-infra/prow/git"
 )
 
@@ -182,7 +182,7 @@ func findLocalKEPMeta(repoPath, sig string) ([]string, error) {
 		"keps",
 		sig)
 
-	// TODO(lint): importShadow: shadow of imported from 'k8s.io/enhancements/pkg/kepval/keps' package 'keps' (gocritic)
+	// TODO(lint): importShadow: shadow of imported from 'k8s.io/enhancements/pkg/legacy/keps' package 'keps' (gocritic)
 	//nolint:gocritic
 	keps := []string{}
 

pkg/kepctl/query.go

@@ -23,7 +23,7 @@ import (
 	"github.com/pkg/errors"
 
 	"k8s.io/enhancements/api"
-	"k8s.io/enhancements/pkg/kepval/util"
+	"k8s.io/enhancements/pkg/legacy/util"
 )
 
 var (

pkg/legacy/keps/proposals_test.go

@@ -20,7 +20,7 @@ import (
 	"strings"
 	"testing"
 
-	"k8s.io/enhancements/pkg/kepval/keps"
+	"k8s.io/enhancements/pkg/legacy/keps"
 )
 
 func TestValidParsing(t *testing.T) {

pkg/legacy/keps/validations/yaml.go

@@ -21,7 +21,7 @@ import (
 	"sort"
 	"strings"
 
-	"k8s.io/enhancements/pkg/kepval/util"
+	"k8s.io/enhancements/pkg/legacy/util"
 )
 
 var (

pkg/legacy/prrs/approvals.go

@@ -25,7 +25,7 @@ import (
 	"gopkg.in/yaml.v3"
 
 	"k8s.io/enhancements/api"
-	"k8s.io/enhancements/pkg/kepval/prrs/validations"
+	"k8s.io/enhancements/pkg/legacy/prrs/validations"
 )
 
 type Parser struct{}
@@ -59,15 +59,3 @@ func (p *Parser) Parse(in io.Reader) *api.PRRApproval {
 
 	return approval
 }
-
-func (a *Approval) ApproverForStage(stage string) string {
-	switch stage {
-	case "alpha":
-		return a.Alpha.Approver
-	case "beta":
-		return a.Beta.Approver
-	case "stable":
-		return a.Stable.Approver
-	}
-	return ""
-}

pkg/legacy/prrs/validations/yaml.go

@@ -21,7 +21,7 @@ import (
 	"sort"
 	"strings"
 
-	"k8s.io/enhancements/pkg/kepval/util"
+	"k8s.io/enhancements/pkg/legacy/util"
 )
 
 var mandatoryKeys = []string{"kep-number"}

test/metadata_test.go

@@ -22,8 +22,8 @@ import (
 	"strings"
 	"testing"
 
-	"k8s.io/enhancements/pkg/kepval/keps"
-	"k8s.io/enhancements/pkg/kepval/prrs"
+	"k8s.io/enhancements/pkg/legacy/keps"
+	"k8s.io/enhancements/pkg/legacy/prrs"
 )
 
 const (