[COST-4367] Add product_vcpu to aws_line_items_daily (#4774)

* drop aws_line_items_daily and add product_vcpu to the columns carried through * update unit test --------- Co-authored-by: Luke Couzens <[email protected]>
project-koku · Dec 3, 2023 · ac0d1c0 · ac0d1c0
1 parent f02f4c4
commit ac0d1c0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/koku/masu/test/util/aws/test_aws_post_processor.py b/koku/masu/test/util/aws/test_aws_post_processor.py
@@ -48,6 +48,7 @@ def test_aws_generate_daily_data(self):
                 "product_productname": "AmazonEC2",
                 "product_instancetype": "t2.micro",
                 "product_region": "us-east-1",
+                "product_vcpu": "8",
                 "pricing_unit": "hours",
                 "resourcetags": '{"key": "value"}',
                 "costcategory": '{"cat": "egory"}',
@@ -79,6 +80,7 @@ def test_aws_generate_daily_data(self):
                 "product_productname": "AmazonEC2",
                 "product_instancetype": "t2.micro",
                 "product_region": "us-east-1",
+                "product_vcpu": "4",
                 "pricing_unit": "hours",
                 "resourcetags": '{"key": "value"}',
                 "costcategory": '{"cat": "egory"}',
@@ -111,6 +113,7 @@ def test_aws_generate_daily_data(self):
                 "product_instancetype": "t2.micro",
                 "product_region": "us-east-1",
                 "pricing_unit": "hours",
+                "product_vcpu": "8",
                 "resourcetags": '{"key": "value"}',
                 "costcategory": '{"cat": "egory"}',
                 "lineitem_usageamount": lineitem_usageamount,

diff --git a/koku/masu/util/aws/aws_post_processor.py b/koku/masu/util/aws/aws_post_processor.py
@@ -228,6 +228,7 @@ def _generate_daily_data(self, data_frame):
                 "savingsplan_savingsplaneffectivecost": ["sum"],
                 "product_productname": ["max"],
                 "bill_invoiceid": ["max"],
+                "product_vcpu": ["max"],
             }
         )
         columns = daily_data_frame.columns.droplevel(1)

diff --git a/scripts/cji_scripts/migrate_trino.py b/scripts/cji_scripts/migrate_trino.py
@@ -164,9 +164,7 @@ def main():
 
     tables_to_drop = [
         "aws_line_items",
-        # "aws_openshift_daily_resource_matched_temp",
-        # "aws_openshift_daily_tag_matched_temp",
-        # "reporting_ocpawscostlineitem_project_daily_summary_temp",
+        "aws_line_items_daily",
     ]
     # columns_to_drop = ["ocp_matched"]
     # columns_to_add = {