[azure][feat] Align names of the azure resources (#2079)

Author: 1101-1

plugins/azure/fix_plugin_azure/collector.py

@@ -24,7 +24,7 @@
     AzureNetworkUsage,
     resources as network_resources,
 )
-from fix_plugin_azure.resource.storage import AzureStorageUsage, AzureStorageSku, resources as storage_resources
+from fix_plugin_azure.resource.storage import AzureStorageAccountUsage, AzureStorageSku, resources as storage_resources
 from fix_plugin_azure.resource.containerservice import resources as aks_resources
 from fixlib.baseresources import Cloud, GraphRoot
 from fixlib.core.actions import CoreFeedback, ErrorAccumulator
@@ -175,7 +175,7 @@ def rm_nodes(cls, ignore_kinds: Optional[Type[Any]] = None) -> None:  # type: ig
 
         def remove_usage_zero_value() -> None:
             for node in self.graph.nodes:
-                if not isinstance(node, (AzureNetworkUsage, AzureStorageUsage)):
+                if not isinstance(node, (AzureNetworkUsage, AzureStorageAccountUsage)):
                     continue
                 # Azure Usage just keep info about how many kind of resources on account exists
                 # Check if the current usage value of the Azure Usage node is 0

plugins/azure/fix_plugin_azure/resource/compute.py

@@ -2113,8 +2113,8 @@ class AzureCopyCompletionError:
 
 
 @define(eq=False, slots=False)
-class AzureSnapshot(AzureResource, BaseSnapshot):
-    kind: ClassVar[str] = "azure_snapshot"
+class AzureVirtualMachineSnapshot(AzureResource, BaseSnapshot):
+    kind: ClassVar[str] = "azure_virtual_machine_snapshot"
     api_spec: ClassVar[AzureApiSpec] = AzureApiSpec(
         service="compute",
         version="2023-01-02",
@@ -3741,7 +3741,7 @@ class AzureVirtualMachineScaleSetInstance(AzureVirtualMachineBase):
     AzureImage,
     AzureProximityPlacementGroup,
     AzureRestorePointCollection,
-    AzureSnapshot,
+    AzureVirtualMachineSnapshot,
     AzureSshPublicKeyResource,
     AzureVirtualMachine,
     AzureVirtualMachineScaleSet,

plugins/azure/fix_plugin_azure/resource/containerservice.py

@@ -994,8 +994,8 @@ class AzureOSOptionProperty:
 
 
 @define(eq=False, slots=False)
-class AzureKubernetesSnapshot(AzureResource):
-    kind: ClassVar[str] = "azure_kubernetes_snapshot"
+class AzureManagedClusterSnapshot(AzureResource):
+    kind: ClassVar[str] = "azure_managed_cluster_snapshot"
     api_spec: ClassVar[AzureApiSpec] = AzureApiSpec(
         service="containerservice",
         version="2023-08-01",
@@ -1037,4 +1037,4 @@ def connect_in_graph(self, builder: GraphBuilder, source: Json) -> None:
             builder.add_edge(self, edge_type=EdgeType.default, reverse=True, clazz=AzureManagedCluster, id=cluster_id)
 
 
-resources: List[Type[AzureResource]] = [AzureManagedCluster, AzureFleet, AzureKubernetesSnapshot]
+resources: List[Type[AzureResource]] = [AzureManagedCluster, AzureFleet, AzureManagedClusterSnapshot]

plugins/azure/fix_plugin_azure/resource/storage.py

@@ -174,8 +174,8 @@ class AzureBlobContainer(AzureResource, BaseBucket):
 
 
 @define(eq=False, slots=False)
-class AzureDeletedAccount(AzureResource):
-    kind: ClassVar[str] = "azure_deleted_account"
+class AzureStorageAccountDeleted(AzureResource):
+    kind: ClassVar[str] = "azure_storage_account_deleted"
     api_spec: ClassVar[AzureApiSpec] = AzureApiSpec(
         service="storage",
         version="2023-01-01",
@@ -1150,8 +1150,8 @@ def collect_usage_metrics(
 
 
 @define(eq=False, slots=False)
-class AzureStorageUsage(AzureResource, AzureBaseUsage):
-    kind: ClassVar[str] = "azure_storage_usage"
+class AzureStorageAccountUsage(AzureResource, AzureBaseUsage):
+    kind: ClassVar[str] = "azure_storage_account_usage"
     api_spec: ClassVar[AzureApiSpec] = AzureApiSpec(
         service="storage",
         version="2023-01-01",
@@ -1208,12 +1208,12 @@ class AzureTable(AzureResource):
 
 
 resources: List[Type[AzureResource]] = [
-    AzureDeletedAccount,
+    AzureStorageAccountDeleted,
     AzureStorageSku,
     AzureFileShare,
     AzureQueue,
     AzureBlobContainer,
     AzureTable,
     AzureStorageAccount,
-    AzureStorageUsage,
+    AzureStorageAccountUsage,
 ]

plugins/azure/test/compute_test.py

@@ -180,17 +180,17 @@ def test_virtual_machine_size_resources(builder: GraphBuilder) -> None:
 
 
 def test_snapshot(builder: GraphBuilder) -> None:
-    collected = roundtrip_check(AzureSnapshot, builder)
+    collected = roundtrip_check(AzureVirtualMachineSnapshot, builder)
     assert len(collected) == 2
 
     resource_type: List[Type[AzureResource]] = [AzureDisk]
     connect_resources(builder, resource_type)
 
-    assert len(builder.edges_of(AzureDisk, AzureSnapshot)) == 1
+    assert len(builder.edges_of(AzureDisk, AzureVirtualMachineSnapshot)) == 1
 
 
 def test_snapshot_resources(builder: GraphBuilder) -> None:
-    collected = roundtrip_check(AzureSnapshot, builder)[1]
+    collected = roundtrip_check(AzureVirtualMachineSnapshot, builder)[1]
     assert collected.snapshot_status == "None"
     assert (
         collected.volume_id

plugins/azure/test/containerservice_test.py

@@ -1,6 +1,6 @@
 from conftest import roundtrip_check, connect_resources
 from fix_plugin_azure.resource.base import GraphBuilder, AzureResource
-from fix_plugin_azure.resource.containerservice import AzureFleet, AzureManagedCluster, AzureKubernetesSnapshot
+from fix_plugin_azure.resource.containerservice import AzureFleet, AzureManagedCluster, AzureManagedClusterSnapshot
 from fix_plugin_azure.resource.compute import AzureDiskEncryptionSet, AzureVirtualMachineScaleSet
 from typing import List, Type
 
@@ -10,8 +10,9 @@ def test_fleet(builder: GraphBuilder) -> None:
     assert len(collected) == 1
 
     resource_types: List[Type[AzureResource]] = [AzureManagedCluster]
-    connect_resources(builder, resource_types)
+    roundtrip_check(AzureManagedCluster, builder)
 
+    connect_resources(builder, resource_types)
     assert len(builder.edges_of(AzureFleet, AzureManagedCluster)) == 1
 
 
@@ -27,10 +28,10 @@ def test_managed_cluster(builder: GraphBuilder) -> None:
 
 
 def test_kub_snapshot(builder: GraphBuilder) -> None:
-    collected = roundtrip_check(AzureKubernetesSnapshot, builder)
+    collected = roundtrip_check(AzureManagedClusterSnapshot, builder)
     assert len(collected) == 1
 
     resource_types: List[Type[AzureResource]] = [AzureManagedCluster]
     connect_resources(builder, resource_types)
 
-    assert len(builder.edges_of(AzureManagedCluster, AzureKubernetesSnapshot)) == 1
+    assert len(builder.edges_of(AzureManagedCluster, AzureManagedClusterSnapshot)) == 1

plugins/azure/test/storage_test.py

@@ -4,7 +4,7 @@
 
 
 def test_deleted_account(builder: GraphBuilder) -> None:
-    collected = roundtrip_check(AzureDeletedAccount, builder)
+    collected = roundtrip_check(AzureStorageAccountDeleted, builder)
     assert len(collected) == 2