feat: update to csdiff 3.3.0

* csdiff: match findings by line content without spaces if available * csgrep --hash-v1: match csdiff/v1 fingerprint prefix * sarif: initial implementation of csdiff/v1 fingerprints * sarif: add descriptions for ShellCheck rules https://github.com/csutils/csdiff/releases/tag/csdiff-3.3.0
redhat-plumbers-in-action · May 13, 2024 · aba7ca1 · aba7ca1
1 parent 1c1e617
commit aba7ca1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -7,7 +7,7 @@ FROM fedora@sha256:4e007f288dce23966216be81ef62ba05d139b9338f327c1d1c73b7167dd47
 ARG fedora="40"
 ARG arch="x86_64"
 
-ARG version_csdiff="3.2.2-1"
+ARG version_csdiff="3.3.0-1"
 ARG version_shellcheck="0.9.0-6"
 
 ARG rpm_csdiff="csdiff-${version_csdiff}.fc${fedora}.${arch}.rpm"

diff --git a/test/Dockerfile b/test/Dockerfile
@@ -7,7 +7,7 @@ FROM fedora@sha256:4e007f288dce23966216be81ef62ba05d139b9338f327c1d1c73b7167dd47
 ARG fedora="40"
 ARG arch="x86_64"
 
-ARG version_csdiff="3.2.2-1"
+ARG version_csdiff="3.3.0-1"
 ARG version_shellcheck="0.9.0-6"
 
 ARG rpm_csdiff="csdiff-${version_csdiff}.fc${fedora}.${arch}.rpm"

diff --git a/test/fixtures/generate_SARIF/test.sarif b/test/fixtures/generate_SARIF/test.sarif
@@ -26,9 +26,15 @@
                                 ]
                             },
                             "name": "SC2034",
+                            "shortDescription": {
+                                "text": "SC2034"
+                            },
                             "help": {
                                 "text": "Defect reference: https://github.com/koalaman/shellcheck/wiki/SC2034",
                                 "markdown": "Defect reference: [SC2034](https://github.com/koalaman/shellcheck/wiki/SC2034)"
+                            },
+                            "fullDescription": {
+                                "text": "Defect reference: https://github.com/koalaman/shellcheck/wiki/SC2034"
                             }
                         },
                         {
@@ -39,9 +45,15 @@
                                 ]
                             },
                             "name": "SC2115",
+                            "shortDescription": {
+                                "text": "SC2115"
+                            },
                             "help": {
                                 "text": "Defect reference: https://github.com/koalaman/shellcheck/wiki/SC2115",
                                 "markdown": "Defect reference: [SC2115](https://github.com/koalaman/shellcheck/wiki/SC2115)"
+                            },
+                            "fullDescription": {
+                                "text": "Defect reference: https://github.com/koalaman/shellcheck/wiki/SC2115"
                             }
                         }
                     ]
@@ -98,7 +110,10 @@
                                 }
                             ]
                         }
-                    ]
+                    ],
+                    "fingerprints": {
+                        "csdiff/v0": "64c37c2cd555f4d61c6e05ebd224beb8147d77bf"
+                    }
                 },
                 {
                     "ruleId": "SHELLCHECK_WARNING: warning[SC2115]",
@@ -150,7 +165,10 @@
                                 }
                             ]
                         }
-                    ]
+                    ],
+                    "fingerprints": {
+                        "csdiff/v0": "d9a3f3f1027ba2a0ca5dc7eb24d7d8b09dbe2b1d"
+                    }
                 },
                 {
                     "ruleId": "SHELLCHECK_WARNING: warning[SC2115]",
@@ -202,7 +220,10 @@
                                 }
                             ]
                         }
-                    ]
+                    ],
+                    "fingerprints": {
+                        "csdiff/v0": "d9a3f3f1027ba2a0ca5dc7eb24d7d8b09dbe2b1d"
+                    }
                 }
             ]
         }

diff --git a/test/show_versions.bats b/test/show_versions.bats
@@ -17,5 +17,5 @@ setup () {
   assert_success
   assert_output \
 "ShellCheck: 0.9.0
-csutils: 3.2.2"
+csutils: 3.3.0"
 }