Merge pull request #110 from ImMin5/master

Add total count logging and improve secret data handling in cost manager

Author: ImMin5

src/cloudforet/cost_analysis/main.py

@@ -161,6 +161,7 @@ def cost_get_data(params: dict) -> Generator[dict, None, None]:
 
     params["schema"] = params.pop("schema_name", None)
     params["secret_data"] = __get_secret_data(secret_data, task_options)
+
     is_benefit_job = task_options.get("is_benefit_job", False)
     cost_metric = options.get("cost_metric", "ActualCost")
 
@@ -201,13 +202,15 @@ def __get_secret_data(secret_data: dict, task_options: dict) -> dict:
     if len(secrets) == 1:
         return secrets[0]
 
-    tenant_id = task_options["billing_tenant_id"]
+    billing_tenant_id = task_options["billing_tenant_id"]
 
     for _secret_data in secrets:
-        if _secret_data["tenant_id"] == tenant_id:
+        if _secret_data["tenant_id"] == billing_tenant_id:
             return _secret_data
 
-        elif _secret_data.get("subscription_id") == task_options.get("subscription_id"):
+        elif _secret_data.get("subscription_id") and _secret_data.get(
+            "subscription_id"
+        ) == task_options.get("subscription_id"):
             return _secret_data
 
-    return secret_data
+    return secrets[0]

src/cloudforet/cost_analysis/manager/cost_manager.py

@@ -403,11 +403,14 @@ def _make_benefit_cost_data(
         account_agreement_type: str = None,
     ) -> list:
         benefit_costs_data = []
+        total_count = 0
+
         try:
             combined_results = self._combine_rows_and_columns_from_results(
                 results.get("properties").get("rows"),
                 results.get("properties").get("columns"),
             )
+            total_count += len(combined_results)
             for cb_result in combined_results:
                 billed_at = self._set_billed_date(cb_result.get("UsageDate", end))
                 if not billed_at:
@@ -419,13 +422,13 @@ def _make_benefit_cost_data(
         except Exception as e:
             _LOGGER.error(f"[_make_cost_data] make data error: {e}", exc_info=True)
             raise e
-
+        _LOGGER.info(f"[get_benefit_data] total count: {total_count}")
         return benefit_costs_data
 
     def _make_benefit_cost_info(self, result: dict, billed_at: str) -> dict:
+        print(result)
         additional_info = {
             "Pricing Model": result.get("PricingModel"),
-            "Frequency": result.get("BillingFrequency"),
             "Benefit Id": result.get("BenefitId"),
             "Benefit Name": result.get("BenefitName"),
             "Reservation Id": result.get("ReservationId"),