Show new compliance level settings in report

Previously, the report was only displaying the permissive check mode setting.

Author: per1234

configuration/checkmode/checkmode.go

@@ -86,3 +86,13 @@ func Modes(defaultCheckModes map[projecttype.Type]map[Type]bool, customCheckMode
 
 	return checkModes
 }
+
+func Compliance(checkModes map[Type]bool) string {
+	for key, value := range checkModes {
+		if value && (key == Strict || key == Specification || key == Permissive) {
+			return key.String()
+		}
+	}
+
+	panic(fmt.Errorf("Unrecognized compliance configuration"))
+}

configuration/checkmode/checkmode_test.go

@@ -52,3 +52,21 @@ func TestMode(t *testing.T) {
 	mergedCheckModes = Modes(defaultCheckModes, customCheckModes, testProjectType)
 	assert.Equal(t, customCheckModes[testCheckMode], mergedCheckModes[testCheckMode], "Should be set to custom value")
 }
+
+func TestCompliance(t *testing.T) {
+	checkModes := map[Type]bool{
+		Strict:        false,
+		Specification: false,
+		Permissive:    false,
+	}
+
+	assert.Panics(t, func() { Compliance(checkModes) })
+	checkModes[Strict] = true
+	assert.Equal(t, Strict.String(), Compliance(checkModes))
+	checkModes[Strict] = false
+	checkModes[Specification] = true
+	assert.Equal(t, Specification.String(), Compliance(checkModes))
+	checkModes[Specification] = false
+	checkModes[Permissive] = true
+	assert.Equal(t, Permissive.String(), Compliance(checkModes))
+}

configuration/configuration.go

@@ -113,9 +113,7 @@ func Initialize(flags *pflag.FlagSet, projectPaths []string) error {
 	}
 
 	logrus.WithFields(logrus.Fields{
-		"compliance strict mode":          customCheckModes[checkmode.Strict],
-		"compliance specification mode":   customCheckModes[checkmode.Specification],
-		"compliance permissive mode":      customCheckModes[checkmode.Permissive],
+		"compliance":                      checkmode.Compliance(customCheckModes),
 		"output format":                   OutputFormat(),
 		"Library Manager submission mode": customCheckModes[checkmode.LibraryManagerSubmission],
 		"Library Manager update mode":     customCheckModes[checkmode.LibraryManagerIndexed],

result/result.go

@@ -58,10 +58,10 @@ type projectReportType struct {
 }
 
 type projectConfigurationReportType struct {
-	Permissive           bool `json:"permissive"`
-	LibraryManagerSubmit bool `json:"libraryManagerSubmit"`
-	LibraryManagerUpdate bool `json:"libraryManagerUpdate"`
-	Official             bool `json:"official"`
+	Compliance           string `json:"compliance"`
+	LibraryManagerSubmit bool   `json:"libraryManagerSubmit"`
+	LibraryManagerUpdate bool   `json:"libraryManagerUpdate"`
+	Official             bool   `json:"official"`
 }
 
 type checkReportType struct {
@@ -129,8 +129,8 @@ func (results *Type) Record(checkedProject project.Type, checkConfiguration chec
 				Path:        checkedProject.Path,
 				ProjectType: checkedProject.ProjectType.String(),
 				Configuration: projectConfigurationReportType{
-					Permissive:           configuration.CheckModes(checkedProject.ProjectType)[checkmode.Permissive],
-					LibraryManagerSubmit: configuration.CheckModes(checkedProject.ProjectType)[checkmode.Permissive],
+					Compliance:           checkmode.Compliance(configuration.CheckModes(checkedProject.ProjectType)),
+					LibraryManagerSubmit: configuration.CheckModes(checkedProject.ProjectType)[checkmode.LibraryManagerSubmission],
 					LibraryManagerUpdate: configuration.CheckModes(checkedProject.ProjectType)[checkmode.LibraryManagerIndexed],
 					Official:             configuration.CheckModes(checkedProject.ProjectType)[checkmode.Official],
 				},