linting

Author: oliviergaumond

reference-artifacts/Custom-Scripts/lza-upgrade/tools/log-group-checks/log-groups-check.py

@@ -8,6 +8,7 @@
 # Thread-local storage for progress tracking
 thread_local = threading.local()
 
+
 def get_log_group_resource_policies_count(logs_client):
     """Get count of log group resource policies."""
     try:
@@ -17,6 +18,7 @@ def get_log_group_resource_policies_count(logs_client):
         print(f"Error getting resource policies: {e}")
         return 0
 
+
 def get_log_groups_filters(logs_client):
     """Fetch all log groups and return the subscription filters."""
     paginator = logs_client.get_paginator('describe_log_groups')
@@ -41,6 +43,7 @@ def get_log_groups_filters(logs_client):
 
     return log_groups_with_two_filters
 
+
 def get_active_accounts():
     """Get all active accounts from AWS Organizations."""
     print("Fetching active accounts from AWS Organizations...")
@@ -59,6 +62,7 @@ def get_active_accounts():
     print(f"Found {len(active_accounts)} active accounts")
     return active_accounts
 
+
 def assume_role_and_get_logs_client(account_id, role_name, region):
     """Assume role in target account and return logs client."""
     sts_client = boto3.client('sts')
@@ -78,6 +82,7 @@ def assume_role_and_get_logs_client(account_id, role_name, region):
         aws_session_token=credentials['SessionToken']
     )
 
+
 def process_account(account, role_name, region):
     """Process a single account in a specific region and return results."""
     account_id = account['Id']
@@ -93,24 +98,25 @@ def process_account(account, role_name, region):
         resource_policies_count = get_log_group_resource_policies_count(logs_client)
 
         # count log groups that have two subscription filters
-        nbLogGroupsWith2Filters = sum(1 for log_group in log_groups if len(log_group['filters']) == 2)
+        log_groups_with_two_filters_count = sum(1 for log_group in log_groups if len(log_group['filters']) == 2)
 
-        print(f"  {account_name} ({region}): Found {nbLogGroupsWith2Filters} log groups with 2 subscription filters")
+        print(f"  {account_name} ({region}): Found {log_groups_with_two_filters_count} log groups with 2 subscription filters")
         print(f"  {account_name} ({region}): Found {resource_policies_count} log group resource policies")
 
         return {
             'accountId': account_id,
             'accountName': account_name,
             'region': region,
             'resourcePoliciesCount': resource_policies_count,
-            'nbLogGroupsWith2Filters': nbLogGroupsWith2Filters,
+            'logGroupsWithTwoFiltersCount': log_groups_with_two_filters_count,
             'logGroups': log_groups
         }
 
     except Exception as e:
         print(f"  {account_name} ({region}): Error - {e}")
         return None
 
+
 def main():
     parser = argparse.ArgumentParser(
         prog='log-groups-check',
@@ -151,7 +157,12 @@ def main():
 
         # Collect results as they complete
         for future in as_completed(future_to_pair):
-            result = future.result()
+            try:
+                result = future.result()
+            except Exception as e:
+                account, region = future_to_pair[future]
+                print(f"  {account['Name']} ({region}): Failed to process - {e}")
+                result = None
             if result:
                 all_results.append(result)
 
@@ -162,23 +173,24 @@ def main():
     # Final report
     total_log_groups = sum(len(result['logGroups']) for result in all_results)
     total_resource_policies = sum(result['resourcePoliciesCount'] for result in all_results)
-    print(f"\nProcessing complete!")
+    print("\nProcessing complete!")
     print(f"Results saved to: {args.output_file}")
     print(f"\nFinal Report: {total_log_groups} log groups across {len(all_results)} account-region combinations")
     print(f"Total resource policies: {total_resource_policies}")
     print("=" * 80)
 
     for result in all_results:
-        if result['nbLogGroupsWith2Filters'] > 0 or result['resourcePoliciesCount'] > 8:
+        if result['logGroupsWithTwoFiltersCount'] > 0 or result['resourcePoliciesCount'] > 8:
             print(f"\nAccount: {result['accountName']} ({result['accountId']}) - Region: {result['region']}")
             print(f"Resource policies: {result['resourcePoliciesCount']}")
-            print(f"Log Groups with 2 filters: {(result['nbLogGroupsWith2Filters'])}")
+            print(f"Log Groups with 2 filters: {result['logGroupsWithTwoFiltersCount']}")
 
             for lg in result['logGroups']:
                 if len(lg['filters']) >= 2:
                     print(f"  • {lg['logGroupName']}")
                     for i, filter_info in enumerate(lg['filters'], 1):
                         print(f"    Filter {i}: {filter_info['filterName']} -> {filter_info['destinationArn']}")
 
+
 if __name__ == "__main__":
     main()