fix(fxci): Normalize 'resource.name' in fxci_derived.worker_costs_v1 (#…

…5809) It seems that the `resource.name` field from the billing export can sometimes take the form: projects/<id>/instances/<name> And other times it's simply: <name> Update the worker costs query to account for this. Issue: #5759 Co-authored-by: akkomar <[email protected]>
mozilla · Jun 21, 2024 · 624d8b4 · 624d8b4
1 parent 72557a9
commit 624d8b4
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/sql/moz-fx-data-shared-prod/fxci_derived/worker_costs_v1/query.sql b/sql/moz-fx-data-shared-prod/fxci_derived/worker_costs_v1/query.sql
@@ -1,6 +1,10 @@
 SELECT
   project.id AS project,
-  REGEXP_EXTRACT(resource.name, "/instances/(.+)$") AS name,
+  IF(
+    resource.name LIKE "%/instances/%",
+    REGEXP_EXTRACT(resource.name, "/instances/(.+)$"),
+    resource.name
+  ) AS name,
   REGEXP_EXTRACT(resource.global_name, "/zones/([^/]+)") AS zone,
   REGEXP_EXTRACT(resource.global_name, "/instances/([^/]+)") AS instance_id,
   DATE(usage_start_time) AS usage_start_date,