cr comments

Signed-off-by: Raghav Kaul <raghavkaul@google.com>

checks/evaluation/branch_protection.go

@@ -449,7 +449,7 @@ func codeownerBranchProtection(
 		case true:
 			info(dl, log, "codeowner review is required on branch '%s'", *branch.Name)
 			if len(codeownersFiles) == 0 {
-				warn(dl, log, "no codeowners files found")
+				warn(dl, log, "codeowners branch protection is being ignored - but no codeowners file found in repo")
 			} else {
 				score++
 			}

checks/raw/branch_protection.go

@@ -111,7 +111,6 @@ func BranchProtection(c clients.RepoClient) (checker.BranchProtectionsData, erro
 	if err := collectCodeownersFiles(c, &codeownersFiles); err != nil {
 		return checker.BranchProtectionsData{}, err
 	}
-	fmt.Printf("codeownersFiles: %v\n", codeownersFiles)
 
 	// No error, return the data.
 	return checker.BranchProtectionsData{

pkg/json_raw_results.go

@@ -73,6 +73,11 @@ type jsonBranchProtection struct {
 	Name       string                        `json:"name"`
 }
 
+type jsonBranchProtectionMetadata struct {
+	Branches        []jsonBranchProtection `json:"branches"`
+	CodeownersFiles []string               `json:"codeownersFiles"`
+}
+
 type jsonReview struct {
 	State    string   `json:"state"`
 	Reviewer jsonUser `json:"reviewer"`
@@ -265,7 +270,7 @@ type jsonRawResults struct {
 	// Note: we return one at most.
 	DependencyUpdateTools []jsonTool `json:"dependencyUpdateTools"`
 	// Branch protection settings for development and release branches.
-	BranchProtections []jsonBranchProtection `json:"branchProtections"`
+	BranchProtections jsonBranchProtectionMetadata `json:"branchProtections"`
 	// Contributors. Note: we could use the list of commits instead to store this data.
 	// However, it's harder to get statistics using commit list, so we have a dedicated
 	// structure for it.
@@ -711,7 +716,7 @@ func (r *jsonScorecardRawResult) addDependencyUpdateToolRawResults(dut *checker.
 
 //nolint:unparam
 func (r *jsonScorecardRawResult) addBranchProtectionRawResults(bp *checker.BranchProtectionsData) error {
-	r.Results.BranchProtections = []jsonBranchProtection{}
+	branches := []jsonBranchProtection{}
 	for _, v := range bp.Branches {
 		var bp *jsonBranchProtectionSettings
 		if v.Protected != nil && *v.Protected {
@@ -728,11 +733,15 @@ func (r *jsonScorecardRawResult) addBranchProtectionRawResults(bp *checker.Branc
 				StatusCheckContexts:                 v.BranchProtectionRule.CheckRules.Contexts,
 			}
 		}
-		r.Results.BranchProtections = append(r.Results.BranchProtections, jsonBranchProtection{
+		branches = append(branches, jsonBranchProtection{
 			Name:       *v.Name,
 			Protection: bp,
 		})
 	}
+	r.Results.BranchProtections.Branches = branches
+
+	r.Results.BranchProtections.CodeownersFiles = bp.CodeownersFiles
+
 	return nil
 }