Merge pull request #156 from oharan2/prefix

Allow filter by cluster prefix

cloudwash/entities/resources/ocps.py

@@ -29,10 +29,15 @@ def cleanup(self):
 
 class CleanAWSOcps(CleanOCPs):
     def list(self):
-        time_threshold = calculate_time_threshold(time_ref=settings.aws.criteria.ocps.sla)
-
-        query = " ".join([f"tag.key:{OCP_TAG_SUBSTR}*", f"region:{self.client.cleaning_region}"])
-        resources = self.client.list_resources(query=query)
+        resources = []
+        time_threshold = calculate_time_threshold(time_ref=settings.aws.criteria.ocps.get("SLA"))
+
+        ocp_prefix = list(settings.aws.criteria.ocps.get("OCP_PREFIXES") or [""])
+        for prefix in ocp_prefix:
+            query = " ".join(
+                [f"tag.key:{OCP_TAG_SUBSTR}{prefix}*", f"region:{self.client.cleaning_region}"]
+            )
+            resources.extend(self.client.list_resources(query=query))
 
         # Prepare resources to be filtered before deletion
         cluster_map = group_ocps_by_cluster(resources=resources)

conf/aws.yaml.template

@@ -31,6 +31,10 @@ AWS:
             # Specified as {time_value}{time_unit} format, e.g. "7d" = 7 Days
             # If a time unit is not specified (the value is numeric), it will be considered as Minutes
             SLA: 7d
+            # Specify OCP clusters prefix to filter by, for example: '["my_project_", "openshift-"]' etc..
+            # Regular expression based prefix is not supported
+            # Won't be considered if not given
+            OCP_PREFIXES: []
     EXCEPTIONS:
         VM:
             # VM names that would be skipped from cleanup

settings.yaml.template

@@ -104,6 +104,10 @@ AWS:
             # Specified as {time_value}{time_unit} format, e.g. "7d" = 7 Days
             # If a time unit is not specified (the value is numeric), it will be considered as Minutes
             SLA: 7d
+            # Specify OCP clusters prefix to filter by, for example: ["my_project_", "openshift-"] etc..
+            # Regular expression based prefix is not supported
+            # Won't be considered if not given
+            OCP_PREFIXES: []
     EXCEPTIONS:
         VM:
             # VM names that would be skipped from cleanup