AWS Tags: Remove unutilized pathway. (#4903)

Author: myersCody

koku/masu/database/aws_report_db_accessor.py

@@ -339,52 +339,6 @@ def populate_markup_cost(self, provider_uuid, markup, start_date, end_date, bill
                         source_uuid=provider_uuid, source_type=Provider.PROVIDER_AWS, **date_filters
                     ).update(markup_cost=(F("unblended_cost") * markup))
 
-    def populate_enabled_tag_keys(self, start_date, end_date, bill_ids):
-        """Populate the enabled tag key table.
-
-        Args:
-            start_date (datetime.date) The date to start populating the table.
-            end_date (datetime.date) The date to end on.
-            bill_ids (list) A list of bill IDs.
-
-        Returns
-            (None)
-        """
-        table_name = "reporting_enabledtagkeys"
-        sql = pkgutil.get_data("masu.database", "sql/reporting_awsenabledtagkeys.sql")
-        sql = sql.decode("utf-8")
-        sql_params = {
-            "start_date": start_date,
-            "end_date": end_date,
-            "bill_ids": bill_ids,
-            "schema": self.schema,
-        }
-        self._prepare_and_execute_raw_sql_query(table_name, sql, sql_params)
-
-    def update_line_item_daily_summary_with_enabled_tags(self, start_date, end_date, bill_ids):
-        """Populate the enabled tag key table.
-
-        Args:
-            start_date (datetime.date) The date to start populating the table.
-            end_date (datetime.date) The date to end on.
-            bill_ids (list) A list of bill IDs.
-
-        Returns
-            (None)
-        """
-        table_name = self._table_map["line_item_daily_summary"]
-        sql = pkgutil.get_data(
-            "masu.database", "sql/reporting_awscostentryline_item_daily_summary_update_enabled_tags.sql"
-        )
-        sql = sql.decode("utf-8")
-        sql_params = {
-            "start_date": start_date,
-            "end_date": end_date,
-            "bill_ids": bill_ids,
-            "schema": self.schema,
-        }
-        self._prepare_and_execute_raw_sql_query(table_name, sql, sql_params)
-
     def get_openshift_on_cloud_matched_tags(self, aws_bill_id):
         """Return a list of matched tags."""
         sql = pkgutil.get_data("masu.database", "sql/reporting_ocpaws_matched_tags.sql")

koku/masu/database/sql/reporting_awscostentryline_item_daily_summary_update_enabled_tags.sql

@@ -99,11 +99,9 @@ def update_summary_tables(self, start_date, end_date, **kwargs):
                     start, end, self._provider.uuid, current_bill_id, markup_value
                 )
                 accessor.populate_ui_summary_tables(start, end, self._provider.uuid)
-                # accessor.populate_enabled_tag_keys(start, end, bill_ids)
             accessor.populate_tags_summary_table(bill_ids, start_date, end_date)
             accessor.populate_category_summary_table(bill_ids, start_date, end_date)
 
-            # accessor.update_line_item_daily_summary_with_enabled_tags(start_date, end_date, bill_ids)
             for bill in bills:
                 if bill.summary_data_creation_datetime is None:
                     bill.summary_data_creation_datetime = timezone.now()

koku/masu/database/sql/reporting_awsenabledtagkeys.sql

@@ -32,7 +32,6 @@
 from reporting.provider.all.models import EnabledTagKeys
 from reporting.provider.aws.models import AWSCostEntryBill
 from reporting.provider.aws.models import AWSCostEntryLineItemDailySummary
-from reporting.provider.aws.models import AWSTagsSummary
 
 
 class AWSReportDBAccessorTest(MasuTestCase):
@@ -229,50 +228,6 @@ def test_populate_ocp_on_aws_cost_daily_summary_trino_memory_distribution(
         )
         mock_trino.assert_called()
 
-    def test_populate_enabled_tag_keys(self):
-        """Test that enabled tag keys are populated."""
-        start_date = self.dh.this_month_start.date()
-        end_date = self.dh.this_month_end.date()
-
-        bills = self.accessor.bills_for_provider_uuid(self.aws_provider_uuid, start_date)
-        with schema_context(self.schema):
-            AWSTagsSummary.objects.all().delete()
-            EnabledTagKeys.objects.filter(provider_type=Provider.PROVIDER_AWS).delete()
-
-            bill_ids = [bill.id for bill in bills]
-            self.assertEqual(EnabledTagKeys.objects.filter(provider_type=Provider.PROVIDER_AWS).count(), 0)
-            self.accessor.populate_enabled_tag_keys(start_date, end_date, bill_ids)
-            self.assertNotEqual(EnabledTagKeys.objects.filter(provider_type=Provider.PROVIDER_AWS).count(), 0)
-
-    def test_update_line_item_daily_summary_with_enabled_tags(self):
-        """Test that we filter the daily summary table's tags with only enabled tags."""
-        start_date = self.dh.this_month_start.date()
-        end_date = self.dh.this_month_end.date()
-
-        bills = self.accessor.bills_for_provider_uuid(self.aws_provider_uuid, start_date)
-        with schema_context(self.schema):
-            AWSTagsSummary.objects.all().delete()
-            key_to_keep = EnabledTagKeys.objects.filter(provider_type=Provider.PROVIDER_AWS).filter(key="app").first()
-            EnabledTagKeys.objects.filter(provider_type=Provider.PROVIDER_AWS).update(enabled=False)
-            EnabledTagKeys.objects.filter(provider_type=Provider.PROVIDER_AWS).filter(key="app").update(enabled=True)
-            bill_ids = [bill.id for bill in bills]
-            self.accessor.update_line_item_daily_summary_with_enabled_tags(start_date, end_date, bill_ids)
-            tags = (
-                AWSCostEntryLineItemDailySummary.objects.filter(
-                    usage_start__gte=start_date, cost_entry_bill_id__in=bill_ids
-                )
-                .values_list("tags")
-                .distinct()
-            )
-
-            for tag in tags:
-                tag_dict = tag[0]
-                tag_keys = list(tag_dict.keys())
-                if tag_keys:
-                    self.assertEqual([key_to_keep.key], tag_keys)
-                else:
-                    self.assertEqual([], tag_keys)
-
     def test_table_properties(self):
         self.assertEqual(self.accessor.line_item_daily_summary_table, get_model("AWSCostEntryLineItemDailySummary"))