Merge pull request #804 from Tobisaninfo/bugfix/JENKINS-68740

JENKINS-68740: Support ansible-lint >=6.1.0 warning format
jenkinsci · Jun 12, 2022 · c47ee7b · c47ee7b
2 parents cef1242 + babb012
commit c47ee7b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/src/main/java/edu/hm/hafner/analysis/parser/AnsibleLintParser.java b/src/main/java/edu/hm/hafner/analysis/parser/AnsibleLintParser.java
@@ -21,7 +21,7 @@
 public class AnsibleLintParser extends LookaheadParser {
     private static final long serialVersionUID = 8481090596321427484L;
 
-    private static final String ANSIBLE_LINT_WARNING_PATTERN = "(.*)\\:([0-9]*)\\:\\s*\\[?([a-zA-Z0-9\\-]+)\\]?\\s(.*)";
+    private static final String ANSIBLE_LINT_WARNING_PATTERN = "(.*)\\:([0-9]*)\\:\\s*\\[?([a-zA-Z0-9\\-]+)\\]?:?\\s(.*)";
 
     /**
      * Creates a new instance of {@link AnsibleLintParser}.

diff --git a/src/test/java/edu/hm/hafner/analysis/parser/AnsibleLintParserTest.java b/src/test/java/edu/hm/hafner/analysis/parser/AnsibleLintParserTest.java
@@ -20,7 +20,7 @@ class AnsibleLintParserTest extends AbstractParserTest {
 
     @Override
     protected void assertThatIssuesArePresent(final Report report, final SoftAssertions softly) {
-        assertThat(report).hasSize(9);
+        assertThat(report).hasSize(10);
 
         Iterator<Issue> iterator = report.iterator();
         softly.assertThat(iterator.next())
@@ -86,6 +86,14 @@ protected void assertThatIssuesArePresent(final Report report, final SoftAsserti
                 .hasLineEnd(11)
                 .hasMessage("File permissions unset or incorrect")
                 .hasFileName("/workspace/templates.yml");
+
+        softly.assertThat(iterator.next())
+                .hasSeverity(Severity.WARNING_NORMAL)
+                .hasCategory("no-changed-when")
+                .hasLineStart(41)
+                .hasLineEnd(41)
+                .hasMessage("Commands should not change things if nothing needs doing.")
+                .hasFileName("/workspace/roles/create_service/tasks/main.yml");
     }
 
     @Override

diff --git a/src/test/java/edu/hm/hafner/analysis/registry/ParsersTest.java b/src/test/java/edu/hm/hafner/analysis/registry/ParsersTest.java
@@ -624,7 +624,7 @@ void shouldFindAllAjcIssues() {
     /** Runs the AnsibleLint parser on an output file that contains 9 issues. */
     @Test
     void shouldFindAllAnsibleLintIssues() {
-        findIssuesOfTool(9, "ansiblelint", "ansibleLint.txt");
+        findIssuesOfTool(10, "ansiblelint", "ansibleLint.txt");
     }
 
     /**

diff --git a/src/test/resources/edu/hm/hafner/analysis/parser/ansibleLint.txt b/src/test/resources/edu/hm/hafner/analysis/parser/ansibleLint.txt
@@ -9,3 +9,5 @@
 /workspace/system.yml:20: risky-file-permissions File permissions unset or incorrect
 /workspace/upgrade.yml:38: no-handler Tasks that run when changed should likely be handlers
 /workspace/templates.yml:11: risky-file-permissions File permissions unset or incorrect
+
+/workspace/roles/create_service/tasks/main.yml:41: no-changed-when: Commands should not change things if nothing needs doing.