[COST-5133] Switch to contains logic for Azure & GCP managed (#5301)

Author: myersCody

koku/masu/database/trino_sql/azure/openshift/managed_azure_openshift_daily.sql

@@ -88,7 +88,7 @@ INSERT INTO hive.{{schema | sqlsafe}}.managed_azure_openshift_daily (
     day
 )
 WITH cte_azure_resource_names AS (
-    SELECT DISTINCT resourceid, servicefamily
+    SELECT DISTINCT resourceid
     FROM hive.{{schema | sqlsafe}}.azure_line_items
     WHERE source = {{azure_source_uuid}}
         AND year = {{year}}
@@ -115,14 +115,14 @@ cte_array_agg_volumes AS (
         AND interval_start < date_add('day', 1, {{end_date}})
 ),
 cte_matchable_resource_names AS (
-    SELECT resource_names.resourceid, resource_names.servicefamily
+    SELECT resource_names.resourceid
     FROM cte_azure_resource_names AS resource_names
     JOIN cte_array_agg_nodes AS nodes
         ON strpos(resource_names.resourceid, nodes.node) != 0
 
     UNION
 
-    SELECT resource_names.resourceid, resource_names.servicefamily
+    SELECT resource_names.resourceid
     FROM cte_azure_resource_names AS resource_names
     JOIN cte_array_agg_volumes AS volumes
         ON (
@@ -186,8 +186,7 @@ SELECT azure.accountname,
     cast(day(azure.date) as varchar) as day
 FROM hive.{{schema | sqlsafe}}.azure_line_items AS azure
 LEFT JOIN cte_matchable_resource_names AS resource_names
-    ON substr(azure.resourceid, -length(resource_names.resourceid)) = resource_names.resourceid
-    AND azure.servicefamily = resource_names.servicefamily
+    ON azure.resource_id = resource_names.resourceid
 LEFT JOIN cte_agg_tags AS tag_matches
     ON any_match(tag_matches.matched_tags, x->strpos(tags, x) != 0)
     AND resource_names.resourceid IS NULL

koku/masu/database/trino_sql/gcp/openshift/managed_gcp_openshift_daily.sql

@@ -62,7 +62,7 @@ INSERT INTO hive.{{schema | sqlsafe}}.managed_gcp_openshift_daily (
     day
 )
 WITH cte_gcp_resource_names AS (
-    SELECT DISTINCT resource_name, service_description
+    SELECT DISTINCT resource_name
     FROM hive.{{schema | sqlsafe}}.gcp_line_items_daily
     WHERE source = {{gcp_source_uuid}}
         AND year = {{year}}
@@ -89,14 +89,14 @@ cte_array_agg_volumes AS (
         AND interval_start < date_add('day', 1, {{end_date}})
 ),
 cte_matchable_resource_names AS (
-    SELECT resource_names.resource_name, resource_names.service_description
+    SELECT resource_names.resource_name
     FROM cte_gcp_resource_names AS resource_names
     JOIN cte_array_agg_nodes AS nodes
         ON strpos(resource_names.resource_name, nodes.node) != 0
 
     UNION
 
-    SELECT resource_names.resource_name, resource_names.service_description
+    SELECT resource_names.resource_name
     FROM cte_gcp_resource_names AS resource_names
     JOIN cte_array_agg_volumes AS volumes
         ON (
@@ -147,8 +147,7 @@ SELECT gcp.invoice_month,
     cast(day(gcp.usage_start_time) as varchar) as day
 FROM hive.{{schema | sqlsafe}}.gcp_line_items_daily AS gcp
 LEFT JOIN cte_matchable_resource_names AS resource_names
-    ON substr(gcp.resource_name, -length(resource_names.resource_name)) = resource_names.resource_name
-    AND gcp.service_description = resource_names.service_description
+    ON gcp.resource_name = resource_names.resource_name
 LEFT JOIN cte_agg_tags AS tag_matches
     ON any_match(tag_matches.matched_tags, x->strpos(labels, x) != 0)
     AND resource_names.resource_name IS NULL