From a7ec11505c0724dbf0df3f077dc737d45e061a3f Mon Sep 17 00:00:00 2001
From: anjafr <66877958+anjafr@users.noreply.github.com>
Date: Wed, 15 Feb 2023 16:06:28 +0100
Subject: [PATCH] [gcp][chore] Housekeeping (#1447)

* billing info

* housekeeping
---
 .../gcp/resoto_plugin_gcp/resources/billing.py  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/plugins/gcp/resoto_plugin_gcp/resources/billing.py b/plugins/gcp/resoto_plugin_gcp/resources/billing.py
index 8ee1b44c0..2fe57999b 100644
--- a/plugins/gcp/resoto_plugin_gcp/resources/billing.py
+++ b/plugins/gcp/resoto_plugin_gcp/resources/billing.py
@@ -12,6 +12,9 @@
 @define(eq=False, slots=False)
 class GcpBillingAccount(GcpResource):
     kind: ClassVar[str] = "gcp_billing_account"
+    reference_kinds: ClassVar[ModelReference] = {
+        "successors": {"default": ["gcp_project_billing_info"]},
+    }
     api_spec: ClassVar[GcpApiSpec] = GcpApiSpec(
         service="cloudbilling",
         version="v1",
@@ -35,9 +38,6 @@ class GcpBillingAccount(GcpResource):
         "account_master_billing_account": S("masterBillingAccount"),
         "account_open": S("open"),
     }
-    reference_kinds: ClassVar[ModelReference] = {
-        "successors": {"default": ["gcp_project_billing_info"]},
-    }
 
     account_display_name: Optional[str] = field(default=None)
     account_master_billing_account: Optional[str] = field(default=None)
@@ -82,6 +82,9 @@ class GcpProjectBillingInfo(GcpResource):
 @define(eq=False, slots=False)
 class GcpService(GcpResource):
     kind: ClassVar[str] = "gcp_service"
+    reference_kinds: ClassVar[ModelReference] = {
+        "successors": {"default": ["gcp_sku"]},
+    }
     api_spec: ClassVar[GcpApiSpec] = GcpApiSpec(
         service="cloudbilling",
         version="v1",
@@ -103,14 +106,12 @@ class GcpService(GcpResource):
         "deprecation_status": S("deprecated", default={}) >> Bend(GcpDeprecationStatus.mapping),
         "service_business_entity_name": S("businessEntityName"),
         "service_display_name": S("displayName"),
-        "service_service_id": S("serviceId"),
-    }
-    reference_kinds: ClassVar[ModelReference] = {
-        "successors": {"default": ["gcp_sku"]},
+        "service_id": S("serviceId"),
     }
+
     service_business_entity_name: Optional[str] = field(default=None)
     service_display_name: Optional[str] = field(default=None)
-    service_service_id: Optional[str] = field(default=None)
+    service_id: Optional[str] = field(default=None)
 
     def post_process(self, graph_builder: GraphBuilder, source: Json) -> None:
         for sku in GcpSku.collect_resources(graph_builder, parent=self.id):