Merge pull request #156 from arduino/per1234/warning-properties-strict

per1234 · web-flow · commit 5c43b5b882b4 · 2021-01-12T03:42:01.000-08:00
Only require compiler.warning_flags properties in strict mode
diff --git a/etc/schemas/arduino-platform-txt-definitions-schema.json b/etc/schemas/arduino-platform-txt-definitions-schema.json
@@ -1089,10 +1089,6 @@
                 "required": [
                   "name",
                   "version",
-                  "compiler.warning_flags.none",
-                  "compiler.warning_flags.default",
-                  "compiler.warning_flags.more",
-                  "compiler.warning_flags.all",
                   "recipe.c.o.pattern",
                   "recipe.cpp.o.pattern",
                   "recipe.S.o.pattern",
@@ -1131,6 +1127,10 @@
               },
               {
                 "required": [
+                  "compiler.warning_flags.none",
+                  "compiler.warning_flags.default",
+                  "compiler.warning_flags.more",
+                  "compiler.warning_flags.all",
                   "compiler.c.extra_flags",
                   "compiler.cpp.extra_flags",
                   "compiler.S.extra_flags",
diff --git a/internal/project/platform/platformtxt/platformtxtschema_test.go b/internal/project/platform/platformtxt/platformtxtschema_test.go
@@ -159,20 +159,20 @@ func TestRequired(t *testing.T) {
 		{"version", "version", compliancelevel.Specification, assert.True},
 		{"version", "version", compliancelevel.Strict, assert.True},
 
-		{"compiler.warning_flags.none", "compiler\\.warning_flags\\.none", compliancelevel.Permissive, assert.True},
-		{"compiler.warning_flags.none", "compiler\\.warning_flags\\.none", compliancelevel.Specification, assert.True},
+		{"compiler.warning_flags.none", "compiler\\.warning_flags\\.none", compliancelevel.Permissive, assert.False},
+		{"compiler.warning_flags.none", "compiler\\.warning_flags\\.none", compliancelevel.Specification, assert.False},
 		{"compiler.warning_flags.none", "compiler\\.warning_flags\\.none", compliancelevel.Strict, assert.True},
 
-		{"compiler.warning_flags.default", "compiler\\.warning_flags\\.default", compliancelevel.Permissive, assert.True},
-		{"compiler.warning_flags.default", "compiler\\.warning_flags\\.default", compliancelevel.Specification, assert.True},
+		{"compiler.warning_flags.default", "compiler\\.warning_flags\\.default", compliancelevel.Permissive, assert.False},
+		{"compiler.warning_flags.default", "compiler\\.warning_flags\\.default", compliancelevel.Specification, assert.False},
 		{"compiler.warning_flags.default", "compiler\\.warning_flags\\.default", compliancelevel.Strict, assert.True},
 
-		{"compiler.warning_flags.more", "compiler\\.warning_flags\\.more", compliancelevel.Permissive, assert.True},
-		{"compiler.warning_flags.more", "compiler\\.warning_flags\\.more", compliancelevel.Specification, assert.True},
+		{"compiler.warning_flags.more", "compiler\\.warning_flags\\.more", compliancelevel.Permissive, assert.False},
+		{"compiler.warning_flags.more", "compiler\\.warning_flags\\.more", compliancelevel.Specification, assert.False},
 		{"compiler.warning_flags.more", "compiler\\.warning_flags\\.more", compliancelevel.Strict, assert.True},
 
-		{"compiler.warning_flags.all", "compiler\\.warning_flags\\.all", compliancelevel.Permissive, assert.True},
-		{"compiler.warning_flags.all", "compiler\\.warning_flags\\.all", compliancelevel.Specification, assert.True},
+		{"compiler.warning_flags.all", "compiler\\.warning_flags\\.all", compliancelevel.Permissive, assert.False},
+		{"compiler.warning_flags.all", "compiler\\.warning_flags\\.all", compliancelevel.Specification, assert.False},
 		{"compiler.warning_flags.all", "compiler\\.warning_flags\\.all", compliancelevel.Strict, assert.True},
 
 		{"recipe.c.o.pattern", "recipe\\.c\\.o\\.pattern", compliancelevel.Permissive, assert.True},
diff --git a/internal/rule/ruleconfiguration/ruleconfiguration.go b/internal/rule/ruleconfiguration/ruleconfiguration.go
@@ -1989,8 +1989,8 @@ var configurations = []Type{
 		DisableModes:     nil,
 		EnableModes:      []rulemode.Type{rulemode.Default},
 		InfoModes:        nil,
-		WarningModes:     nil,
-		ErrorModes:       []rulemode.Type{rulemode.Default},
+		WarningModes:     []rulemode.Type{rulemode.Default},
+		ErrorModes:       []rulemode.Type{rulemode.Strict},
 		RuleFunction:     rulefunction.PlatformTxtCompilerWarningFlagsNoneMissing,
 	},
 	{
@@ -2005,8 +2005,8 @@ var configurations = []Type{
 		DisableModes:     nil,
 		EnableModes:      []rulemode.Type{rulemode.Default},
 		InfoModes:        nil,
-		WarningModes:     nil,
-		ErrorModes:       []rulemode.Type{rulemode.Default},
+		WarningModes:     []rulemode.Type{rulemode.Default},
+		ErrorModes:       []rulemode.Type{rulemode.Strict},
 		RuleFunction:     rulefunction.PlatformTxtCompilerWarningFlagsDefaultMissing,
 	},
 	{
@@ -2021,8 +2021,8 @@ var configurations = []Type{
 		DisableModes:     nil,
 		EnableModes:      []rulemode.Type{rulemode.Default},
 		InfoModes:        nil,
-		WarningModes:     nil,
-		ErrorModes:       []rulemode.Type{rulemode.Default},
+		WarningModes:     []rulemode.Type{rulemode.Default},
+		ErrorModes:       []rulemode.Type{rulemode.Strict},
 		RuleFunction:     rulefunction.PlatformTxtCompilerWarningFlagsMoreMissing,
 	},
 	{
@@ -2037,8 +2037,8 @@ var configurations = []Type{
 		DisableModes:     nil,
 		EnableModes:      []rulemode.Type{rulemode.Default},
 		InfoModes:        nil,
-		WarningModes:     nil,
-		ErrorModes:       []rulemode.Type{rulemode.Default},
+		WarningModes:     []rulemode.Type{rulemode.Default},
+		ErrorModes:       []rulemode.Type{rulemode.Strict},
 		RuleFunction:     rulefunction.PlatformTxtCompilerWarningFlagsAllMissing,
 	},
 	{
diff --git a/internal/rule/rulefunction/platform.go b/internal/rule/rulefunction/platform.go
@@ -699,7 +699,7 @@ func PlatformTxtCompilerWarningFlagsNoneMissing() (result ruleresult.Type, outpu
 		return ruleresult.Skip, "Core reference used"
 	}
 
-	if schema.RequiredPropertyMissing("compiler\\.warning_flags\\.none", projectdata.PlatformTxtSchemaValidationResult()[compliancelevel.Specification]) {
+	if schema.RequiredPropertyMissing("compiler\\.warning_flags\\.none", projectdata.PlatformTxtSchemaValidationResult()[compliancelevel.Strict]) {
 		return ruleresult.Fail, ""
 	}
 
@@ -724,7 +724,7 @@ func PlatformTxtCompilerWarningFlagsDefaultMissing() (result ruleresult.Type, ou
 		return ruleresult.Skip, "Core reference used"
 	}
 
-	if schema.RequiredPropertyMissing("compiler\\.warning_flags\\.default", projectdata.PlatformTxtSchemaValidationResult()[compliancelevel.Specification]) {
+	if schema.RequiredPropertyMissing("compiler\\.warning_flags\\.default", projectdata.PlatformTxtSchemaValidationResult()[compliancelevel.Strict]) {
 		return ruleresult.Fail, ""
 	}
 
@@ -749,7 +749,7 @@ func PlatformTxtCompilerWarningFlagsMoreMissing() (result ruleresult.Type, outpu
 		return ruleresult.Skip, "Core reference used"
 	}
 
-	if schema.RequiredPropertyMissing("compiler\\.warning_flags\\.more", projectdata.PlatformTxtSchemaValidationResult()[compliancelevel.Specification]) {
+	if schema.RequiredPropertyMissing("compiler\\.warning_flags\\.more", projectdata.PlatformTxtSchemaValidationResult()[compliancelevel.Strict]) {
 		return ruleresult.Fail, ""
 	}
 
@@ -774,7 +774,7 @@ func PlatformTxtCompilerWarningFlagsAllMissing() (result ruleresult.Type, output
 		return ruleresult.Skip, "Core reference used"
 	}
 
-	if schema.RequiredPropertyMissing("compiler\\.warning_flags\\.all", projectdata.PlatformTxtSchemaValidationResult()[compliancelevel.Specification]) {
+	if schema.RequiredPropertyMissing("compiler\\.warning_flags\\.all", projectdata.PlatformTxtSchemaValidationResult()[compliancelevel.Strict]) {
 		return ruleresult.Fail, ""
 	}
 
diff --git a/internal/rule/schema/schemadata/bindata.go b/internal/rule/schema/schemadata/bindata.go
@@ -3630,10 +3630,6 @@ var _arduinoPlatformTxtDefinitionsSchemaJson = []byte(`{
                 "required": [
                   "name",
                   "version",
-                  "compiler.warning_flags.none",
-                  "compiler.warning_flags.default",
-                  "compiler.warning_flags.more",
-                  "compiler.warning_flags.all",
                   "recipe.c.o.pattern",
                   "recipe.cpp.o.pattern",
                   "recipe.S.o.pattern",
@@ -3672,6 +3668,10 @@ var _arduinoPlatformTxtDefinitionsSchemaJson = []byte(`{
               },
               {
                 "required": [
+                  "compiler.warning_flags.none",
+                  "compiler.warning_flags.default",
+                  "compiler.warning_flags.more",
+                  "compiler.warning_flags.all",
                   "compiler.c.extra_flags",
                   "compiler.cpp.extra_flags",
                   "compiler.S.extra_flags",

Original file line number	Diff line number	Diff line change
`@@ -699,7 +699,7 @@ func PlatformTxtCompilerWarningFlagsNoneMissing() (result ruleresult.Type, outpu`
`699`	`699`	`return ruleresult.Skip, "Core reference used"`
`700`	`700`	`}`
`701`	`701`
`702`		`- if schema.RequiredPropertyMissing("compiler\\.warning_flags\\.none", projectdata.PlatformTxtSchemaValidationResult()[compliancelevel.Specification]) {`
	`702`	`+ if schema.RequiredPropertyMissing("compiler\\.warning_flags\\.none", projectdata.PlatformTxtSchemaValidationResult()[compliancelevel.Strict]) {`
`703`	`703`	`return ruleresult.Fail, ""`
`704`	`704`	`}`
`705`	`705`
`@@ -724,7 +724,7 @@ func PlatformTxtCompilerWarningFlagsDefaultMissing() (result ruleresult.Type, ou`
`724`	`724`	`return ruleresult.Skip, "Core reference used"`
`725`	`725`	`}`
`726`	`726`
`727`		`- if schema.RequiredPropertyMissing("compiler\\.warning_flags\\.default", projectdata.PlatformTxtSchemaValidationResult()[compliancelevel.Specification]) {`
	`727`	`+ if schema.RequiredPropertyMissing("compiler\\.warning_flags\\.default", projectdata.PlatformTxtSchemaValidationResult()[compliancelevel.Strict]) {`
`728`	`728`	`return ruleresult.Fail, ""`
`729`	`729`	`}`
`730`	`730`
`@@ -749,7 +749,7 @@ func PlatformTxtCompilerWarningFlagsMoreMissing() (result ruleresult.Type, outpu`
`749`	`749`	`return ruleresult.Skip, "Core reference used"`
`750`	`750`	`}`
`751`	`751`
`752`		`- if schema.RequiredPropertyMissing("compiler\\.warning_flags\\.more", projectdata.PlatformTxtSchemaValidationResult()[compliancelevel.Specification]) {`
	`752`	`+ if schema.RequiredPropertyMissing("compiler\\.warning_flags\\.more", projectdata.PlatformTxtSchemaValidationResult()[compliancelevel.Strict]) {`
`753`	`753`	`return ruleresult.Fail, ""`
`754`	`754`	`}`
`755`	`755`
`@@ -774,7 +774,7 @@ func PlatformTxtCompilerWarningFlagsAllMissing() (result ruleresult.Type, output`
`774`	`774`	`return ruleresult.Skip, "Core reference used"`
`775`	`775`	`}`
`776`	`776`
`777`		`- if schema.RequiredPropertyMissing("compiler\\.warning_flags\\.all", projectdata.PlatformTxtSchemaValidationResult()[compliancelevel.Specification]) {`
	`777`	`+ if schema.RequiredPropertyMissing("compiler\\.warning_flags\\.all", projectdata.PlatformTxtSchemaValidationResult()[compliancelevel.Strict]) {`
`778`	`778`	`return ruleresult.Fail, ""`
`779`	`779`	`}`
`780`	`780`