Merge pull request #35 from ONS-Innovation/KEH-817-last-updated

KEH-817-Last_updated

Author: nimshi89

src/app.py

@@ -42,6 +42,36 @@ def get_secret_manager_client() -> boto3.client:
     secret_manager = session.client("secretsmanager", secret_reigon)
     return secret_manager
 
+def get_last_modified(client: boto3.client, file_names: list[str]) -> dict:
+    """
+    This function retrieves and returns the `LastModified` value for the specified set of files
+    in a given S3 bucket.
+
+    Args:
+        client (boto3.client): An initialized boto3 S3 client.
+        file_names: A list of string values.
+
+    Returns:
+        dict: A dictionary containing formatted datetime values of the last modification date for each file.
+              The keys are the base file names (without extension) and the values are the formatted datetime strings.
+    
+    Raises:
+        Exception: Propagates any exceptions not caught by the individual file processing.
+    """
+
+    last_modified_timestamps = {}
+
+    for file in file_names:
+        try:
+            response = client.head_object(Bucket=bucket_name, Key=file)
+            last_modified = response["LastModified"]
+            file_key = file.split(".")[0]
+            last_modified_timestamps[file_key] = last_modified.strftime('%Y-%m-%d %H:%M:%S')
+        except Exception as e:
+            # Handle the error for a specific file here.
+            print(f"Error processing file {file}: {e}")
+
+    return last_modified_timestamps
 
 @st.cache_data
 def load_repositories(_s3, load_date: datetime.date) -> pd.DataFrame | str:
@@ -216,6 +246,9 @@ def load_file(filename: str) -> dict:
 
 s3 = get_s3_client()
 
+file_names = ["repositories.json", "secret_scanning.json", "dependabot.json"]
+last_modified_values = get_last_modified(s3, file_names)
+
 df_repositories = load_repositories(s3, loading_date)
 total_secret_alerts, oldest_secret_alert, df_secret_scanning = load_secret_scanning(s3, loading_date)
 df_total_dependabot_alerts, oldest_dependabot_alert, worst_severity_dependabot, df_dependabot = load_dependabot(s3, loading_date)
@@ -258,7 +291,15 @@ def load_file(filename: str) -> dict:
 # Repository Analysis Section
 
 with repository_tab:
-    st.header(":blue-background[Repository Analysis]")
+    rep_last_modified = last_modified_values["repositories"]
+    col1, col2 =st.columns([3,1])
+
+    with col1:
+        st.header(":blue-background[Repository Analysis]")
+    
+    with col2:
+        st.write(f"#### Last Updated: {rep_last_modified}")
+
 
     # Gets the rules from the repository DataFrame
     rules = df_repositories.columns.to_list()[4:]
@@ -546,7 +587,15 @@ def load_file(filename: str) -> dict:
 # Secret Scanning Analysis Section
 
 with secret_tab:
-    st.header(":blue-background[Secret Scanning Analysis]")
+    col1, col2 =st.columns([3,1])
+    secrets_tab = last_modified_values["secret_scanning"]
+
+    with col1:
+         st.header(":blue-background[Secret Scanning Analysis]")
+    
+    with col2:
+        st.write(f"#### Last Updated: {secrets_tab}")
+
     st.write("Alerts open for more than 5 days.")
 
     col1, col2, col3, col4 = st.columns(4)
@@ -584,7 +633,15 @@ def load_file(filename: str) -> dict:
 # Dependabot Analysis Section
 
 with dependabot_tab:
-    st.header(":blue-background[Dependabot Analysis]")
+    col1, col2 =st.columns([3,1])
+    dependabot = last_modified_values["dependabot"]
+
+    with col1:
+        st.header(":blue-background[Dependabot Analysis]")
+
+    with col2:
+        st.write(f"#### Last Updated: {dependabot}")
+
     st.write("Alerts open for more than 5 days (Critical), 15 days (High), 60 days (Medium), 90 days (Low).")
 
     # Data filters