#174 removed multiple inheritance in named tuples

Author: patrykorwat

cloudiscovery/provider/aws/common_aws.py

@@ -9,7 +9,6 @@
 from shared.common import (
     ResourceCache,
     message_handler,
-    ResourceTag,
     Filterable,
     exit_critical,
     BaseCommand,
@@ -172,7 +171,7 @@ def init_region_cache(self, region):
         ).paths()
 
 
-def resource_tags(resource_data: dict) -> List[ResourceTag]:
+def resource_tags(resource_data: dict) -> List[Filterable]:
     if isinstance(resource_data, str):
         return []
 
@@ -196,7 +195,7 @@ def resource_tags(resource_data: dict) -> List[ResourceTag]:
     return tags
 
 
-def resource_tags_from_tuples(tuples: List[Dict[str, str]]) -> List[ResourceTag]:
+def resource_tags_from_tuples(tuples: List[Dict[str, str]]) -> List[Filterable]:
     """
         List of key-value tuples that store tags, syntax:
         [
@@ -218,13 +217,13 @@ def resource_tags_from_tuples(tuples: List[Dict[str, str]]) -> List[ResourceTag]
     result = []
     for tuple_elem in tuples:
         if "Key" in tuple_elem and "Value" in tuple_elem:
-            result.append(ResourceTag(key=tuple_elem["Key"], value=tuple_elem["Value"]))
+            result.append(Filterable(key=tuple_elem["Key"], value=tuple_elem["Value"]))
         elif "key" in tuple_elem and "value" in tuple_elem:
-            result.append(ResourceTag(key=tuple_elem["key"], value=tuple_elem["value"]))
+            result.append(Filterable(key=tuple_elem["key"], value=tuple_elem["value"]))
     return result
 
 
-def resource_tags_from_dict(tags: Dict[str, str]) -> List[ResourceTag]:
+def resource_tags_from_dict(tags: Dict[str, str]) -> List[Filterable]:
     """
         List of key-value dict that store tags, syntax:
         {
@@ -233,7 +232,7 @@ def resource_tags_from_dict(tags: Dict[str, str]) -> List[ResourceTag]:
     """
     result = []
     for key, value in tags.items():
-        result.append(ResourceTag(key=key, value=value))
+        result.append(Filterable(key=key, value=value))
     return result
 
 

cloudiscovery/shared/command.py

@@ -9,8 +9,6 @@
     Resource,
     ResourceEdge,
     Filterable,
-    ResourceTag,
-    ResourceType,
     BaseOptions,
     message_handler,
     ResourceProvider,
@@ -161,14 +159,14 @@ def filter_resources(
     for resource in resources:
         matches_filter = False
         for resource_filter in filters:
-            if isinstance(resource_filter, ResourceTag):
+            if resource_filter.is_tag():
                 for resource_tag in resource.tags:
                     if (
                         resource_tag.key == resource_filter.key
                         and resource_tag.value == resource_filter.value
                     ):
                         matches_filter = True
-            elif isinstance(resource_filter, ResourceType):
+            elif resource_filter.is_type():
                 if resource.digest.type == resource_filter.type:
                     matches_filter = True
         if matches_filter:

cloudiscovery/shared/common.py

@@ -47,8 +47,17 @@ class ResourceEdge(NamedTuple):
     label: str = None
 
 
-class Filterable:
-    pass
+# Either key/value is passed or type
+class Filterable(NamedTuple):
+    key: str = None
+    value: str = None
+    type: str = None
+
+    def is_type(self):
+        return self.type is not None
+
+    def is_tag(self):
+        return self.key is not None and self.value is not None
 
 
 class LimitsValues(NamedTuple):
@@ -67,21 +76,12 @@ class SecurityValues(NamedTuple):
     value: str
 
 
-class ResourceTag(NamedTuple, Filterable):
-    key: str
-    value: str
-
-
-class ResourceType(NamedTuple, Filterable):
-    type: str
-
-
 class Resource(NamedTuple):
     digest: ResourceDigest
     name: str = ""
     details: str = ""
     group: str = ""
-    tags: List[ResourceTag] = []
+    tags: List[Filterable] = []
     limits: LimitsValues = None
     security: SecurityValues = None
     attributes: Dict[str, object] = {}
@@ -190,9 +190,9 @@ def datetime_to_string(o):
 def _add_filter(filters: List[Filterable], is_tag: bool, full_name: str, value: str):
     if is_tag:
         name = full_name[len(FILTER_TAG_NAME_PREFIX) :]
-        filters.append(ResourceTag(key=name, value=value))
+        filters.append(Filterable(key=name, value=value))
     else:
-        filters.append(ResourceType(type=value))
+        filters.append(Filterable(type=value))
 
 
 def parse_filters(arg_filters) -> List[Filterable]:

cloudiscovery/tests/shared/test_shared_command.py

@@ -4,11 +4,10 @@
 
 from shared.command import filter_resources, filter_relations
 from shared.common import (
-    ResourceTag,
     Resource,
     ResourceDigest,
     ResourceEdge,
-    ResourceType,
+    Filterable,
 )
 
 
@@ -19,7 +18,7 @@ def test_no_filters_resource(self):
                 Resource(
                     digest=ResourceDigest(id="1", type="type"),
                     name="name",
-                    tags=[ResourceTag(key="key", value="value")],
+                    tags=[Filterable(key="key", value="value")],
                 )
             ],
             [],
@@ -36,15 +35,15 @@ def test_one_tag_filter_resource(self):
                 Resource(
                     digest=ResourceDigest(id="1", type="type"),
                     name="name",
-                    tags=[ResourceTag(key="key", value="value")],
+                    tags=[Filterable(key="key", value="value")],
                 ),
                 Resource(
                     digest=ResourceDigest(id="2", type="type"),
                     name="name",
-                    tags=[ResourceTag(key="key", value="wrong")],
+                    tags=[Filterable(key="key", value="wrong")],
                 ),
             ],
-            [ResourceTag(key="key", value="value")],
+            [Filterable(key="key", value="value")],
         )
 
         assert_that(resources).is_length(1)
@@ -58,22 +57,22 @@ def test_two_tags_filter_resource(self):
                 Resource(
                     digest=ResourceDigest(id="1", type="type"),
                     name="name",
-                    tags=[ResourceTag(key="key", value="value1")],
+                    tags=[Filterable(key="key", value="value1")],
                 ),
                 Resource(
                     digest=ResourceDigest(id="2", type="type"),
                     name="name",
-                    tags=[ResourceTag(key="key", value="value2")],
+                    tags=[Filterable(key="key", value="value2")],
                 ),
                 Resource(
                     digest=ResourceDigest(id="3", type="type"),
                     name="name",
-                    tags=[ResourceTag(key="key", value="wrong")],
+                    tags=[Filterable(key="key", value="wrong")],
                 ),
             ],
             [
-                ResourceTag(key="key", value="value1"),
-                ResourceTag(key="key", value="value2"),
+                Filterable(key="key", value="value1"),
+                Filterable(key="key", value="value2"),
             ],
         )
 
@@ -87,15 +86,15 @@ def test_one_type_filter_resource(self):
                 Resource(
                     digest=ResourceDigest(id="1", type="type1"),
                     name="name",
-                    tags=[ResourceTag(key="key", value="value")],
+                    tags=[Filterable(key="key", value="value")],
                 ),
                 Resource(
                     digest=ResourceDigest(id="2", type="type2"),
                     name="name",
-                    tags=[ResourceTag(key="key", value="wrong")],
+                    tags=[Filterable(key="key", value="wrong")],
                 ),
             ],
-            [ResourceType(type="type1")],
+            [Filterable(type="type1")],
         )
 
         assert_that(resources).is_length(1)
@@ -111,7 +110,7 @@ def test_no_filters_relation(self):
                 Resource(
                     digest=digest,
                     name="name",
-                    tags=[ResourceTag(key="key", value="value")],
+                    tags=[Filterable(key="key", value="value")],
                 )
             ],
             [edge],