[azure][feat] Add support for mysql resource collection (#2150)

Co-authored-by: Matthias Veit <aquamatthias@users.noreply.github.com>

Author: 1101-1

fixlib/fixlib/baseresources.py

@@ -1094,6 +1094,14 @@ class DatabaseInstanceStatus(Enum):
     UNKNOWN = "unknown"
 
 
+@define(eq=False, slots=False)
+class BaseDatabaseInstanceType(BaseInstanceType):
+    kind: ClassVar[str] = "database_instance_type"
+    kind_display: ClassVar[str] = "Database Instance Type"
+    kind_description: ClassVar[str] = "A database instance type."
+    metadata: ClassVar[Dict[str, Any]] = {"icon": "database", "group": "database"}
+
+
 @define(eq=False, slots=False)
 class BaseDatabase(BaseResource):
     kind: ClassVar[str] = "database"

fixlib/fixlib/json_bender.py

@@ -358,6 +358,17 @@ def execute(self, source: Any) -> Any:
                 return None
 
 
+class AsFloat(Bender):
+    def execute(self, source: Any) -> Any:
+        if isinstance(source, float):
+            return source
+        else:
+            try:
+                return float(source)
+            except Exception:
+                return None
+
+
 class AsBool(Bender):
     def execute(self, source: Any) -> Any:
         if isinstance(source, bool):

plugins/azure/fix_plugin_azure/collector.py

@@ -35,6 +35,7 @@
     resources as network_resources,
 )
 from fix_plugin_azure.resource.sql import resources as sql_resources
+from fix_plugin_azure.resource.mysql import AzureMysqlCapability, AzureMysqlServerType, resources as mysql_resources
 from fix_plugin_azure.resource.storage import AzureStorageAccountUsage, AzureStorageSku, resources as storage_resources
 from fixlib.baseresources import Cloud, GraphRoot, BaseAccount, BaseRegion
 from fixlib.core.actions import CoreFeedback, ErrorAccumulator
@@ -61,6 +62,7 @@ def resource_with_params(clazz: Type[MicrosoftResource], param: str) -> bool:
     + security_resources
     + storage_resources
     + sql_resources
+    + mysql_resources
 )
 all_resources = subscription_resources + graph_resources  # defines all resource kinds. used in model check
 
@@ -233,12 +235,16 @@ def remove_usage_zero_value() -> None:
         rm_nodes(AzureNetworkVirtualApplianceSku, AzureSubscription)
         rm_nodes(AzureDiskType, AzureLocation)
         rm_nodes(AzureStorageSku, AzureLocation)
+        rm_nodes(AzureMysqlServerType, AzureLocation)
         remove_usage_zero_value()
 
     def after_collect(self) -> None:
         # Filter unnecessary nodes such as AzureDiskTypePricing
         nodes_to_remove = []
-        node_types = (AzureDiskTypePricing,)
+        node_types = (
+            AzureDiskTypePricing,
+            AzureMysqlCapability,
+        )
 
         for node in self.graph.nodes:
             if not isinstance(node, node_types):

plugins/azure/fix_plugin_azure/resource/base.py

@@ -23,7 +23,7 @@
 from fixlib.config import current_config
 from fixlib.core.actions import CoreFeedback
 from fixlib.graph import Graph, EdgeKey, NodeSelector, ByNodeId
-from fixlib.json_bender import Bender, bend, S, ForallBend, Bend
+from fixlib.json_bender import AsFloat, Bender, bend, S, ForallBend, Bend
 from fixlib.lock import RWLock
 from fixlib.threading import ExecutorQueue
 from fixlib.types import Json
@@ -294,6 +294,9 @@ class AzureLocation(MicrosoftResource, BaseRegion):
         "location_metadata": S("metadata") >> Bend(AzureLocationMetadata.mapping),
         "regional_display_name": S("regionalDisplayName"),
         "subscription_id": S("subscriptionId"),
+        "long_name": S("displayName"),
+        "latitude": S("metadata", "latitude") >> AsFloat(),
+        "longitude": S("metadata", "longitude") >> AsFloat(),
     }
     availability_zone_mappings: Optional[List[AzureAvailabilityZoneMappings]] = field(default=None, metadata={'description': 'The availability zone mappings for this region.'})  # fmt: skip
     display_name: Optional[str] = field(default=None, metadata={"description": "The display name of the location."})

plugins/azure/fix_plugin_azure/resource/compute.py

@@ -2079,14 +2079,17 @@ class AzureRestorePointCollection(MicrosoftResource):
         "provisioning_state": S("properties", "provisioningState"),
         "restore_point_collection_id": S("properties", "restorePointCollectionId"),
         "restore_points": S("properties", "restorePoints") >> ForallBend(AzureRestorePoint.mapping),
-        "source": S("properties", "source") >> Bend(AzureRestorePointCollectionSourceProperties.mapping),
+        "restore_point_collection_resource": S("properties", "source")
+        >> Bend(AzureRestorePointCollectionSourceProperties.mapping),
     }
     restore_point_collection_id: Optional[str] = field(default=None, metadata={'description': 'The unique id of the restore point collection.'})  # fmt: skip
     restore_points: Optional[List[AzureRestorePoint]] = field(default=None, metadata={'description': 'A list containing all restore points created under this restore point collection.'})  # fmt: skip
-    source: Optional[AzureRestorePointCollectionSourceProperties] = field(default=None, metadata={'description': 'The properties of the source resource that this restore point collection is created from.'})  # fmt: skip
+    restore_point_collection_resource: Optional[AzureRestorePointCollectionSourceProperties] = field(default=None, metadata={'description': 'The properties of the source resource that this restore point collection is created from.'})  # fmt: skip
 
     def connect_in_graph(self, builder: GraphBuilder, source: Json) -> None:
-        if (source_id := self.source) and (vm_id := source_id.id):
+        if (restore_point_collection_source := self.restore_point_collection_resource) and (
+            vm_id := restore_point_collection_source.id
+        ):
             builder.add_edge(self, edge_type=EdgeType.default, clazz=AzureVirtualMachineBase, id=vm_id)