Merge pull request #43 from ONS-Innovation/nullsafety

KEH-1066 | Null Safety

Author: TotalDwarf03

data_logger/src/main.py

@@ -758,7 +758,8 @@ def process_dependabot_alerts(response_json: dict, threshold: int) -> list[dict]
                 "repository": alert["repository"]["name"],
                 "repository_url": alert["repository"]["html_url"],
                 "created_at": alert["created_at"],
-                "severity": alert["security_advisory"]["severity"]
+                "severity": alert["security_advisory"]["severity"],
+                "alert_url": alert["html_url"],
             }
 
             dependabot_data.append(formatted_alert)

src/dependabot/collection.py

@@ -29,14 +29,21 @@ def load_dependabot(_s3, bucket: str) -> pd.DataFrame | None:
 
     df_dependabot = pd.json_normalize(json_data)
 
+    if df_dependabot.empty:
+        return None
+
     # Rename the columns to be more readable
     df_dependabot.columns = [
         "Repository",
         "URL",
         "Creation Date",
         "Severity",
+        "Alert URL",
     ]
 
+    # Remove alert URL since it isn't used (Database requirement only)
+    df_dependabot = df_dependabot.drop(columns=["Alert URL"])
+
     # Add Alert Age (Days) to the DataFrame
     df_dependabot["Alert Age (Days)"] = datetime.now() - pd.to_datetime(df_dependabot["Creation Date"]).dt.tz_localize(None)
     df_dependabot["Alert Age (Days)"] = df_dependabot["Alert Age (Days)"].dt.days

src/dependabot/dependabot.py

@@ -30,6 +30,7 @@
 
 if df_dependabot is None:
     st.error("Error loading Dependabot data. Please check the S3 bucket and file.")
+    st.stop()
 
 
 rest = utils.get_rest_interface(

src/repositories/collection.py

@@ -28,6 +28,9 @@ def load_repositories(_s3, bucket: str) -> pd.DataFrame | None:
 
     df_repositories = pd.json_normalize(json_data)
 
+    if df_repositories.empty:
+        return None
+
     # Update repository_type to be title case
     df_repositories["type"] = df_repositories["type"].str.title()
 

src/secret_scanning/collection.py

@@ -29,6 +29,9 @@ def load_secret_scanning(_s3, bucket: str) -> pd.DataFrame | None:
 
     df_secret_scanning = pd.json_normalize(json_data)
 
+    if df_secret_scanning.empty:
+        return None
+
     # Rename the columns to be more readable
     df_secret_scanning.columns = [
         "Repository",

src/secret_scanning/secret_scanning.py

@@ -30,6 +30,7 @@
 
 if df_secret_scanning is None:
     st.error("Error loading secret scanning data. Please check the S3 bucket and file.")
+    st.stop()
 
 
 rest = utils.get_rest_interface(