Improvements: Fixing typo on the 'enabledByDefault' field. Fixing the…

… reference to the distribution property on the rule allero-io#13.
jmj0502 · Oct 2, 2022 · 1bcd978 · 1bcd978
1 parent 47f7090
commit 1bcd978
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/pkg/rulesConfig/defaultRules/github/12-prevent-action-setup-java-v1.json b/pkg/rulesConfig/defaultRules/github/12-prevent-action-setup-java-v1.json
@@ -2,7 +2,7 @@
 	"description": "Prevent use of action/setup-java@v1.",
 	"failureMessage": "action/setup-java@v1 is used on the workflow. action/setup-java@v1 uses a java distribution that is out of support (AdoptOpenJDK) by default, please use action/setup-java@v2+ and avoid the use of adopt/adopt-host distributions.",
 	"uniqueId": 12,
-	"enableByDefault": true,
+	"enabledByDefault": true,
 	"schema": {
 		"type": "object",
 		"additionalProperties": {

diff --git a/pkg/rulesConfig/defaultRules/github/13-prevent-adopt-distributions-on-setup-java.json b/pkg/rulesConfig/defaultRules/github/13-prevent-adopt-distributions-on-setup-java.json
@@ -2,7 +2,7 @@
 	"description": "Prevent use of adopt/adopt-hotspot distributions for actions/setup-java version 2+.",
 	"failureMessage": "adopt/adopt-hotspot distribution is used on the workflow. Please, avoid the use of adopt/adopt-hotspot distributions since they are out of support. Use temurin based distributions instead (such distributions are currently maintained by the core adopt/adopt-hotspot team).",
 	"uniqueId": 13,
-	"enableByDefault": true,
+	"enabledByDefault": true,
 	"schema": {
 		"type": "object",
 		"additionalProperties": {
@@ -40,10 +40,15 @@
 																	},
 																	"then": {
 																		"properties": {
-																			"uses": {
-																				"not": {
-																					"type": "string",
-																					"pattern": ".*adopt(-hotspot)?"
+																			"with": {
+																				"type": "object",
+																				"properties": {
+																					"distribution": {
+																						"not": {
+																							"type": "string",
+																							"pattern": ".*adopt(-hotspot)?"
+																						}
+																					}
 																				}
 																			}
 																		}

diff --git a/pkg/rulesConfig/defaultRules/gitlab/12-prevent-action-setup-java-v1.json b/pkg/rulesConfig/defaultRules/gitlab/12-prevent-action-setup-java-v1.json
@@ -2,6 +2,6 @@
 	"description": "Prevent use of action/setup-java@v1.",
 	"failureMessage": "action/setup-java@v1 is used on the workflow. action/setup-java@v1 uses a java distribution that is out of support (AdoptOpenJDK) by default, please use action/setup-java@v2+ and avoid the use of adopt/adopt-host distributions.",
 	"uniqueId": 12,
-	"enableByDefault": true,
+	"enabledByDefault": true,
 	"schema": {} 
 }
diff --git a/pkg/rulesConfig/defaultRules/gitlab/13-prevent-adopt-distributions-on-setup-java.json b/pkg/rulesConfig/defaultRules/gitlab/13-prevent-adopt-distributions-on-setup-java.json
@@ -2,6 +2,6 @@
 	"description": "Prevent use of adopt/adopt-hotspot distributions for actions/setup-java version 2+.",
 	"failureMessage": "adopt/adopt-hotspot distribution is used on the workflow. Please, avoid the use of adopt/adopt-hotspot distributions since they are out of support. Use temurin based distributions instead (such distributions are currently maintained by the core adopt/adopt-hotspot team).",
 	"uniqueId": 13,
-	"enableByDefault": true,
+	"enabledByDefault": true,
 	"schema": {}
 }