Merge pull request #6680 from psiinon/auto/enable

automation: Do not warn if "enabled" or "alwaysRun" properties specified

Author: kingthorin

addOns/automation/CHANGELOG.md

@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - Bug in handling headers with colons in the values.
 - Use default authentication poll frequency when none specified, if the value is less than one a progress warning occurs.
+- Do not warn if "enabled" or "alwaysRun" properties specified.
 
 ## [0.51.0] - 2025-07-17
 ### Added

addOns/automation/src/main/java/org/zaproxy/addon/automation/AutomationPlan.java

@@ -103,7 +103,7 @@ public AutomationPlan(ExtensionAutomation ext, File file) throws IOException {
                 }
                 LinkedHashMap<?, ?> jobData = (LinkedHashMap<?, ?>) jobObj;
 
-                Object jobType = jobData.get("type");
+                Object jobType = jobData.remove("type");
                 if (jobType == null) {
                     progress.error(
                             Constant.messages.getString("automation.error.job.notype", jobType));
@@ -113,7 +113,7 @@ public AutomationPlan(ExtensionAutomation ext, File file) throws IOException {
                 if (job != null) {
                     try {
                         job = job.newJob();
-                        Object jobName = jobData.get("name");
+                        Object jobName = jobData.remove("name");
                         if (jobName != null) {
                             if (jobName instanceof String) {
                                 job.setName((String) jobName);
@@ -132,7 +132,7 @@ public AutomationPlan(ExtensionAutomation ext, File file) throws IOException {
                             continue;
                         }
 
-                        Object jobEnabled = jobData.get("enabled");
+                        Object jobEnabled = jobData.remove("enabled");
                         if (jobEnabled != null) {
                             if (jobEnabled instanceof Boolean enableBool) {
                                 job.setEnabled(enableBool);
@@ -143,7 +143,7 @@ public AutomationPlan(ExtensionAutomation ext, File file) throws IOException {
                             }
                         }
 
-                        Object alwaysRun = jobData.get("alwaysRun");
+                        Object alwaysRun = jobData.remove("alwaysRun");
                         if (alwaysRun != null) {
                             if (alwaysRun instanceof Boolean jobBool) {
                                 job.setAlwaysRun(jobBool);

addOns/automation/src/main/java/org/zaproxy/addon/automation/jobs/ActiveScanConfigJob.java

@@ -95,10 +95,6 @@ public void verifyParameters(AutomationProgress progress) {
                             JobUtils.verifyRegexes(jobData.get(key), key.toString(), progress));
                     break;
 
-                case "name":
-                case "type":
-                    break;
-
                 default:
                     progress.warn(
                             Constant.messages.getString(

addOns/automation/src/main/java/org/zaproxy/addon/automation/jobs/ActiveScanJob.java

@@ -103,9 +103,7 @@ public void verifyParameters(AutomationProgress progress) {
                             params, this.parameters, this.getName(), null, progress);
                     break;
                 case "policyDefinition":
-                case "name":
                 case "tests":
-                case "type":
                     // Handled before we get here
                     break;
                 default:

addOns/automation/src/main/java/org/zaproxy/addon/automation/jobs/ActiveScanPolicyJob.java

@@ -89,9 +89,7 @@ public void verifyParameters(AutomationProgress progress) {
                     policyDefinition.parsePolicyDefinition(
                             jobData.get(key), this.getName(), progress);
                     break;
-                case "name":
                 case "tests":
-                case "type":
                     // Handled before we get here
                     break;
                 default:

addOns/automation/src/test/java/org/zaproxy/addon/automation/jobs/ActiveScanJobUnitTest.java

@@ -419,7 +419,6 @@ void shouldReturnWarningOnUnexpectedElement() throws MalformedURLException {
         ActiveScanJob job = new ActiveScanJob();
         AutomationProgress progress = new AutomationProgress();
         LinkedHashMap<String, String> data = new LinkedHashMap<>();
-        data.put("name", "blah");
         data.put("tests", "");
         // The only invalid one
         data.put("unexpected", "data");

addOns/automation/src/test/java/org/zaproxy/addon/automation/jobs/ActiveScanPolicyJobUnitTest.java

@@ -163,7 +163,6 @@ void shouldReturnWarningOnUnexpectedElement() throws MalformedURLException {
         ActiveScanPolicyJob job = new ActiveScanPolicyJob();
         AutomationProgress progress = new AutomationProgress();
         LinkedHashMap<String, String> data = new LinkedHashMap<>();
-        data.put("name", "blah");
         data.put("tests", "");
         // The only invalid one
         data.put("unexpected", "data");

addOns/sequence/CHANGELOG.md

@@ -4,7 +4,8 @@ All notable changes to this add-on will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
-
+### Changed
+- Maintenance changes.
 
 ## [8] - 2025-01-10
 ### Added

addOns/sequence/src/main/java/org/zaproxy/zap/extension/sequence/automation/SequenceActiveScanJob.java

@@ -116,9 +116,7 @@ public void verifyParameters(AutomationProgress progress) {
                             params, this.parameters, this.getName(), null, progress);
                     break;
                 case "policyDefinition":
-                case "name":
                 case "tests":
-                case "type":
                     // Handled before we get here
                     break;
                 default: