Merge pull request #80 from ImMin5/feature-modify-cost-option

Modify result of get_tasks api job_task options

Author: ImMin5

src/cloudforet/cost_analysis/main.py

@@ -187,7 +187,7 @@ def __get_secret_data_with_tenant_id(secret_data: dict, tenant_id: str = None) -
         return secrets[0]
 
     for _secret_data in secrets:
-        if _secret_data["tenant_id"] == tenant_id:
+        if _secret_data["billing_tenant_id"] == tenant_id:
             secret_data = _secret_data
 
     return secret_data

src/cloudforet/cost_analysis/manager/job_manager.py

@@ -64,7 +64,7 @@ def get_tasks(
                                 "account_agreement_type": billing_account_agreement_type,
                                 "collect_scope": "customer_tenant_id",
                                 "customer_tenants": divided_customer_tenant_info,
-                                "tenant_id": secret_data["tenant_id"],
+                                "billing_tenant_id": secret_data["tenant_id"],
                             }
                         }
                     )
@@ -82,7 +82,7 @@ def get_tasks(
                                 "account_agreement_type": billing_account_agreement_type,
                                 "collect_scope": "customer_tenant_id",
                                 "customer_tenants": first_sync_tenants,
-                                "tenant_id": secret_data["tenant_id"],
+                                "billing_tenant_id": secret_data["tenant_id"],
                                 "is_sync": False,
                             }
                         }
@@ -98,20 +98,6 @@ def get_tasks(
                         synced_accounts = self._extend_synced_accounts(
                             synced_accounts, first_sync_tenants
                         )
-                # Benefit Job Task
-                if options.get("cost_metric") == "AmortizedCost":
-                    tasks.append(
-                        {
-                            "task_options": {
-                                "start": start_month,
-                                "account_agreement_type": billing_account_agreement_type,
-                                "collect_scope": "billing_account_id",
-                                "tenant_id": secret_data["tenant_id"],
-                                "is_benefit_job": True,
-                            }
-                        }
-                    )
-
             else:
                 tasks = [
                     {
@@ -125,6 +111,20 @@ def get_tasks(
                 changed = [{"start": start_month}]
                 synced_accounts = []
 
+            # Benefit Job Task
+            if options.get("cost_metric") == "AmortizedCost":
+                tasks.append(
+                    {
+                        "task_options": {
+                            "start": start_month,
+                            "account_agreement_type": billing_account_agreement_type,
+                            "collect_scope": "billing_account_id",
+                            "billing_tenant_id": secret_data["tenant_id"],
+                            "is_benefit_job": True,
+                        }
+                    }
+                )
+
         elif secret_type == "USE_SERVICE_ACCOUNT_SECRET":
             subscription_id = secret_data.get("subscription_id", "")
             tenant_id = secret_data.get("tenant_id")
@@ -134,7 +134,7 @@ def get_tasks(
                         "collect_scope": "subscription_id",
                         "start": start_month,
                         "subscription_id": subscription_id,
-                        "tenant_id": tenant_id,
+                        "billing_tenant_id": tenant_id,
                     }
                 }
             ]