feat: Updated sqladmin implementation

someengineering · Jun 4, 2024 · fecb237 · fecb237
1 parent 681998d
commit fecb237
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/plugins/gcp/fix_plugin_gcp/collector.py b/plugins/gcp/fix_plugin_gcp/collector.py
@@ -95,6 +95,7 @@ def collect(self) -> None:
             for node, data in list(self.graph.nodes(data=True)):
                 if isinstance(node, GcpResource):
                     node.connect_in_graph(global_builder, data.get("source", {}))
+            global_builder.executor.wait_for_submitted_work()
 
             # remove unconnected nodes
             self.remove_unconnected_nodes()

diff --git a/plugins/gcp/fix_plugin_gcp/resources/sqladmin.py b/plugins/gcp/fix_plugin_gcp/resources/sqladmin.py
@@ -8,7 +8,7 @@
 from fix_plugin_gcp.resources.base import GcpResource, GcpDeprecationStatus, GraphBuilder
 from fix_plugin_gcp.resources.compute import GcpSslCertificate
 from fixlib.baseresources import BaseDatabase, ModelReference
-from fixlib.json_bender import Bender, S, Bend, ForallBend, K
+from fixlib.json_bender import F, Bender, S, Bend, ForallBend, K
 from fixlib.types import Json
 
 log = logging.getLogger("fix.plugins.gcp")
@@ -700,10 +700,10 @@ class GcpSqlDatabaseInstance(GcpResource, BaseDatabase):
         "settings": S("settings", default={}) >> Bend(GcpSqlSettings.mapping),
         "sql_database_instance_state": S("state"),
         "suspension_reason": S("suspensionReason", default=[]),
-        "db_type": S("backendType"),
+        "db_type": S("databaseVersion") >> F(lambda db_version: db_version.split("_")[0].lower()),
         "db_status": S("state"),
         "db_version": S("databaseVersion"),
-        "volume_size": S("currentDiskSize"),
+        "volume_size": S("settings", "dataDiskSizeGb") >> F(int),
     }
     available_maintenance_versions: Optional[List[str]] = field(default=None)
     backend_type: Optional[str] = field(default=None)