make test: fix pkg/legacy

These are on their way out, so tempted to outright delete the tests. But
for now, do just enough to keep them passing

- dates get parsed as time.Time by go-yaml v3
- fix milestone parsing regex, and assume string keys

Author: spiffxp

pkg/legacy/keps/validations/yaml.go

@@ -17,9 +17,11 @@ limitations under the License.
 package validations
 
 import (
+	"fmt"
 	"regexp"
 	"sort"
 	"strings"
+	"time"
 
 	"k8s.io/enhancements/pkg/legacy/util"
 )
@@ -30,7 +32,7 @@ var (
 	reStatus      = regexp.MustCompile(strings.Join(statuses, "|"))
 	stages        = []string{"alpha", "beta", "stable"}
 	reStages      = regexp.MustCompile(strings.Join(stages, "|"))
-	reMilestone   = regexp.MustCompile(`v1\\.[1-9][0-9]*`)
+	reMilestone   = regexp.MustCompile(`v1\.[1-9][0-9]*`)
 )
 
 // TODO(lint): cyclomatic complexity 50 of func `ValidateStructure` is high (> 30) (gocyclo)
@@ -107,9 +109,14 @@ func ValidateStructure(parsed map[interface{}]interface{}) error {
 				continue
 			}
 
-			fallthrough
-
-		case "title", "creation-date", "last-updated":
+		case "creation-date", "last-updated":
+			switch v := value.(type) {
+			case time.Time:
+				continue
+			default:
+				return fmt.Errorf("%s's value (%v) must parse to time.Time, got: %v", k, value, v)
+			}
+		case "title":
 			// TODO(lint): singleCaseSwitch: should rewrite switch statement to if statement (gocritic)
 			//nolint:gocritic
 			switch v := value.(type) {
@@ -201,13 +208,13 @@ func ValidateStructure(parsed map[interface{}]interface{}) error {
 			// TODO(lint): Error return value is not checked (errcheck)
 			//nolint:errcheck
 			v, _ := value.(string)
-			if !reMilestone.Match([]byte(v)) {
+			if !reMilestone.MatchString(v) {
 				return util.NewValueMustBeMilestone(k, v)
 			}
 
 		case "milestone":
 			switch v := value.(type) {
-			case map[interface{}]interface{}:
+			case map[string]interface{}:
 				if err := validateMilestone(v); err != nil {
 					return err
 				}
@@ -221,14 +228,8 @@ func ValidateStructure(parsed map[interface{}]interface{}) error {
 	return nil
 }
 
-func validateMilestone(parsed map[interface{}]interface{}) error {
-	for key, value := range parsed {
-		// First off the key has to be a string. fact.
-		k, ok := key.(string)
-		if !ok {
-			return util.NewKeyMustBeString(k)
-		}
-
+func validateMilestone(parsed map[string]interface{}) error {
+	for k, value := range parsed {
 		// TODO(lint): singleCaseSwitch: should rewrite switch statement to if statement (gocritic)
 		//nolint:gocritic
 		switch strings.ToLower(k) {

pkg/legacy/keps/validations/yaml_test.go

@@ -107,8 +107,8 @@ func TestUnmarshalSuccess(t *testing.T) {
 		OwningSIG:    "sig-architecture",
 		Status:       "provisional",
 		Approvers:    []string{"my approvers"},
-		LastUpdated:  "at some point",
-		CreationDate: "a while ago",
+		LastUpdated:  "2020-03-04",
+		CreationDate: "2020-01-02",
 	}
 	p := map[interface{}]interface{}{}
 

pkg/legacy/prrs/validations/yaml.go

@@ -44,29 +44,24 @@ func ValidateStructure(parsed map[interface{}]interface{}) error {
 		switch strings.ToLower(k) {
 		case "alpha", "beta", "stable":
 			switch v := value.(type) {
-			case map[interface{}]interface{}:
+			case map[string]interface{}:
 				if err := validateMilestone(v); err != nil {
 					return fmt.Errorf("invalid %s field: %v", k, err)
 				}
-			case interface{}:
-				return util.NewValueMustBeStruct(k, v)
+			default:
+				return fmt.Errorf("field %s value '%v' is of invalid type %v", key, value, v)
 			}
 		}
 	}
 	return nil
 }
 
-func validateMilestone(parsed map[interface{}]interface{}) error {
+func validateMilestone(parsed map[string]interface{}) error {
 	// prrApprovers must be sorted to use SearchStrings down below...
 	prrApprovers := util.PRRApprovers()
 	sort.Strings(prrApprovers)
 
-	for key, value := range parsed {
-		// First off the key has to be a string. fact.
-		k, ok := key.(string)
-		if !ok {
-			return util.NewKeyMustBeString(k)
-		}
+	for k, value := range parsed {
 
 		// figure out the types
 		// TODO(lint): singleCaseSwitch: should rewrite switch statement to if statement (gocritic)

pkg/legacy/prrs/validations/yaml_test.go

@@ -32,29 +32,29 @@ func TestValidateStructureSuccess(t *testing.T) {
 		{
 			name: "just alpha",
 			input: map[interface{}]interface{}{
-				"alpha": map[interface{}]interface{}{
+				"alpha": map[string]interface{}{
 					"approver": "@wojtek-t",
 				},
 			},
 		},
 		{
 			name: "all milestones",
 			input: map[interface{}]interface{}{
-				"alpha": map[interface{}]interface{}{
+				"alpha": map[string]interface{}{
 					"approver": "@wojtek-t",
 				},
-				"beta": map[interface{}]interface{}{
+				"beta": map[string]interface{}{
 					"approver": "@wojtek-t",
 				},
-				"stable": map[interface{}]interface{}{
+				"stable": map[string]interface{}{
 					"approver": "@wojtek-t",
 				},
 			},
 		},
 		{
 			name: "just stable",
 			input: map[interface{}]interface{}{
-				"stable": map[interface{}]interface{}{
+				"stable": map[string]interface{}{
 					"approver": "@wojtek-t",
 				},
 			},