pkg/repo: improve proposal validation test coverage

Author: spiffxp

pkg/repo/repo_test.go

@@ -66,24 +66,34 @@ func TestMain(m *testing.M) {
 
 func TestProposalValidate(t *testing.T) {
 	testcases := []struct {
-		name         string
-		file         string
-		expectErrors bool
+		name string
+		file string
+		errs []error
 	}{
 		{
-			name:         "valid KEP passes validate",
-			file:         "testdata/valid-kep.yaml",
-			expectErrors: false,
+			name: "valid KEP: all fields",
+			file: "testdata/valid-kep-full.yaml",
+			errs: nil,
 		},
 		{
-			name:         "invalid KEP fails validate for owning-sig",
-			file:         "testdata/invalid-kep.yaml",
-			expectErrors: true,
+			name: "invalid KEP: owning-sig does not exist",
+			file: "testdata/invalid-owning-sig.yaml",
+			errs: []error{
+				fmt.Errorf("invalid owning-sig: not-a-sig"),
+			},
+		},
+		{
+			name: "invalid KEP: prr-approver does not exist",
+			file: "testdata/invalid-prr-approver.yaml",
+			errs: []error{
+				fmt.Errorf("invalid prr-approver: not-a-prr-approver"),
+			},
 		},
 	}
 
 	parser := api.KEPHandler{}
-	parser.Groups = []string{"sig-api-machinery"}
+	parser.Groups = []string{"sig-api-machinery", "sig-architecture", "sig-auth"}
+	parser.PRRApprovers = []string{"@wojtek-t"}
 
 	for _, tc := range testcases {
 		t.Run(tc.name, func(t *testing.T) {
@@ -95,11 +105,7 @@ func TestProposalValidate(t *testing.T) {
 			require.NoError(t, err)
 
 			errs := parser.Validate(&p)
-			if tc.expectErrors {
-				require.NotEmpty(t, errs)
-			}
-
-			require.NoError(t, err)
+			require.ElementsMatch(t, tc.errs, errs)
 		})
 	}
 }

pkg/repo/testdata/invalid-kep.yaml renamed to pkg/repo/testdata/invalid-owning-sig.yaml

@@ -3,7 +3,7 @@ kep-number: 1687
 authors:
   - "@rjbez17"
   - "@adrianludwin"
-owning-sig: sig-awesome
+owning-sig: not-a-sig
 participating-sigs:
   - sig-auth
 reviewers:

pkg/repo/testdata/invalid-prr-approver.yaml

@@ -0,0 +1,20 @@
+title: Hierarchical Namespace Controller As A Subproject
+kep-number: 1687
+authors:
+  - "@rjbez17"
+  - "@adrianludwin"
+owning-sig: sig-architecture
+participating-sigs:
+  - sig-auth
+reviewers:
+  - "TBD"
+approvers:
+  - "@mikedanese"
+  - "@deads2k"
+  - "@liggitt"
+prr-approvers:
+  - not-a-prr-approver
+creation-date: 2020-04-14
+last-updated: 2020-04-15
+stage: "alpha"
+status: provisional

pkg/repo/testdata/valid-kep.yaml renamed to pkg/repo/testdata/valid-kep-full.yaml

@@ -44,7 +44,7 @@ func TestWriteKep(t *testing.T) {
 	}{
 		{
 			name:         "simple KEP",
-			kepFile:      "testdata/valid-kep.yaml",
+			kepFile:      "testdata/valid-kep-full.yaml",
 			repoPath:     "enhancements",
 			kepName:      "1010-test",
 			sig:          "sig-auth",
@@ -53,15 +53,15 @@ func TestWriteKep(t *testing.T) {
 		},
 		{
 			name:         "missing KEP name",
-			kepFile:      "testdata/valid-kep.yaml",
+			kepFile:      "testdata/valid-kep-full.yaml",
 			repoPath:     "enhancements",
 			sig:          "sig-auth",
 			expectedPath: filepath.Join("enhancements", "keps", "sig-auth", "1010-test"),
 			expectError:  true,
 		},
 		{
 			name:         "missing owning SIG",
-			kepFile:      "testdata/valid-kep.yaml",
+			kepFile:      "testdata/valid-kep-full.yaml",
 			repoPath:     "enhancements",
 			kepName:      "1010-test",
 			expectedPath: filepath.Join("enhancements", "keps", "sig-auth", "1010-test"),