fix: Check result list before appending. Remove the need to clean final_data

aws-ddb.py

@@ -25,7 +25,8 @@ def getResources(region_name: str) -> list[list[str | int]]:
         for t in table_names:
             resp2 = client.describe_table(TableName=t)
             i = resp2['Table']
-            return_data.append([i['TableName'], i['TableStatus'], i['TableSizeBytes'], i['ItemCount'], region_name])
+            if i:
+                return_data.append([i['TableName'], i['TableStatus'], i['TableSizeBytes'], i['ItemCount'], region_name])
     return return_data
 
 # Main function
@@ -42,8 +43,7 @@ def main() -> None:
             region_data = future.result()
             final_data.extend(region_data)
 
-    clean_data = [row for row in final_data if row]
-    for row in clean_data:
+    for row in final_data:
         ws.append(row)
 
     wb.save('aws-inventory.xlsx')

aws-ec2.py

@@ -27,7 +27,8 @@ def printResources(region_name: str) -> list[list[str | int]]:
                 if tag['Key'] == "Name":
                     name_tag = tag['Value']
                     break
-            return_data.append([i['InstanceId'], name_tag, i.get('PlatformDetails'), i['InstanceType'], i['PrivateIpAddress'], i['Placement']['AvailabilityZone']])
+            if i:
+                return_data.append([i['InstanceId'], name_tag, i.get('PlatformDetails'), i['InstanceType'], i['PrivateIpAddress'], i['Placement']['AvailabilityZone']])
     return return_data
 
 # Main function
@@ -44,8 +45,7 @@ def main() -> None:
             region_data = future.result()
             final_data.extend(region_data)
 
-    clean_data = [row for row in final_data if row]
-    for row in clean_data:
+    for row in final_data:
         ws.append(row)
 
     wb.save('aws-inventory.xlsx')

aws-elasticache.py

@@ -22,7 +22,8 @@ def printResources(region_name: str) -> list[list[str | int]]:
     client = boto3.client('elasticache', region_name=region_name)
     response = client.describe_cache_clusters()
     for i in response['CacheClusters']:
-        return_data.append([i['CacheClusterId'], i['CacheNodeType'], i['Engine'], i['EngineVersion'], i['NumCacheNodes'], i['PreferredAvailabilityZone']])
+        if i:
+            return_data.append([i['CacheClusterId'], i['CacheNodeType'], i['Engine'], i['EngineVersion'], i['NumCacheNodes'], i['PreferredAvailabilityZone']])
     return return_data
 
 # Main function
@@ -39,8 +40,7 @@ def main() -> None:
             region_data = future.result()
             final_data.extend(region_data)
 
-    clean_data = [row for row in final_data if row]
-    for row in clean_data:
+    for row in final_data:
         ws.append(row)
 
     wb.save('aws-inventory.xlsx')

aws-emr.py

@@ -21,7 +21,8 @@ def printResources(region_name: str) -> list[list[str | int]]:
     client = boto3.client('emr', region_name=region_name)
     response = client.list_clusters()
     for i in response['Clusters']:
-        return_data.append([i['Name'], i['Status'], i['NormalizedInstanceHours'], region_name])
+        if i:
+            return_data.append([i['Name'], i['Status'], i['NormalizedInstanceHours'], region_name])
     return return_data
 
 # Main function
@@ -38,8 +39,7 @@ def main() -> None:
             region_data = future.result()
             final_data.extend(region_data)
 
-    clean_data = [row for row in final_data if row]
-    for row in clean_data:
+    for row in final_data:
         ws.append(row)
 
     wb.save('aws-inventory.xlsx')

aws-lambda.py

@@ -23,7 +23,8 @@ def printResources(region_name: str) -> list[list[str | int]]:
     for page in paginator.paginate():
         functions = page.get('Functions', [])
         for i in functions:
-            return_data.append([i['FunctionName'], i['Runtime'], i['Architectures'][0], region_name])
+            if i:
+                return_data.append([i['FunctionName'], i['Runtime'], i['Architectures'][0], region_name])
     return return_data
 
 # Main function
@@ -40,8 +41,7 @@ def main() -> None:
             region_data = future.result()
             final_data.extend(region_data)
 
-    clean_data = [row for row in final_data if row]
-    for row in clean_data:
+    for row in final_data:
         ws.append(row)
 
     wb.save('aws-inventory.xlsx')

aws-lb.py

@@ -22,7 +22,8 @@ def printResources(region_name: str) -> list[list[str | int]]:
     client = boto3.client('elbv2', region_name=region_name)
     response = client.describe_load_balancers()
     for i in response['LoadBalancers']:
-        return_data.append([i['LoadBalancerName'], i['Scheme'], i['Type'], region_name])
+        if i:
+            return_data.append([i['LoadBalancerName'], i['Scheme'], i['Type'], region_name])
     return return_data
 
 # Main function
@@ -39,8 +40,7 @@ def main() -> None:
             region_data = future.result()
             final_data.extend(region_data)
 
-    clean_data = [row for row in final_data if row]
-    for row in clean_data:
+    for row in final_data:
         ws.append(row)
 
     wb.save('aws-inventory.xlsx')

aws-logs.py

@@ -21,7 +21,8 @@ def printResources(region_name: str) -> list[list[str | int]]:
     client = boto3.client('logs', region_name=region_name)
     response = client.describe_log_groups()
     for logGroup in response['logGroups']:
-        return_data.append([logGroup['logGroupName'], logGroup.get('retentionInDays'), logGroup['storedBytes'], region_name])
+        if logGroup:
+            return_data.append([logGroup['logGroupName'], logGroup.get('retentionInDays'), logGroup['storedBytes'], region_name])
     return return_data
 
 # Main function
@@ -38,8 +39,7 @@ def main() -> None:
             region_data = future.result()
             final_data.extend(region_data)
 
-    clean_data = [row for row in final_data if row]
-    for row in clean_data:
+    for row in final_data:
         ws.append(row)
     wb.save('aws-inventory.xlsx')
 

aws-opensearch.py

@@ -21,7 +21,8 @@ def printResources(region_name: str) -> list[list[str | int]]:
     client = boto3.client('opensearch', region_name=region_name)
     response = client.list_domain_names()
     for i in response['DomainNames']:
-        return_data.append([i['DomainName'], i['EngineType'], region_name])
+        if i:
+            return_data.append([i['DomainName'], i['EngineType'], region_name])
     return return_data
 
 # Main function
@@ -38,8 +39,7 @@ def main() -> None:
             region_data = future.result()
             final_data.extend(region_data)
 
-    clean_data = [row for row in final_data if row]
-    for row in clean_data:
+    for row in final_data:
         ws.append(row)
 
     wb.save('aws-inventory.xlsx')

aws-rds.py

@@ -22,7 +22,8 @@ def printResources(region_name: str) -> list[list[str | int]]:
     client = boto3.client('rds', region_name=region_name)
     response = client.describe_db_instances()
     for i in response['DBInstances']:
-        return_data.append([i['DBInstanceIdentifier'], i['DBInstanceClass'], i['Engine'], i['EngineVersion'], i['MultiAZ'], region_name])
+        if i:
+            return_data.append([i['DBInstanceIdentifier'], i['DBInstanceClass'], i['Engine'], i['EngineVersion'], i['MultiAZ'], region_name])
     return return_data
 
 # Main function
@@ -39,8 +40,7 @@ def main() -> None:
             region_data = future.result()
             final_data.extend(region_data)
 
-    clean_data = [row for row in final_data if row]
-    for row in clean_data:
+    for row in final_data:
         ws.append(row)
 
     wb.save('aws-inventory.xlsx')

aws-subnets.py

@@ -23,7 +23,8 @@ def printResources(region_name: str) -> list[list[str | int]]:
     for i in response['Subnets']:
         default_vpc_check = client.describe_vpcs(VpcIds=[i['VpcId']])
         for v in default_vpc_check['Vpcs']:
-            return_data.append([i['SubnetId'], i['VpcId'], i['CidrBlock'], i['AvailabilityZone'], v['IsDefault']])
+            if i:
+                return_data.append([i['SubnetId'], i['VpcId'], i['CidrBlock'], i['AvailabilityZone'], v['IsDefault']])
     return return_data
 
 # Main function
@@ -40,8 +41,7 @@ def main() -> None:
             region_data = future.result()
             final_data.extend(region_data)
 
-    clean_data = [row for row in final_data if row]
-    for row in clean_data:
+    for row in final_data:
         ws.append(row)
 
     wb.save('aws-inventory.xlsx')