Merge pull request #75 from abnamro/2030291-bug-fix-save-findings

[#2030291] Handled scenario when comment is none and release v1.0.3

Author: amrityamrout

components/resc-backend/setup.cfg

@@ -1,7 +1,7 @@
 [metadata]
 name = resc_backend
 description = Repository Scanner - Backend
-version = 1.0.2
+version = 1.0.3
 author = ABN AMRO
 author_email = resc@nl.abnamro.com
 url = https://github.com/ABNAMRO/repository-scanner

components/resc-backend/src/resc_backend/db/model/finding.py

@@ -48,6 +48,7 @@ def __init__(self, rule_name, file_path, line_number, commit_id, commit_message,
 
     @staticmethod
     def create_from_finding(finding):
+        sanitized_comment = html.escape(finding.comment) if finding.comment else finding.comment
         db_finding = DBfinding(
             rule_name=finding.rule_name,
             file_path=finding.file_path,
@@ -58,7 +59,7 @@ def create_from_finding(finding):
             commit_timestamp=finding.commit_timestamp,
             author=finding.author,
             status=finding.status,
-            comment=html.escape(finding.comment),
+            comment=sanitized_comment,
             event_sent_on=finding.event_sent_on,
             branch_id=finding.branch_id
         )

components/resc-backend/src/resc_backend/resc_web_service/crud/finding.py

@@ -23,9 +23,10 @@
 
 
 def update_finding(db_connection: Session, finding_id: int, finding: finding_schema.FindingUpdate):
+    sanitized_comment = html.escape(finding.comment) if finding.comment else finding.comment
     db_finding = db_connection.query(model.DBfinding).filter_by(id_=finding_id).first()
     db_finding.status = finding.status
-    db_finding.comment = html.escape(finding.comment)
+    db_finding.comment = sanitized_comment
     db_connection.commit()
     db_connection.refresh(db_finding)
     return db_finding
@@ -58,8 +59,9 @@ def audit_finding(db_connection: Session, db_finding: finding_schema.FindingRead
     :return: FindingRead
         The output will contain the findings that was updated
     """
+    sanitized_comment = html.escape(comment) if comment else comment
     db_finding.status = status
-    db_finding.comment = html.escape(comment)
+    db_finding.comment = sanitized_comment
 
     db_connection.commit()
     db_connection.refresh(db_finding)

components/resc-frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resc-frontend",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "author": "ABN AMRO Bank",
   "description": "Repository Scanner Frontend",
   "repository": {

components/resc-vcs-scanner/setup.cfg

@@ -1,7 +1,7 @@
 [metadata]
 name = resc_vcs_scanner
 description = Repository Scanner - Version Control System - Scanner
-version = 1.0.2
+version = 1.0.3
 author = ABN AMRO
 author_email = resc@nl.abnamro.com
 url = https://github.com/ABNAMRO/repository-scanner

components/resc-vcs-scraper/setup.cfg

@@ -1,7 +1,7 @@
 [metadata]
 name = resc_vcs_scraper
 description = Repository Scanner - Version Control System - Scraper
-version = 1.0.2
+version = 1.0.3
 author = ABN AMRO
 author_email = resc@nl.abnamro.com
 url = https://github.com/ABNAMRO/repository-scanner

deployment/kubernetes/Chart.yaml

@@ -4,9 +4,9 @@ description: A Helm chart for the Repository Scanner
 
 type: application
 
-version: 1.0.2
+version: 1.0.3
 
-appVersion: "1.0.2"
+appVersion: "1.0.3"
 
 dependencies:
     - name: resc-vcs-instances