Fix smoke tests

project-koku · Jan 14, 2025 · 055f1d4 · 055f1d4
1 parent 16e3ed0
commit 055f1d4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/koku/masu/database/trino_sql/reporting_ocpawscostlineitem_daily_summary.sql b/koku/masu/database/trino_sql/reporting_ocpawscostlineitem_daily_summary.sql
@@ -939,6 +939,9 @@ SELECT aws.uuid as aws_uuid,
     LEFT JOIN hive.{{schema | sqlsafe}}.aws_openshift_disk_capacities_temp AS aws_disk
         ON aws_disk.usage_start = aws.usage_start
         AND aws_disk.resource_id = aws.resource_id
+        AND aws_disk.year = aws.year
+        AND aws_disk.month = aws.month
+        AND aws_disk.ocp_source = aws.ocp_source
     WHERE ocp.source = {{ocp_source_uuid}}
         AND ocp.year = {{year}}
         AND lpad(ocp.month, 2, '0') = {{month}} -- Zero pad the month when fewer than 2 characters
@@ -950,9 +953,6 @@ SELECT aws.uuid as aws_uuid,
         -- Filter out Node Network Costs since they cannot be attributed to a namespace and are accounted for later
         AND aws.data_transfer_direction IS NULL
         AND aws_disk.resource_id is NULL -- exclude any resource used in disk capacity calculations
-        AND aws_disk.year = {{year}}
-        AND aws_disk.month = {{month}}
-        AND aws_disk.ocp_source = {{ocp_source_uuid}}
     GROUP BY aws.uuid, ocp.namespace, ocp.pod_labels
 ;
 

diff --git a/koku/masu/database/trino_sql/reporting_ocpazurecostlineitem_daily_summary.sql b/koku/masu/database/trino_sql/reporting_ocpazurecostlineitem_daily_summary.sql
@@ -671,6 +671,9 @@ SELECT azure.uuid as azure_uuid,
             )
     LEFT JOIN hive.{{schema | sqlsafe}}.azure_openshift_disk_capacities_temp as disk_cap
         ON azure.resource_id = disk_cap.resource_id
+        AND disk_cap.year = azure.year
+        AND disk_cap.month = azure.month
+        AND disk_cap.ocp_source = azure.ocp_source
     WHERE ocp.source = {{ocp_source_uuid}}
         AND ocp.year = {{year}}
         AND lpad(ocp.month, 2, '0') = {{month}} -- Zero pad the month when fewer than 2 characters
@@ -683,9 +686,6 @@ SELECT azure.uuid as azure_uuid,
         AND azure.year = {{year}}
         AND azure.month = {{month}}
         AND disk_cap.resource_id is NULL -- exclude any resource used in disk capacity calculations
-        AND disk_cap.year = {{year}}
-        AND disk_cap.month = {{month}}
-        AND disk_cap.ocp_source = {{ocp_source_uuid}}
     GROUP BY azure.uuid, ocp.namespace, ocp.data_source, ocp.pod_labels, ocp.volume_labels
 ;