🐛 fix minor issues (#31)

Signed-off-by: Pranav Gaikwad <pgaikwad@redhat.com>

Author: pranavgaikwad

aws/reporting/ec2.py

@@ -6,6 +6,17 @@
 
 logger = logging.getLogger(__name__)
 
+EC2_KEYS = [
+    'InstanceId',
+    'InstanceType',
+    'Placement.AvailabilityZone',
+    'LaunchTime',
+    'IamInstanceProfile.Arn',
+    'Tags.owner',
+    'Tags.Name',
+    'Tags.guid'
+]
+
 def get_all_instances():
     all_instances = []
     for r in get_all_regions():
@@ -25,19 +36,9 @@ def get_instances_per_region(region):
     return instances
 
 def reformat_instance_data(raw_instances):
-    keys = [
-        'InstanceId',
-        'InstanceType',
-        'Placement.AvailabilityZone',
-        'LaunchTime',
-        'IamInstanceProfile.Arn',
-        'Tags.owner',
-        'Tags.Name',
-        'Tags.guid'
-    ]
-    formatted_instances = reformat_data(raw_instances, keys)
+    formatted_instances = reformat_data(raw_instances, EC2_KEYS)
     for inst in formatted_instances:
-        region = re.sub(r'(\w+)-(\w+)-(\d)\w+', "\g<1>-\g<2>-\g<3>", inst["AvailabilityZone"])
+        region = re.sub(r'(\w+)-(\w+)-(\d)\w+', r"\g<1>-\g<2>-\g<3>", inst["AvailabilityZone"])
         instance_type = inst['InstanceType']
         launch_time = inst['LaunchTime']
         try:

aws/reporting/elbs.py

@@ -44,7 +44,7 @@ def reformat_elbs_data(elbs):
                 az = elb['AvailabilityZones'][0]['ZoneName']
             else:
                 az = elb['AvailabilityZones'][0]
-            elb['Region'] = re.sub(r'(\w+)-(\w+)-(\d)\w+', "\g<1>-\g<2>-\g<3>", az)
+            elb['Region'] = re.sub(r'(\w+)-(\w+)-(\d)\w+', r"\g<1>-\g<2>-\g<3>", az)
         elb['TotalBill'] = "${}".format(calculate_bill_for_elb(elb['Type'], elb['Region'], elb['CreatedTime'])[2])
         elb['CostPerDay'] = "${}".format(calculate_bill_for_elb(elb['Type'], elb['Region'], elb['CreatedTime'])[1])
         if 'AvailabilityZones' in elb:

aws/reporting/main.py

@@ -8,7 +8,7 @@
 from cloudformation import delete_stacks
 from ec2 import get_all_instances, reformat_instance_data, \
     get_all_eips, reformat_eips_data, get_all_unused_volumes, \
-    delete_volume, delete_eip, terminate_instance
+    delete_volume, delete_eip, terminate_instance, EC2_KEYS
 from elbs import get_all_elbs, reformat_elbs_data, delete_classic_elb
 from emailer import Emailer
 from s3 import get_all_buckets, reformat_buckets_data
@@ -32,6 +32,19 @@ def prepare_old_instances_data(all_instances_sheet, old_instances_sheet, tdelta=
             instance['Saved'] = existing_old_instances.get(instance['InstanceId'], {}).get('Saved', '')
             instance['Notes'] = existing_old_instances.get(instance['InstanceId'], {}).get('Notes', '')
             old_instances.append(instance)
+    if not old_instances:
+        dummy_old_instance = {}
+        for key in EC2_KEYS:
+            split_keys = key.split('.')
+            if len(split_keys) == 1:
+                dummy_old_instance[key] = ''
+            else:
+                dummy_old_instance[split_keys[-1]] = ''
+        dummy_old_instance['TotalBill'] = ''
+        dummy_old_instance['Cost Per Day'] = ''
+        dummy_old_instance['Saved'] = ''
+        dummy_old_instance['Notes'] = ''
+        return [dummy_old_instance]
     return old_instances
 
 def prepare_old_s3_buckets_data(all_s3_buckets_sheet, old_s3_buckets_sheet):
@@ -53,7 +66,7 @@ def terminate_instances(old_instances_sheet, all_instances_sheet):
     for inst in old_instances:
         if 'save' not in inst['Saved'].lower():
             instance_id = inst['InstanceId']
-            instance_region = re.sub(r'(\w+)-(\w+)-(\d)\w+', "\g<1>-\g<2>-\g<3>", inst["AvailabilityZone"])
+            instance_region = re.sub(r'(\w+)-(\w+)-(\d)\w+', r"\g<1>-\g<2>-\g<3>", inst["AvailabilityZone"])
             instance_ids.append([instance_id, instance_region])
     for inst in instance_ids:
         response = terminate_instance(inst[0], inst[1])
@@ -262,3 +275,4 @@ def start(argument):
 
     if not skip_summary:
         summarySheet.append_data_to_sheet([summaryRow])
+

aws/reporting/pricing.py

@@ -66,12 +66,12 @@ def _ec2_pricing_filters(instance_type, region_code):
         {
             'Field': 'location',
             'Type': 'TERM_MATCH',
-            'Value': _region_filter_map()[region_code]
+            'Value': _region_filter_map().get(region_code, 'US East (N. Virginia)')
         },
         {
             'Field': 'usageType',
             'Type': 'TERM_MATCH',
-            'Value': _ec2_usage_filter_map(instance_type)[region_code]
+            'Value': _ec2_usage_filter_map(instance_type).get(region_code, 'US East (N. Virginia)')
         },
         {
             'Field': 'tenancy',
@@ -88,7 +88,7 @@ def _elb_pricing_filters(elb_type, region_code):
         {
             'Field': 'location',
             'Type': 'TERM_MATCH',
-            'Value': _region_filter_map()[region_code]
+            'Value': _region_filter_map().get(region_code, 'US East (N. Virginia)')
         },
         {
             'Field': 'operation',
@@ -155,4 +155,4 @@ def calculate_bill_for_elb(elb_type, region_code, launch_time):
     """
     price_per_hour = get_price_for_elb(elb_type, region_code)
     total_bill, price_per_day = _calculate_bill(launch_time, price_per_hour)
-    return (price_per_hour, price_per_day, total_bill)
+    return (price_per_hour, price_per_day, total_bill)

aws/reporting/sheet.py

@@ -50,11 +50,11 @@ def get_custom_range(self, start, end):
 
     def read_custom(self, start, end, indexField=None):
         return self.client.service.spreadsheets().values().get(
-            spreadsheetId=self.sheet_id, range=self.get_custom_range(start, end)).execute()['values']
+            spreadsheetId=self.sheet_id, range=self.get_custom_range(start, end)).execute().get('values', [])
 
     def read_spreadsheet(self, indexField=None):
         return self.from_sheet_data(self.client.service.spreadsheets().values().get(
-            spreadsheetId=self.sheet_id, range=self.get_sheet_range()).execute()['values'], indexField)
+            spreadsheetId=self.sheet_id, range=self.get_sheet_range()).execute().get('values', []), indexField)
 
     def load_data_from_sheet(self):
         return self.from_sheet_data(self.sheet.get('values', []))