[azure][fix] SubResources are also Resources (#1830)

someengineering · Nov 20, 2023 · fe2e4a6 · fe2e4a6
1 parent 1d842a4
commit fe2e4a6
Show file tree

Hide file tree

Showing 8 changed files with 118 additions and 65 deletions.
diff --git a/plugins/azure/resoto_plugin_azure/resource/network.py b/plugins/azure/resoto_plugin_azure/resource/network.py
diff --git a/plugins/azure/test/files/network/natGateways.json b/plugins/azure/test/files/network/natGateways.json
@@ -0,0 +1 @@
+{ "value": []}
diff --git a/plugins/azure/test/files/network/networkInterfaces.json b/plugins/azure/test/files/network/networkInterfaces.json
@@ -0,0 +1 @@
+{ "value": []}
diff --git a/plugins/azure/test/files/network/networkSecurityGroups.json b/plugins/azure/test/files/network/networkSecurityGroups.json
@@ -0,0 +1 @@
+{ "value": []}
diff --git a/plugins/azure/test/files/network/privateLinkServices.json b/plugins/azure/test/files/network/privateLinkServices.json
@@ -0,0 +1 @@
+{ "value": []}
diff --git a/plugins/azure/test/files/network/publicIPAddresses.json b/plugins/azure/test/files/network/publicIPAddresses.json
@@ -0,0 +1 @@
+{ "value": []}
diff --git a/plugins/azure/test/files/network/virtualNetworkTaps.json b/plugins/azure/test/files/network/virtualNetworkTaps.json
@@ -0,0 +1 @@
+{ "value": []}
diff --git a/plugins/azure/tools/azure_model_gen.py b/plugins/azure/tools/azure_model_gen.py
@@ -243,12 +243,14 @@ def class_method(
     unfold_props = (unfold_properties or set()) | {"properties"}  # always unfold properties
 
     def add_types(acs: Dict[str, AzureClassModel]) -> None:
-        result.update(acs)
+        for k, v in acs.items():
+            if k not in result:
+                result[k] = v
 
     if "properties" in shape or "allOf" in shape:
         name = type_name(shape)
-        if name in result:
-            return {}
+        # if name in result:
+        #     return {}
         props: Dict[str, AzureProperty] = {}
         bases: List[str] = []
         existing_ignored: Dict[str, AzureProperty] = {}