changing property name

keep_for_days is removed instead use ami_min_days

amicleaner/cli.py

@@ -28,7 +28,7 @@ def __init__(self, args):
         self.from_ids = args.from_ids
         self.full_report = args.full_report
         self.force_delete = args.force_delete
-        self.keep_for_days = args.keep_for_days
+        self.ami_min_days = args.ami_min_days
 
         self.mapping_strategy = {
             "key": self.mapping_key,
@@ -87,7 +87,7 @@ def prepare_candidates(self, candidates_amis=None):
             if not group_name:
                 report["no-tags (excluded)"] = amis
             else:
-                reduced = c.reduce_candidates(amis, self.keep_previous, self.keep_for_days)
+                reduced = c.reduce_candidates(amis, self.keep_previous, self.ami_min_days)
                 if reduced:
                     report[group_name] = reduced
                     candidates.extend(reduced)
@@ -144,7 +144,7 @@ def print_defaults(self):
         print(TERM.green("mapping_values : {0}".format(self.mapping_values)))
         print(TERM.green("excluded_mapping_values : {0}".format(self.excluded_mapping_values)))
         print(TERM.green("keep_previous : {0}".format(self.keep_previous)))
-        print(TERM.green("keep_for_days : {0}".format(self.keep_for_days)))
+        print(TERM.green("ami_min_days : {0}".format(self.ami_min_days)))
 
     @staticmethod
     def print_version():

amicleaner/core.py

@@ -233,7 +233,7 @@ def tags_values_to_string(tags, filters=None):
 
         return ".".join(sorted(tag_values))
 
-    def reduce_candidates(self, mapped_candidates_ami, keep_previous=0, keep_for_days=-1):
+    def reduce_candidates(self, mapped_candidates_ami, keep_previous=0, ami_min_days=-1):
 
         """
         Given a array of AMIs to clean this function return a subsequent
@@ -244,12 +244,12 @@ def reduce_candidates(self, mapped_candidates_ami, keep_previous=0, keep_for_day
         result_amis = []
         result_amis.extend(mapped_candidates_ami)
 
-        if keep_for_days > 0:
+        if ami_min_days > 0:
             for ami in mapped_candidates_ami:
                 f_date = datetime.strptime(ami.creation_date, '%Y-%m-%dT%H:%M:%S.%fZ')
                 present = datetime.now()
                 delta = present - f_date
-                if delta.days < keep_for_days:
+                if delta.days < ami_min_days:
                     result_amis.remove(ami)
 
         mapped_candidates_ami = result_amis

amicleaner/resources/config.py

@@ -31,4 +31,4 @@
 
 # Number of days amis to keep based on creation date and grouping strategy
 # not including the ami currently running by an ec2 instance
-KEEP_FOR_DAYS = -1
+AMI_MIN_DAYS = -1

amicleaner/utils.py

@@ -8,7 +8,7 @@
 
 from prettytable import PrettyTable
 
-from .resources.config import KEEP_PREVIOUS, KEEP_FOR_DAYS
+from .resources.config import KEEP_PREVIOUS, AMI_MIN_DAYS
 
 
 class Printer(object):
@@ -112,10 +112,10 @@ def parse_args(args):
                         action="store_true",
                         help="Check and clean orphaned snapshots")
 
-    parser.add_argument("--keep-for-days",
-                        dest='keep_for_days',
+    parser.add_argument("--ami-min-days",
+                        dest='ami_min_days',
                         type=int,
-                        default=KEEP_FOR_DAYS,
+                        default=AMI_MIN_DAYS,
                         help="Number of days AMI to keep excluding those "
                              "currently being running")
 

tests/test_cli.py

@@ -68,7 +68,7 @@ def test_deletion():
 
 @mock_ec2
 @mock_autoscaling
-def test_deletion_keep_for_days():
+def test_deletion_ami_min_days():
     """ Test deletion methods """
 
     # creating tests objects
@@ -90,7 +90,7 @@ def test_deletion_keep_for_days():
     parser = parse_args(
         [
             '--keep-previous', '0',
-            '--keep-for-days', '1',
+            '--ami-min-days', '1',
             '--mapping-key', 'name',
             '--mapping-values', 'test-ami']
     )
@@ -106,7 +106,7 @@ def test_deletion_keep_for_days():
     parser = parse_args(
         [
             '--keep-previous', '0',
-            '--keep-for-days', '10000',
+            '--ami-min-days', '10000',
             '--mapping-key', 'name',
             '--mapping-values', 'test-ami']
     )
@@ -165,7 +165,7 @@ def test_parse_args_no_args():
     assert parser.mapping_key is None
     assert parser.mapping_values is None
     assert parser.keep_previous is 4
-    assert parser.keep_for_days is -1
+    assert parser.ami_min_days is -1
 
 
 def test_parse_args():
@@ -181,8 +181,8 @@ def test_parse_args():
     assert parser.mapping_key == "tags"
     assert len(parser.mapping_values) == 2
 
-    parser = parse_args(['--keep-for-days', '10', '--full-report'])
-    assert parser.keep_for_days == 10
+    parser = parse_args(['--ami-min-days', '10', '--full-report'])
+    assert parser.ami_min_days == 10
     assert parser.full_report is True