Merge pull request #515 from dhiller/handle-invalid-owners-aliases-on-verify-owners

fix(verify-owners): handle invalid OWNERS_ALIASES file case

Author: k8s-ci-robot

pkg/plugins/verify-owners/verify-owners.go

@@ -273,7 +273,17 @@ func handle(ghc githubClient, gc git.ClientFactory, roc repoownersClient, log *l
 	// If the file was modified, check for non trusted users in the newly added owners.
 	nonTrustedUsers, trustedUsers, repoAliases, err := nonTrustedUsersInOwnersAliases(ghc, log, triggerConfig, org, repo, r.Directory(), modifiedOwnerAliasesFile.Patch, ownerAliasesModified, skipTrustedUserCheck, filenames)
 	if err != nil {
-		return err
+		// if OWNERS_ALIASES file exists and is not parseable
+		// attach invalid owners label and add message to PR
+		if !hasInvalidOwnersLabel {
+			if err := ghc.AddLabel(org, repo, number, labels.InvalidOwners); err != nil {
+				return err
+			}
+		}
+		if err := ghc.CreateComment(org, repo, number, "The content of OWNERS_ALIASES is invalid."); err != nil {
+			return err
+		}
+		return nil
 	}
 
 	// Check if OWNERS_ALIASES has empty aliases, then add a warning comment

pkg/plugins/verify-owners/verify-owners_test.go

@@ -145,6 +145,12 @@ var ownerAliasesFiles = map[string][]byte{
 	"toBeAddedAlias": []byte(`aliases:
   not-yet-existing-alias:
   - bob
+`),
+	"invalidOwnersAliases": []byte(`aliases:
+  approvers:
+  - alice
+  - bob
+  -
 `),
 }
 
@@ -451,6 +457,12 @@ func testHandle(clients localgit.Clients, t *testing.T) {
 			addedContent:        "toBeAddedAlias",
 			shouldLabel:         false,
 		},
+		{
+			name:         "invalid OWNERS_ALIASES",
+			filesChanged: []string{"OWNERS_ALIASES"},
+			ownersFile:   "invalidOwnersAliases",
+			shouldLabel:  true,
+		},
 	}
 	lg, c, err := clients()
 	if err != nil {