Merge pull request #1065 from forcedotcom/dev

RELEASE: @W-13114136@: Merging dev to release for 3.12.0

Author: rmohan20

.github/workflows/production-heartbeat.yml

@@ -4,9 +4,10 @@ on:
   schedule:
     # Cron syntax is "minute[0-59] hour[0-23] date[1-31] month[1-12] day[0-6]". '*' is 'any value', and multiple values
     # can be specified with comma-separated lists. All times are UTC.
-    # So this expression means "run at 45 minutes past 1, 5, and 9 AM/PM UTC". The hours were chosen so employees on
-    # US Central Time will start their day with results that are <2 hrs old.
-    - cron: '45 1,5,9,13,17,21 * * *'
+    # So this expression means "run at 45 minutes past 1, 5, and 9 AM/PM UTC". The hours were chosen so that
+    # the jobs run only close to business hours of Central Time.
+    # Days were chosen to run only from Monday through Friday.
+    - cron: '45 13,17,21 * * 1,2,3,4,5'
 jobs:
   production-heartbeat:
     strategy:
@@ -96,11 +97,10 @@ jobs:
 
       # === Report any problems ===
       - name: Report problems
-        # There are problems if any step failed or was skipped, or if any step that can make retry attempts was forced to
-        # do so.
+        # There are problems if any step failed or was skipped.
         # Note that the `join()` call omits null values, so if any steps were skipped, they won't have a corresponding
         # value in the string.
-        if: ${{ failure() || cancelled() || (join(steps.*.outputs.retry_count) != '0,0') }}
+        if: ${{ failure() || cancelled() }}
         shell: bash
         env:
           # If we're here because steps failed or were skipped, then that's a critical problem. Otherwise it's a normal one.

messages/list.js

@@ -18,6 +18,7 @@ module.exports = {
 		"categories": "categories",
 		"rulesets": "rulesets [dep]",
 		"is-dfa": "is dfa",
+		"is-pilot": "is pilot",
 		"engine": "engine"
 	},
 	"yes": "Y",

messages/run-dfa.js

@@ -14,7 +14,9 @@ module.exports = {
 		"sfgejvmargsDescription": "specify Java Virtual Machine (JVM) arguments to optimize Salesforce Graph Engine execution to your system (optional)",
 		"sfgejvmargsDescriptionLong": "Specifies Java Virtual Machine arguments to override system defaults while executing Salesforce Graph Engine. For multiple arguments, add them to the same string separated by space.",
 		"targetDescription": "return location of source code",
-		"targetDescriptionLong": "Returns the source code location. Use glob patterns or specify individual methods with #-syntax. Multiple values are specified as a comma-separated list."
+		"targetDescriptionLong": "Returns the source code location. Use glob patterns or specify individual methods with #-syntax. Multiple values are specified as a comma-separated list.",
+		"withpilotDescription": "allow pilot rules to execute",
+		"withpilotDescriptionLong": "Allows pilot rules to execute."
 	},
 	"validations": {
 		"methodLevelTargetCannotBeGlob": "Method-level targets supplied to --target cannot be globs",
@@ -45,5 +47,8 @@ Use --rule-thread-timeout to increase or decrease the maximum runtime for a sing
 Use --sfgejvmargs to pass Java Virtual Machine args to override system defaults while executing Salesforce Graph Engine's rules.
 The example overrides the system's default heap space allocation to 8 GB and decreases chances of encountering OutOfMemory error.
 	$ sfdx scanner:run:dfa --sfgejvmargs "-Xmx8g" ...
+Use --with-pilot to allow execution of pilot rules:
+This example allows pilot rules in the "Performance" category to execute.
+	$ sfdx scanner:run:dfa --category 'Performance' --with-pilot ...
 `
 };

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@salesforce/sfdx-scanner",
 	"description": "Static code scanner that applies quality and security rules to Apex code, and provides feedback.",
-	"version": "3.11.0",
+	"version": "3.12.0",
 	"author": "ISV SWAT",
 	"bugs": "https://github.com/forcedotcom/sfdx-scanner/issues",
 	"dependencies": {

pmd-cataloger/src/main/java/sfdc/sfdx/scanner/pmd/catalog/PmdCatalogJson.java

@@ -19,6 +19,7 @@ public class PmdCatalogJson {
 	public static final String JSON_SOURCEPACKAGE = "sourcepackage";
 	public static final String JSON_DEFAULTENABLED = "defaultEnabled";
     public static final String JSON_ISDFA = "isDfa";
+    public static final String JSON_ISPILOT = "isPilot";
 
 	private final List<PmdCatalogRule> rules;
 	private final List<PmdCatalogCategory> categories;

pmd-cataloger/src/main/java/sfdc/sfdx/scanner/pmd/catalog/PmdCatalogRule.java

@@ -99,6 +99,7 @@ JSONObject toJson() {
 		m.put(JSON_SOURCEPACKAGE, this.sourceJar);
 		m.put(JSON_DEFAULTENABLED, true);
         m.put(JSON_ISDFA, false);
+        m.put(JSON_ISPILOT, false);
 
 		// We want 'languages' to be represented as an array even though PMD rules only run against one language, because
 		// this way it's easier to integrate with the language-agnostic framework that we ultimately want.