Fix usage query error for ea agreement

Dockerfile

@@ -15,7 +15,7 @@ RUN pip install --upgrade pip && \
 
 ARG CACHEBUST=1
 RUN pip install --upgrade spaceone-api && \
-    pip install --upgrade --pre spaceone-cost-analysis==2.0.dev147
+    pip install --upgrade --pre spaceone-cost-analysis==2.0.dev150
 
 
 

src/cloudforet/cost_analysis/connector/azure_cost_mgmt_connector.py

@@ -195,6 +195,8 @@ def query_usage_http(
             else:
                 parameters["dataset"]["grouping"].extend(BENEFIT_GROUPING_MCA)
 
+            _LOGGER.debug(f"[query_usage] parameters: {parameters}")
+
             while self.next_link:
                 url = self.next_link
                 headers = self._make_request_headers()

src/cloudforet/cost_analysis/main.py

@@ -1,10 +1,13 @@
+import logging
 from typing import Generator
 from spaceone.cost_analysis.plugin.data_source.lib.server import DataSourcePluginServer
 
 from .manager import CostManager, DataSourceManager, JobManager
 
 app = DataSourcePluginServer()
 
+_LOGGER = logging.getLogger("spaceone")
+
 
 @app.route("DataSource.init")
 def data_source_init(params: dict) -> dict:
@@ -159,14 +162,20 @@ def cost_get_data(params: dict) -> Generator[dict, None, None]:
         secret_data, task_options.get("billing_tenant_id")
     )
 
-    if options.get("cost_metric") == "AmortizedCost" and task_options.get(
-        "is_benefit_job", False
-    ):
+    is_benefit_job = task_options.get("is_benefit_job", False)
+    cost_metric = options.get("cost_metric", "ActualCost")
+
+    if not is_benefit_job:
+        for cost_response in cost_mgr.get_data(**params):
+            yield {"results": cost_response}
+    elif cost_metric == "AmortizedCost" and is_benefit_job:
         for cost_response in cost_mgr.get_benefit_data(**params):
             yield {"results": cost_response}
     else:
-        for cost_response in cost_mgr.get_data(**params):
-            yield {"results": cost_response}
+        _LOGGER.error(
+            f"[get_cost_data] Check options, options: {options} , task_options: {task_options}"
+        )
+        raise Exception("Invalid cost_metric or is_benefit_job")
 
 
 def __remove_duplicate_list_of_dict(changed: list) -> list:

src/cloudforet/cost_analysis/manager/cost_manager.py

@@ -65,7 +65,7 @@ def get_benefit_data(
         domain_id: str,
     ):
         self.azure_cm_connector.create_session(options, secret_data, schema)
-        account_agreement_type = task_options.get("agreement_type")
+        account_agreement_type = task_options.get("account_agreement_type")
         start: datetime = self._get_first_date_of_month(task_options["start"])
         end: datetime = datetime.utcnow()