qontract-reconcile 0.10.1rc1150__py3-none-any.whl → 0.10.1rc1151__py3-none-any.whl

{qontract_reconcile-0.10.1rc1150.dist-info → qontract_reconcile-0.10.1rc1151.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc1150
+Version: 0.10.1rc1151
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc1150.dist-info → qontract_reconcile-0.10.1rc1151.dist-info}/RECORD

@@ -280,7 +280,7 @@ reconcile/gql_definitions/common/state_aws_account.py,sha256=LAdpCG2-ykVpWBPO0Zu
 reconcile/gql_definitions/common/users.py,sha256=ahY3d185LbTekCGYBLJwZJljn54RJI_P5CVefdqyoZA,1705
 reconcile/gql_definitions/cost_report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/cost_report/app_names.py,sha256=fzqYXyiTSll359J1F1o7qapco0MSxgs3sr_Ssb2Kbns,1786
-reconcile/gql_definitions/cost_report/cost_namespaces.py,sha256=wV76J8Ynq0ObSfjSZQRLmCPUZ96frGc82Z5HPM_e4F4,2219
+reconcile/gql_definitions/cost_report/cost_namespaces.py,sha256=URRozAgSa9OnkqOCZf3MGH21_wcnsqYl0n-olXdjQH0,2286
 reconcile/gql_definitions/cost_report/settings.py,sha256=0nhBDJ5MZ1m7XkNDGrRLmsnUbzqZ4WRh_DDEEzKhcxU,2153
 reconcile/gql_definitions/dashdotdb_slo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/dashdotdb_slo/slo_documents_query.py,sha256=MYYpVOc8Ze9w7k6-tlUkp5OaPG_5bqHPS5FhfWTw00U,4335
@@ -646,7 +646,7 @@ reconcile/typed_queries/app_interface_metrics_exporter/__init__.py,sha256=47DEQp
 reconcile/typed_queries/app_interface_metrics_exporter/onboarding_status.py,sha256=X-N1WJGOL6OR9940P0_K4-YJzkL5Vg4favhYrBxXD9A,327
 reconcile/typed_queries/cost_report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/typed_queries/cost_report/app_names.py,sha256=HMEMIqAbMyVQfoQ5YXTXE4xDt7FaXBRz0QIHnsIZC1c,478
-reconcile/typed_queries/cost_report/cost_namespaces.py,sha256=VXIqdGE5lwa5z4UTROEsuc3QdxgodRgXglei0LJI2Co,985
+reconcile/typed_queries/cost_report/cost_namespaces.py,sha256=1GUjWXQj7U2djVHBPYcd8Cy2-enKXf0-GaplLi8JZw4,1178
 reconcile/typed_queries/cost_report/settings.py,sha256=xbTMMUQnbub2pav4B-ctzzRe7ijjTv2bqfqdtb9OnO0,589
 reconcile/typed_queries/terraform_tgw_attachments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/typed_queries/terraform_tgw_attachments/aws_accounts.py,sha256=2idUmpavfwDu0RmH3xTVlvJAhj2ImhREoO8WL8EX920,378
@@ -838,7 +838,7 @@ tools/app_interface_metrics_exporter.py,sha256=zkwkxdAUAxjdc-pzx2_oJXG25fo0Fnyd5
 tools/app_interface_reporter.py,sha256=oZPib4HPq0aZ2Zui1QGJGk6qQdfpeihujGDBnSdKyGE,17627
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=dGK3kA7DS9ld63k3i4k8pY65D8MeQCjalte22TDXEwU,140204
+tools/qontract_cli.py,sha256=ndRUc8mjkubajPkZKaoE2IFVT2e4YXYRVtUaeLt3zzE,140496
 tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB6pc,5063
 tools/template_validation.py,sha256=qpKYaTgk0GOPGa2Ct5_5sKdwIHtCAKIBGzsMPuJU5fw,3371
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -846,13 +846,22 @@ tools/cli_commands/erv2.py,sha256=vHYBYkTaS3h2qEStuAE6iThCt54LD2o3-0bJLcYODKY,16
 tools/cli_commands/gpg_encrypt.py,sha256=x02JOMn834z89YSNvr5B-oJky7rR1C0begCkPh45eHk,4958
 tools/cli_commands/systems_and_tools.py,sha256=EMHOF1AtUDaoSk0bbjl6oUKYAz4rTZjIBaF-6E6GspM,16816
 tools/cli_commands/cost_report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tools/cli_commands/cost_report/aws.py,sha256=bdvbT3bDymBOMx4Ve4kt154MeGiGusTSpOpMMFrQ4SM,5191
-tools/cli_commands/cost_report/cost_management_api.py,sha256=tFzjaZ3RSVJeAUsfSWXHiQlMVbV8dFcXibK158ODQcA,2549
-tools/cli_commands/cost_report/model.py,sha256=KGkro82zoFXLmfQ4nv7dkv4QoNtOF-k6PT6VURCLZKE,548
-tools/cli_commands/cost_report/openshift.py,sha256=XNEJpgtIQAi3Eoej1Btnl74IWg3g-gLh6W36WOwQ9bk,6188
-tools/cli_commands/cost_report/response.py,sha256=_kbpBSjMjbPXGkjDgidTOLvFpVqfBo3VMkSOheUdmMA,1308
-tools/cli_commands/cost_report/util.py,sha256=r4K8nC1S0YZNSUNro141cYG1nuG8HwkkYEqWV9GCvu8,1861
-tools/cli_commands/cost_report/view.py,sha256=pKM6LDeWZJcTw2a7sWBwKSuR9p3SAk3lEb37uwMhlLw,10183
+tools/cli_commands/cost_report/aws.py,sha256=QKpzQ12Ysyo8CaKq-RNc4K434qDXqFAjzb0gXWnrT34,4521
+tools/cli_commands/cost_report/cost_management_api.py,sha256=UZVD1P755gRqKSln5gn1vBiwi9BAhpx5mQuMKEDfI3o,4671
+tools/cli_commands/cost_report/model.py,sha256=7W6mi8p_hRn8z5YyRCEoDionGHM3RXL7ItDWqQXaCMg,1082
+tools/cli_commands/cost_report/openshift.py,sha256=5qad9bG8EmNNrw5kTmFBuRk1pApn9xiYboQ6aK6LYq0,5503
+tools/cli_commands/cost_report/openshift_cost_optimization.py,sha256=lpdqnhQGXaPuL19IxchvFvM8DPz0xB6vg_fXJAopkGQ,6711
+tools/cli_commands/cost_report/response.py,sha256=l5fVNMg8zzoNWm8LquYJsWM3VqxABBG8KT_qN0L3P6c,2689
+tools/cli_commands/cost_report/util.py,sha256=lKSWjjUfDzMfSSTbFqc4Ln8JfzlWiW8kR2i51VJbEnc,2497
+tools/cli_commands/cost_report/view.py,sha256=2uNO_fWIUydEL2kQXV959crRkHqzjp9c1OrefXNiJ5s,14033
+tools/cli_commands/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tools/cli_commands/test/conftest.py,sha256=ta2eRWhajOdMFMt3AMmh6fvLuM3lBwU9kmkXAaD2_vs,17011
+tools/cli_commands/test/test_aws_cost_report.py,sha256=YNH_6NXLkWMkrgti4v8HDT2uwveh_ss3GdppjBOXq6I,6993
+tools/cli_commands/test/test_cost_management_api.py,sha256=g4LCf3KE-KL3DjZLGY7sOcT5Ds_cgDRMqDKgitjvVhI,9607
+tools/cli_commands/test/test_gpg_encrypt.py,sha256=BIOPMsvytRb_j-Ae7KylcOCUrbNNVw8-WDpvV1FlmDs,6867
+tools/cli_commands/test/test_openshift_cost_optimization_report.py,sha256=GmfsqzfBkU1yE3o4tBVW7Od09M19EOK4gfX5ExjRiGM,8132
+tools/cli_commands/test/test_openshift_cost_report.py,sha256=bK9vI5bCBsHyyTNxpVRZ6AxV1JP_5uHqZXITqOJ5GTM,8724
+tools/cli_commands/test/test_util.py,sha256=51AeUTzS4D_gZqdlq5WDbqWzP5Eet6vAL-DW1Ktcti4,2213
 tools/saas_metrics_exporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/saas_metrics_exporter/main.py,sha256=piocx6meMdJxoxeNz52gQGUjt5n7Fma4kgqYamszPrM,3180
 tools/saas_metrics_exporter/commit_distance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -867,12 +876,12 @@ tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/conftest.py,sha256=CsDbu4otrxb7X7kXKKGyV3ZEzu3pCkgjCoCGiHNx6zc,2401
 tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvftCWEEf-g1mfXOtgCog-g,1271
 tools/test/test_erv2.py,sha256=EAS7QuJkHisRVO9bMGxm662L5B6i66wF_mT9PAjVzrU,3128
-tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jrss,4941
+tools/test/test_qontract_cli.py,sha256=iuzKbQ6ahinvjoQmQLBrG4shey0z-1rB6qCgS8T6dgU,5789
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc1150.dist-info/METADATA,sha256=C_3wTc7F0vF9ai1ABtWqBjJCpW4gunMjA7cYGBSr5xU,2213
-qontract_reconcile-0.10.1rc1150.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1150.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1150.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1150.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1151.dist-info/METADATA,sha256=kIbyRbeEHOgr_be8cLvc2kZ_5psU6e_Hltp8zQvbkMA,2213
+qontract_reconcile-0.10.1rc1151.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1151.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1151.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1151.dist-info/RECORD,,

reconcile/gql_definitions/cost_report/cost_namespaces.py

@@ -22,6 +22,7 @@ DEFINITION = """
 query CostNamespaces($filter: JSON) {
   namespaces: namespaces_v1(filter: $filter) {
     name
+    labels
     app {
       name
     }
@@ -57,6 +58,7 @@ class ClusterV1(ConfiguredBaseModel):
 
 class NamespaceV1(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
+    labels: Optional[Json] = Field(..., alias="labels")
     app: AppV1 = Field(..., alias="app")
     cluster: ClusterV1 = Field(..., alias="cluster")
 

reconcile/typed_queries/cost_report/cost_namespaces.py

@@ -4,15 +4,17 @@ from reconcile.gql_definitions.cost_report.cost_namespaces import query
 from reconcile.utils.gql import GqlApi
 
 
-class CostNamespace(BaseModel):
+class CostNamespaceLabels(BaseModel, frozen=True):
+    insights_cost_management_optimizations: str | None = None
+
+
+class CostNamespace(BaseModel, frozen=True):
     name: str
+    labels: CostNamespaceLabels
     app_name: str
     cluster_name: str
     cluster_external_id: str | None
 
-    class Config:
-        frozen = True
-
 
 def get_cost_namespaces(
     gql_api: GqlApi,
@@ -30,6 +32,7 @@ def get_cost_namespaces(
     return [
         CostNamespace(
             name=namespace.name,
+            labels=CostNamespaceLabels.parse_obj(namespace.labels or {}),
             app_name=namespace.app.name,
             cluster_name=namespace.cluster.name,
             cluster_external_id=namespace.cluster.spec.external_id

tools/cli_commands/cost_report/aws.py

@@ -4,17 +4,15 @@ from typing import Self
 
 from sretoolbox.utils import threaded
 
-from reconcile.typed_queries.app_interface_vault_settings import (
-    get_app_interface_vault_settings,
-)
 from reconcile.typed_queries.cost_report.app_names import App, get_app_names
-from reconcile.typed_queries.cost_report.settings import get_cost_report_settings
 from reconcile.utils import gql
-from reconcile.utils.secret_reader import create_secret_reader
 from tools.cli_commands.cost_report.cost_management_api import CostManagementApi
 from tools.cli_commands.cost_report.model import ChildAppReport, Report, ReportItem
-from tools.cli_commands.cost_report.response import ReportCostResponse
-from tools.cli_commands.cost_report.util import process_reports
+from tools.cli_commands.cost_report.response import AwsReportCostResponse
+from tools.cli_commands.cost_report.util import (
+    fetch_cost_report_secret,
+    process_reports,
+)
 from tools.cli_commands.cost_report.view import render_aws_cost_report
 
 THREAD_POOL_SIZE = 10
@@ -45,13 +43,13 @@ class AwsCostReportCommand:
         """
         return get_app_names(self.gql_api)
 
-    def _get_report(self, app: App) -> tuple[str, ReportCostResponse]:
+    def _get_report(self, app: App) -> tuple[str, AwsReportCostResponse]:
         return app.name, self.cost_management_api.get_aws_costs_report(app.name)
 
     def get_reports(
         self,
         apps: Iterable[App],
-    ) -> Mapping[str, ReportCostResponse]:
+    ) -> Mapping[str, AwsReportCostResponse]:
         """
         Fetch reports from cost management API
         """
@@ -61,7 +59,7 @@ class AwsCostReportCommand:
     def process_reports(
         self,
         apps: Iterable[App],
-        responses: Mapping[str, ReportCostResponse],
+        responses: Mapping[str, AwsReportCostResponse],
     ) -> dict[str, Report]:
         """
         Build reports with parent-child app tree.
@@ -84,7 +82,7 @@ class AwsCostReportCommand:
         parent_app_name: str | None,
         child_apps: list[str],
         reports: Mapping[str, Report],
-        response: ReportCostResponse,
+        response: AwsReportCostResponse,
     ) -> Report:
         child_app_reports = [
             ChildAppReport(
@@ -127,21 +125,10 @@ class AwsCostReportCommand:
         )
 
     @classmethod
-    def create(
-        cls,
-    ) -> Self:
+    def create(cls) -> Self:
         gql_api = gql.get_api()
-        vault_settings = get_app_interface_vault_settings(gql_api.query)
-        secret_reader = create_secret_reader(use_vault=vault_settings.vault)
-        cost_report_settings = get_cost_report_settings(gql_api)
-        secret = secret_reader.read_all_secret(cost_report_settings.credentials)
-        cost_management_api = CostManagementApi(
-            base_url=secret["api_base_url"],
-            token_url=secret["token_url"],
-            client_id=secret["client_id"],
-            client_secret=secret["client_secret"],
-            scope=secret["scope"].split(" "),
-        )
+        secret = fetch_cost_report_secret(gql_api)
+        cost_management_api = CostManagementApi.create_from_secret(secret)
         return cls(
             gql_api=gql_api,
             cost_management_api=cost_management_api,

tools/cli_commands/cost_report/cost_management_api.py

@@ -1,3 +1,8 @@
+from collections.abc import Mapping
+from typing import Self
+from urllib.parse import urljoin, urlparse
+
+from requests import Response
 from urllib3.util import Retry
 
 from reconcile.utils.oauth2_backend_application_session import (
@@ -5,14 +10,24 @@ from reconcile.utils.oauth2_backend_application_session import (
 )
 from reconcile.utils.rest_api_base import ApiBase
 from tools.cli_commands.cost_report.response import (
+    AwsReportCostResponse,
+    OpenShiftCostOptimizationReportResponse,
     OpenShiftReportCostResponse,
-    ReportCostResponse,
 )
 
 REQUEST_TIMEOUT = 60
+PAGE_LIMIT = 100
+MEMORY_UNIT = "MiB"
+CPU_UNIT = "millicores"
 
 
 class CostManagementApi(ApiBase):
+    """
+    Cost Management API client.
+
+    Doc at https://console.redhat.com/docs/api/cost-management
+    """
+
     def __init__(
         self,
         base_url: str,
@@ -32,14 +47,17 @@ class CostManagementApi(ApiBase):
             backoff_factor=15,  # large backoff required for server-side processing
             status_forcelist=[500, 502, 503, 504],
         )
+        self.base_url = base_url
+        parsed_url = urlparse(base_url)
+        host = f"{parsed_url.scheme}://{parsed_url.netloc}/"
         super().__init__(
-            host=base_url,
+            host=host,
             session=session,
             read_timeout=REQUEST_TIMEOUT,
             max_retries=max_retries,
         )
 
-    def get_aws_costs_report(self, app: str) -> ReportCostResponse:
+    def get_aws_costs_report(self, app: str) -> AwsReportCostResponse:
         params = {
             "cost_type": "calculated_amortized_cost",
             "delta": "cost",
@@ -51,12 +69,12 @@ class CostManagementApi(ApiBase):
         }
         response = self.session.request(
             method="GET",
-            url=f"{self.host}/reports/aws/costs/",
+            url=f"{self.base_url}/reports/aws/costs/",
             params=params,
             timeout=self.read_timeout,
         )
         response.raise_for_status()
-        return ReportCostResponse.parse_obj(response.json())
+        return AwsReportCostResponse.parse_obj(response.json())
 
     def get_openshift_costs_report(
         self,
@@ -74,9 +92,64 @@ class CostManagementApi(ApiBase):
         }
         response = self.session.request(
             method="GET",
-            url=f"{self.host}/reports/openshift/costs/",
+            url=f"{self.base_url}/reports/openshift/costs/",
             params=params,
             timeout=self.read_timeout,
         )
         response.raise_for_status()
         return OpenShiftReportCostResponse.parse_obj(response.json())
+
+    def get_openshift_cost_optimization_report(
+        self,
+        cluster: str,
+        project: str,
+    ) -> OpenShiftCostOptimizationReportResponse:
+        params = {
+            "cluster": cluster,
+            "project": project,
+            "limit": str(PAGE_LIMIT),
+            "memory-unit": MEMORY_UNIT,
+            "cpu-unit": CPU_UNIT,
+        }
+        response = self.session.request(
+            method="GET",
+            url=f"{self.base_url}/recommendations/openshift",
+            params=params,
+            timeout=self.read_timeout,
+        )
+        response.raise_for_status()
+
+        data = self._get_paginated(response)
+        return OpenShiftCostOptimizationReportResponse.parse_obj(data)
+
+    def _get_paginated(
+        self,
+        response: Response,
+    ) -> dict[str, list]:
+        body = response.json()
+        data = body.get("data", [])
+
+        while next_url := body.get("links", {}).get("next"):
+            r = self.session.request(
+                method="GET",
+                url=urljoin(self.host, next_url),
+                timeout=self.read_timeout,
+            )
+            r.raise_for_status()
+            body = r.json()
+            data.extend(body.get("data", []))
+
+        return {"data": data}
+
+    @classmethod
+    def create_from_secret(
+        cls,
+        secret: Mapping[str, str],
+    ) -> Self:
+        return cls(
+            base_url=secret["api_base_url"],
+            token_url=secret["token_url"],
+            client_id=secret["client_id"],
+            client_secret=secret["client_secret"],
+            scope=secret["scope"].split(" "),
+        )

tools/cli_commands/cost_report/model.py

@@ -26,3 +26,24 @@ class Report(BaseModel):
     items_delta_value: Decimal
     items_total: Decimal
     total: Decimal
+
+
+class OptimizationReportItem(BaseModel):
+    cluster: str
+    project: str
+    workload: str
+    workload_type: str
+    container: str
+    current_cpu_limit: str | None
+    current_cpu_request: str | None
+    current_memory_limit: str | None
+    current_memory_request: str | None
+    recommend_cpu_limit: str | None
+    recommend_cpu_request: str | None
+    recommend_memory_limit: str | None
+    recommend_memory_request: str | None
+
+
+class OptimizationReport(BaseModel):
+    app_name: str
+    items: list[OptimizationReportItem]

tools/cli_commands/cost_report/openshift.py

@@ -5,21 +5,19 @@ from typing import Self
 
 from sretoolbox.utils import threaded
 
-from reconcile.typed_queries.app_interface_vault_settings import (
-    get_app_interface_vault_settings,
-)
 from reconcile.typed_queries.cost_report.app_names import App, get_app_names
 from reconcile.typed_queries.cost_report.cost_namespaces import (
     CostNamespace,
     get_cost_namespaces,
 )
-from reconcile.typed_queries.cost_report.settings import get_cost_report_settings
 from reconcile.utils import gql
-from reconcile.utils.secret_reader import create_secret_reader
 from tools.cli_commands.cost_report.cost_management_api import CostManagementApi
 from tools.cli_commands.cost_report.model import ChildAppReport, Report, ReportItem
 from tools.cli_commands.cost_report.response import OpenShiftReportCostResponse
-from tools.cli_commands.cost_report.util import process_reports
+from tools.cli_commands.cost_report.util import (
+    fetch_cost_report_secret,
+    process_reports,
+)
 from tools.cli_commands.cost_report.view import render_openshift_cost_report
 
 THREAD_POOL_SIZE = 10
@@ -157,21 +155,10 @@ class OpenShiftCostReportCommand:
         )
 
     @classmethod
-    def create(
-        cls,
-    ) -> Self:
+    def create(cls) -> Self:
         gql_api = gql.get_api()
-        vault_settings = get_app_interface_vault_settings(gql_api.query)
-        secret_reader = create_secret_reader(use_vault=vault_settings.vault)
-        cost_report_settings = get_cost_report_settings(gql_api)
-        secret = secret_reader.read_all_secret(cost_report_settings.credentials)
-        cost_management_api = CostManagementApi(
-            base_url=secret["api_base_url"],
-            token_url=secret["token_url"],
-            client_id=secret["client_id"],
-            client_secret=secret["client_secret"],
-            scope=secret["scope"].split(" "),
-        )
+        secret = fetch_cost_report_secret(gql_api)
+        cost_management_api = CostManagementApi.create_from_secret(secret)
         return cls(
             gql_api=gql_api,
             cost_management_api=cost_management_api,

tools/cli_commands/cost_report/openshift_cost_optimization.py

@@ -0,0 +1,187 @@
+from collections import defaultdict
+from collections.abc import Iterable, Mapping
+from typing import Self
+
+from sretoolbox.utils import threaded
+
+from reconcile.typed_queries.cost_report.app_names import App, get_app_names
+from reconcile.typed_queries.cost_report.cost_namespaces import (
+    CostNamespace,
+    get_cost_namespaces,
+)
+from reconcile.utils import gql
+from tools.cli_commands.cost_report.cost_management_api import CostManagementApi
+from tools.cli_commands.cost_report.model import (
+    OptimizationReport,
+    OptimizationReportItem,
+)
+from tools.cli_commands.cost_report.response import (
+    OpenShiftCostOptimizationReportResponse,
+    OpenShiftCostOptimizationResponse,
+    ResourceConfigResponse,
+)
+from tools.cli_commands.cost_report.util import fetch_cost_report_secret
+from tools.cli_commands.cost_report.view import (
+    render_openshift_cost_optimization_report,
+)
+
+THREAD_POOL_SIZE = 10
+
+
+class OpenShiftCostOptimizationReportCommand:
+    def __init__(
+        self,
+        gql_api: gql.GqlApi,
+        cost_management_api: CostManagementApi,
+        thread_pool_size: int = THREAD_POOL_SIZE,
+    ) -> None:
+        self.gql_api = gql_api
+        self.cost_management_api = cost_management_api
+        self.thread_pool_size = thread_pool_size
+
+    def execute(self) -> str:
+        apps = self.get_apps()
+        cost_namespaces = self.get_cost_namespaces()
+        responses = self.get_reports(cost_namespaces)
+        reports = self.process_reports(apps, responses)
+        return self.render(reports)
+
+    def get_apps(self) -> list[App]:
+        return get_app_names(self.gql_api)
+
+    def get_cost_namespaces(self) -> list[CostNamespace]:
+        cost_namespaces = get_cost_namespaces(self.gql_api)
+        return [
+            n
+            for n in cost_namespaces
+            if n.labels.insights_cost_management_optimizations == "true"
+        ]
+
+    def get_reports(
+        self,
+        cost_namespaces: Iterable[CostNamespace],
+    ) -> dict[CostNamespace, OpenShiftCostOptimizationReportResponse]:
+        results = threaded.run(self._get_report, cost_namespaces, self.thread_pool_size)
+        return dict(results)
+
+    def process_reports(
+        self,
+        apps: Iterable[App],
+        responses: Mapping[CostNamespace, OpenShiftCostOptimizationReportResponse],
+    ) -> list[OptimizationReport]:
+        app_responses = defaultdict(list)
+        for cost_namespace, response in responses.items():
+            app_responses[cost_namespace.app_name].append(response)
+        return [
+            self._build_report(
+                app.name,
+                app_responses.get(app.name, []),
+            )
+            for app in apps
+        ]
+
+    def _get_report(
+        self,
+        cost_namespace: CostNamespace,
+    ) -> tuple[CostNamespace, OpenShiftCostOptimizationReportResponse]:
+        cluster = (
+            cost_namespace.cluster_external_id
+            if cost_namespace.cluster_external_id is not None
+            else cost_namespace.cluster_name
+        )
+        response = self.cost_management_api.get_openshift_cost_optimization_report(
+            project=cost_namespace.name,
+            cluster=cluster,
+        )
+        response.data = [
+            data
+            for data in response.data
+            if self._match_cost_namespace(data, cost_namespace)
+        ]
+        return cost_namespace, response
+
+    @staticmethod
+    def _match_cost_namespace(
+        response: OpenShiftCostOptimizationResponse,
+        cost_namespace: CostNamespace,
+    ) -> bool:
+        """
+        Exactly match the cost namespace from the response data.
+        Cost Management API returns fuzzy match on fields.
+        Client side filter is needed.
+
+        :param response: OpenShiftCostOptimizationResponse
+        :param cost_namespace: CostNamespace
+        :return: exactly match or not
+        """
+        if cluster_uuid := cost_namespace.cluster_external_id:
+            if response.cluster_uuid != cluster_uuid:
+                return False
+        elif response.cluster_alias != cost_namespace.cluster_name:
+            return False
+        return response.project == cost_namespace.name
+
+    @staticmethod
+    def render(
+        reports: Iterable[OptimizationReport],
+    ) -> str:
+        return render_openshift_cost_optimization_report(reports)
+
+    def _build_report(
+        self,
+        app_name: str,
+        responses: list[OpenShiftCostOptimizationReportResponse],
+    ) -> OptimizationReport:
+        return OptimizationReport(
+            app_name=app_name,
+            items=[self._build_report_item(data) for r in responses for data in r.data],
+        )
+
+    def _build_report_item(
+        self,
+        data: OpenShiftCostOptimizationResponse,
+    ) -> OptimizationReportItem:
+        current = data.recommendations.current
+        terms = data.recommendations.recommendation_terms
+        recommend = next(
+            engine.cost.config
+            for t in [terms.long_term, terms.medium_term, terms.short_term]
+            if (engine := t.recommendation_engines) is not None
+        )
+
+        return OptimizationReportItem(
+            cluster=data.cluster_alias,
+            project=data.project,
+            workload=data.workload,
+            workload_type=data.workload_type,
+            container=data.container,
+            current_cpu_limit=self._build_resource_config(current.limits.cpu),
+            current_cpu_request=self._build_resource_config(current.requests.cpu),
+            current_memory_limit=self._build_resource_config(current.limits.memory),
+            current_memory_request=self._build_resource_config(current.requests.memory),
+            recommend_cpu_limit=self._build_resource_config(recommend.limits.cpu),
+            recommend_cpu_request=self._build_resource_config(recommend.requests.cpu),
+            recommend_memory_limit=self._build_resource_config(recommend.limits.memory),
+            recommend_memory_request=self._build_resource_config(
+                recommend.requests.memory
+            ),
+        )
+
+    @staticmethod
+    def _build_resource_config(response: ResourceConfigResponse) -> str | None:
+        if response.amount is None:
+            return None
+        if response.format is None:
+            return str(round(response.amount))
+        return f"{round(response.amount)}{response.format}"
+
+    @classmethod
+    def create(cls) -> Self:
+        gql_api = gql.get_api()
+        secret = fetch_cost_report_secret(gql_api)
+        cost_management_api = CostManagementApi.create_from_secret(secret)
+        return cls(
+            gql_api=gql_api,
+            cost_management_api=cost_management_api,
+            thread_pool_size=THREAD_POOL_SIZE,
+        )

tools/cli_commands/cost_report/response.py

@@ -42,7 +42,7 @@ class CostResponse(BaseModel):
     services: list[ServiceCostResponse]
 
 
-class ReportCostResponse(BaseModel):
+class AwsReportCostResponse(BaseModel):
     meta: ReportMetaResponse
     data: list[CostResponse]
 
@@ -67,3 +67,58 @@ class OpenShiftCostResponse(BaseModel):
 class OpenShiftReportCostResponse(BaseModel):
     meta: ReportMetaResponse
     data: list[OpenShiftCostResponse]
+
+
+class ResourceConfigResponse(BaseModel):
+    amount: float | None = None
+    format: str | None = None
+
+
+class ResourceResponse(BaseModel):
+    cpu: ResourceConfigResponse
+    memory: ResourceConfigResponse
+
+
+class RecommendationResourcesResponse(BaseModel):
+    limits: ResourceResponse
+    requests: ResourceResponse
+
+
+class RecommendationEngineResponse(BaseModel):
+    config: RecommendationResourcesResponse
+    variation: RecommendationResourcesResponse
+
+
+class RecommendationEnginesResponse(BaseModel):
+    cost: RecommendationEngineResponse
+    performance: RecommendationEngineResponse
+
+
+class RecommendationTermResponse(BaseModel):
+    recommendation_engines: RecommendationEnginesResponse | None = None
+
+
+class RecommendationTermsResponse(BaseModel):
+    long_term: RecommendationTermResponse
+    medium_term: RecommendationTermResponse
+    short_term: RecommendationTermResponse
+
+
+class RecommendationsResponse(BaseModel):
+    current: RecommendationResourcesResponse
+    recommendation_terms: RecommendationTermsResponse
+
+
+class OpenShiftCostOptimizationResponse(BaseModel):
+    cluster_alias: str
+    cluster_uuid: str
+    container: str
+    id: str
+    project: str
+    recommendations: RecommendationsResponse
+    workload: str
+    workload_type: str
+
+
+class OpenShiftCostOptimizationReportResponse(BaseModel):
+    data: list[OpenShiftCostOptimizationResponse]