From 675f0f6ef3c24eb0fc59e68733ada1116df945ac Mon Sep 17 00:00:00 2001 From: KenF Date: Thu, 22 Jan 2026 20:01:20 +0800 Subject: [PATCH] fix: Check result list before appending. Remove the need to clean final_data --- aws-ddb.py | 6 +++--- aws-ec2.py | 6 +++--- aws-elasticache.py | 6 +++--- aws-emr.py | 6 +++--- aws-lambda.py | 6 +++--- aws-lb.py | 6 +++--- aws-logs.py | 6 +++--- aws-opensearch.py | 6 +++--- aws-rds.py | 6 +++--- aws-subnets.py | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/aws-ddb.py b/aws-ddb.py index e6c2d34..8d52797 100755 --- a/aws-ddb.py +++ b/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') diff --git a/aws-ec2.py b/aws-ec2.py index 0856a91..f015b3f 100755 --- a/aws-ec2.py +++ b/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') diff --git a/aws-elasticache.py b/aws-elasticache.py index e551162..6bcb7e8 100755 --- a/aws-elasticache.py +++ b/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') diff --git a/aws-emr.py b/aws-emr.py index 81620f0..82b256f 100755 --- a/aws-emr.py +++ b/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') diff --git a/aws-lambda.py b/aws-lambda.py index 3d6496b..d61a2c5 100755 --- a/aws-lambda.py +++ b/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') diff --git a/aws-lb.py b/aws-lb.py index ccf6329..4c96d8a 100755 --- a/aws-lb.py +++ b/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') diff --git a/aws-logs.py b/aws-logs.py index 96c06f7..f566948 100755 --- a/aws-logs.py +++ b/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') diff --git a/aws-opensearch.py b/aws-opensearch.py index c4ab979..c7e0253 100755 --- a/aws-opensearch.py +++ b/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') diff --git a/aws-rds.py b/aws-rds.py index a9ba612..a73ad46 100755 --- a/aws-rds.py +++ b/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') diff --git a/aws-subnets.py b/aws-subnets.py index 6dcb336..60baa58 100755 --- a/aws-subnets.py +++ b/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')