Release 1.1.2 - Added TrivySummary version and link to PDF footer

EdgewareRoad · Mar 19, 2024 · d076515 · d076515
1 parent b727f6f
commit d076515
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,4 +1,2 @@
-Full whitelisting support (see README.md)
-
-Documentation update.
+Added TrivySummary version and link into the PDF output file footer
 
diff --git a/src/main/java/com/fujitsu/edgewareroad/trivysummary/TrivySummaryApp.java b/src/main/java/com/fujitsu/edgewareroad/trivysummary/TrivySummaryApp.java
@@ -295,6 +295,7 @@ private boolean summariseTrivyHistory(String title, TrivyScanHistory history, Pa
 				variables.put("openVulnerabilities", comparison.getOpenVulnerabilities());
 				variables.put("closedVulnerabilities", comparison.getClosedVulnerabilities());
 				variables.put("whitelistedVulnerabilities", comparison.getWhitelistedVulnerabilities());
+				variables.put("trivySummaryVersion", config.getVersion());
 
 				new RenderToPDF().renderToPDF(variables, "compareTrivyScans", outputFile);
 			}
@@ -323,6 +324,7 @@ private boolean summariseTrivyHistory(String title, TrivyScanHistory history, Pa
 				variables.put("scanDate", summary.getScanDate());
 				variables.put("openVulnerabilities", summary.getOpenVulnerabilities());
 				variables.put("whitelistedVulnerabilities", summary.getWhitelistedVulnerabilities());
+				variables.put("trivySummaryVersion", config.getVersion());
 
 				new RenderToPDF().renderToPDF(variables, "summariseTrivyScan", outputFile);
 			}

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-trivysummary.version=1.1.1
+trivysummary.version=1.1.2
 
 logging.level.root=ERROR
 

diff --git a/src/main/resources/templates/compareTrivyScans.html b/src/main/resources/templates/compareTrivyScans.html
@@ -10,6 +10,7 @@
 <body>
 
     <span id="header" th:text="|${title}|"></span>
+    <span id="footer">Generated by <a href="https://github.com/EdgewareRoad/TrivySummary" th:text="|TrivySummary ${trivySummaryVersion}|"></a></span>
 
     <h1 th:text="|${title}|">Title</h1>
 

diff --git a/src/main/resources/templates/styles.css b/src/main/resources/templates/styles.css
@@ -3,13 +3,14 @@
     margin-bottom: 6em;
     margin-left: 4em;
     margin-right: 4em;
+
     /* headers*/
     @top-left {
         content: element(header);
     }
 
     @bottom-left {
-        content: "Generated by TrivySummary";
+        content: element(footer);
         font-family: sans-serif;
         font-size: 0.8em;
     }
@@ -27,6 +28,11 @@
     font-family: sans-serif;
 }
 
+#footer {
+    position: running(footer);
+    font-family: sans-serif;
+}
+
 *,
 *::before,
 *::after {

diff --git a/src/main/resources/templates/summariseTrivyScan.html b/src/main/resources/templates/summariseTrivyScan.html
@@ -10,6 +10,7 @@
 <body>
 
     <span id="header" th:text="|${title}|"></span>
+    <span id="footer">Generated by <a href="https://github.com/EdgewareRoad/TrivySummary" th:text="|TrivySummary ${trivySummaryVersion}|"></a></span>
 
     <h1 th:text="|${title}|">Title</h1>