qontract-reconcile 0.10.1rc731__py3-none-any.whl → 0.10.1rc733__py3-none-any.whl

{qontract_reconcile-0.10.1rc731.dist-info → qontract_reconcile-0.10.1rc733.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc731
+Version: 0.10.1rc733
 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.1rc731.dist-info → qontract_reconcile-0.10.1rc733.dist-info}/RECORD

@@ -607,7 +607,7 @@ reconcile/utils/helpers.py,sha256=k9svgFFZG7H5FvHYY0g5jJyvgvh2UDZxf0Ib221teag,11
 reconcile/utils/imap_client.py,sha256=byFAJATbITJPsGECSbvXBOcCnoeTUpDFiEjzOAxLm_U,1975
 reconcile/utils/instrumented_wrappers.py,sha256=eVwMoa6FCrYxLv3RML3WpZF9qKVfCTjMxphgVXG03OM,1073
 reconcile/utils/jenkins_api.py,sha256=MyJSB_S3uYf3sXnt9t03-gZNQ7tbdd7Wusv3MoF2fRc,7113
-reconcile/utils/jira_client.py,sha256=geozBG45AM_z2Fisrhqw-fSkmvikyrKIb9XARn-Q-AE,7186
+reconcile/utils/jira_client.py,sha256=2m512wPgbKCq8PIXRmqsowsQ2nm7FBXoMkIzRcIYnFs,7197
 reconcile/utils/jjb_client.py,sha256=Pdy0dLCFvD6GPCaC0tZydYgkVJPOxYXIiwWECZaFJBU,14551
 reconcile/utils/jsonpath.py,sha256=NRpAEijKN4cMDjo7qivNPqpm0__GQQ1TiE0PBEBO45s,5572
 reconcile/utils/jump_host.py,sha256=AdwmCZYNhRe53VwV2iAsUdVyUdVtSd4REmdThJDkM5w,4973
@@ -617,7 +617,7 @@ reconcile/utils/lean_terraform_client.py,sha256=zReyNPJbr2uOdrdh8Qfe-OZQBoRwxb5Z
 reconcile/utils/make.py,sha256=QaEwucrzbl8-VHS66Wfdjfo0ubmAcvt_hZGpiGsKU50,231
 reconcile/utils/metrics.py,sha256=7nXdctmZ0UtGMHPpS3V55sfH4xpMPqdYaJ3JKAUc_sM,18474
 reconcile/utils/models.py,sha256=It_Q1WNIvw_EDCsiSWzIgpSPr_X9jMgbJI-DR3N23xY,4677
-reconcile/utils/oauth2_backend_application_session.py,sha256=kWUX2LTwKniD01-0a7x-kV9ud3Q30DpLgh1xDbUhLSI,3298
+reconcile/utils/oauth2_backend_application_session.py,sha256=6W16sMpnWEPFDUX7qi5Cui2yOnmLfpgUxWtB3Ii35D0,4177
 reconcile/utils/oc.py,sha256=ILAlP-AZMtWeyAepLoMnYbDJfyyMs-Z0fOEo9JXQfkE,65490
 reconcile/utils/oc_connection_parameters.py,sha256=85slrnDigYwYmzhyceVkMElWzFArp4ge1d-fHXVqh0w,9729
 reconcile/utils/oc_filters.py,sha256=R2Lf3fo0jQCeE62Ygeo_KN24XbAosq0QbjimYG6qHI4,1402
@@ -635,7 +635,7 @@ reconcile/utils/promtool.py,sha256=kT2rFZSBaRqW7SSHAuYzGZzQxM5Dzk8KW1NnEUYZU_s,2
 reconcile/utils/quay_api.py,sha256=EuOegpb-7ntEjkKLFwM2Oo4Nw7SyFtmyl3sQ9aXMtrM,8152
 reconcile/utils/raw_github_api.py,sha256=ZHC-SZuAyRe1zaMoOU7Krt1-zecDxENd9c_NzQYqK9g,2968
 reconcile/utils/repo_owners.py,sha256=j-pUjc9PuDzq7KpjNLpnhqfU8tUG4nj2WMhFp4ick7g,6629
-reconcile/utils/rest_api_base.py,sha256=uM4fGDNx5exDky0Ls56dJsta2PpceAO_uHc10vQCjOI,3914
+reconcile/utils/rest_api_base.py,sha256=uXLdXocNmRCxJsYFWOdUNLaTEu-dcxMLJg_CwRefETE,3970
 reconcile/utils/ruamel.py,sha256=FzL4_L0FnMOUZmgThrZSMJs5MTdXwiy-E9MZWfk8bh8,397
 reconcile/utils/secret_reader.py,sha256=2DeYAAQFjUULEKlLw3UDAUoND6gbqvCh9uKPtlc-0us,10403
 reconcile/utils/semver_helper.py,sha256=-WfPOMSA2v1h7hT3PwVf-Htg7wOsoKlQC1JdmDX2Ars,1268
@@ -747,26 +747,26 @@ tools/app_interface_metrics_exporter.py,sha256=zkwkxdAUAxjdc-pzx2_oJXG25fo0Fnyd5
 tools/app_interface_reporter.py,sha256=upA-J-n-HXHKVDINRuMR7vTt-iJvQORKUVi9D3leQto,17738
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=eZONmZCLrSgMQFKHKxElDmw2_4Ld-Ug-FEFR2c8QnXI,116018
+tools/qontract_cli.py,sha256=ilm3Ezw86rgFKLBgL-FV0xSRLHaFHfG0CKmYZfDe1VU,116022
 tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB6pc,5063
 tools/template_validation.py,sha256=-U-lTGeLaci8yWPEblCJeev2DOlY1jM9QOOh-O1zts8,3376
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/gpg_encrypt.py,sha256=w8hl4jIEWk5wKbEFN6fVEOwUJGmdlvOqYodW3XSN7mU,4978
 tools/cli_commands/cost_report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/cost_report/command.py,sha256=ecT4SjCwhoWNFF9Xb1spqYzI7QMwX9EFWz6XFSW4bas,6317
-tools/cli_commands/cost_report/cost_management_api.py,sha256=IuPbrtNpgt1wvzHAPQjGPdCobXIkvkusqP8uXv3G204,1743
+tools/cli_commands/cost_report/cost_management_api.py,sha256=o-qz-ykT7R6pMjrLVl030W7JuYAYSCdOXTO4B06aV3s,1771
 tools/cli_commands/cost_report/model.py,sha256=blNk52T6KIDy-7w4V6qvZhGFWplxgDfZ5jRZimPDYJo,593
 tools/cli_commands/cost_report/response.py,sha256=lOmIohSuwJBxoSAC9LCwihBsyWgutHCIW-nvd6_HX5Y,867
-tools/cli_commands/cost_report/view.py,sha256=LtM5AVv1pZ9yT1C_IcTrHHyXlQkRWeS3nnDf5XQVoVQ,8554
+tools/cli_commands/cost_report/view.py,sha256=2a6LOuUEbFQYw57Mkc3R2onLOT3oObizHtKFyj9stMU,8558
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
 tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvftCWEEf-g1mfXOtgCog-g,1271
-tools/test/test_qontract_cli.py,sha256=UEwAW7PA_GIrbqzaLxpkCxbuVjEFLNvnVG-6VyoCGIc,4147
+tools/test/test_qontract_cli.py,sha256=w2l4BHB09k1d-BGJ1jBUNCqDv7zkqYrMHojQXg-21kQ,4155
 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.1rc731.dist-info/METADATA,sha256=sursdK9csIPxAOvipsmyKrcSuaHrms1FagDc5yNyBRI,2382
-qontract_reconcile-0.10.1rc731.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc731.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc731.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc731.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc733.dist-info/METADATA,sha256=vcNc4Ashu0DlVjZ-3ZtZRXdI1pZFea0gCObIeSf-MLg,2382
+qontract_reconcile-0.10.1rc733.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc733.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc733.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc733.dist-info/RECORD,,

reconcile/utils/jira_client.py

@@ -96,14 +96,11 @@ class JiraClient:
         if settings and settings["jiraWatcher"]:
             read_timeout = settings["jiraWatcher"]["readTimeout"]
             connect_timeout = settings["jiraWatcher"]["connectTimeout"]
+        self.timeout = (read_timeout, connect_timeout)
         if not self.server:
             raise RuntimeError("JiraClient.server is not set.")
 
-        self.jira = JIRA(
-            self.server,
-            token_auth=token_auth,
-            timeout=(read_timeout, connect_timeout),
-        )
+        self.jira = JIRA(self.server, token_auth=token_auth, timeout=self.timeout)
 
     @staticmethod
     def create(
@@ -218,7 +215,7 @@ class JiraClient:
             raise RuntimeError("JiraClient.server is not set.")
 
         # use anonymous access to get public projects
-        jira_api_anon = JIRA(server=self.server)
+        jira_api_anon = JIRA(server=self.server, timeout=self.timeout)
         return [project.key for project in jira_api_anon.projects()]
 
     def components(self) -> list[str]:

reconcile/utils/oauth2_backend_application_session.py

@@ -1,9 +1,10 @@
 import threading
-from collections.abc import Mapping
+from collections.abc import Mapping, MutableMapping
 from typing import Any, Self
 
 from oauthlib.oauth2 import BackendApplicationClient, TokenExpiredError
 from requests import Response
+from requests.adapters import BaseAdapter
 from requests_oauthlib import OAuth2Session
 
 FETCH_TOKEN_HEADERS = {
@@ -39,9 +40,6 @@ class OAuth2BackendApplicationSession:
     def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
         self.close()
 
-    def close(self) -> None:
-        self.session.close()
-
     def fetch_token(self) -> dict:
         """
         Fetch token from token_url and store it in the session.
@@ -100,3 +98,35 @@ class OAuth2BackendApplicationSession:
                 client_secret=client_secret,
                 **kwargs,
             )
+
+    # Delegates for ApiBase
+
+    def close(self) -> None:
+        self.session.close()
+
+    def mount(self, prefix: str, adapter: BaseAdapter) -> None:
+        self.session.mount(prefix, adapter)
+
+    @property
+    def headers(self) -> MutableMapping:
+        return self.session.headers
+
+    @property
+    def auth(self) -> Any:
+        return self.session.auth
+
+    @auth.setter
+    def auth(self, value: Any) -> None:
+        self.session.auth = value
+
+    def get(self, url: str, **kwargs: Any) -> Response:
+        return self.session.get(url, **kwargs)
+
+    def post(self, url: str, **kwargs: Any) -> Response:
+        return self.session.post(url, **kwargs)
+
+    def put(self, url: str, **kwargs: Any) -> Response:
+        return self.session.put(url, **kwargs)
+
+    def delete(self, url: str, **kwargs: Any) -> Response:
+        return self.session.delete(url, **kwargs)

reconcile/utils/rest_api_base.py

@@ -2,6 +2,11 @@ from typing import Any, Self
 from urllib.parse import urljoin
 
 import requests
+from urllib3 import Retry
+
+from reconcile.utils.oauth2_backend_application_session import (
+    OAuth2BackendApplicationSession,
+)
 
 
 def get_next_url(links: dict[str, dict[str, str]]) -> str | None:
@@ -40,26 +45,24 @@ class ApiBase:
         self,
         host: str,
         auth: requests.auth.AuthBase | None = None,
-        max_retries: int | None = None,
+        max_retries: int | Retry | None = None,
         read_timeout: float | None = None,
-        session: requests.Session | None = None,
+        session: requests.Session | OAuth2BackendApplicationSession | None = None,
     ) -> None:
         self.host = host
         self.max_retries = max_retries if max_retries is not None else 3
         self.read_timeout = read_timeout if read_timeout is not None else 30
         self.session = session or requests.Session()
-        if not session:
-            if auth:
-                self.session.auth = auth
-            self.session.mount(
-                "https://", requests.adapters.HTTPAdapter(max_retries=self.max_retries)
-            )
+        if auth:
+            self.session.auth = auth
+        for prefix in ["http://", "https://"]:
             self.session.mount(
-                "http://", requests.adapters.HTTPAdapter(max_retries=self.max_retries)
+                prefix,
+                requests.adapters.HTTPAdapter(max_retries=self.max_retries),
             )
-            self.session.headers.update({
-                "Content-Type": "application/json",
-            })
+        self.session.headers.update({
+            "Content-Type": "application/json",
+        })
 
     def __enter__(self) -> Self:
         return self

tools/cli_commands/cost_report/cost_management_api.py

@@ -1,14 +1,17 @@
-from typing import Any, List, Self
+from typing import List
+
+from urllib3.util import Retry
 
 from reconcile.utils.oauth2_backend_application_session import (
     OAuth2BackendApplicationSession,
 )
+from reconcile.utils.rest_api_base import ApiBase
 from tools.cli_commands.cost_report.response import ReportCostResponse
 
 REQUEST_TIMEOUT = 60
 
 
-class CostManagementApi:
+class CostManagementApi(ApiBase):
     def __init__(
         self,
         base_url: str,
@@ -16,25 +19,24 @@ class CostManagementApi:
         client_id: str,
         client_secret: str,
         scope: List[str] | None = None,
-        request_timeout: int | None = REQUEST_TIMEOUT,
     ) -> None:
-        self.base_url = base_url
-        self.request_timeout = request_timeout
-        self.session = OAuth2BackendApplicationSession(
+        session = OAuth2BackendApplicationSession(
             client_id=client_id,
             client_secret=client_secret,
             token_url=token_url,
             scope=scope,
         )
-
-    def __enter__(self) -> Self:
-        return self
-
-    def __exit__(self, exc_type: Any, exc_val: Any, exc_tb: Any) -> None:
-        self.cleanup()
-
-    def cleanup(self) -> None:
-        self.session.close()
+        max_retries = Retry(
+            total=3,
+            backoff_factor=15,  # large backoff required for server-side processing
+            status_forcelist=[500, 502, 503, 504],
+        )
+        super().__init__(
+            host=base_url,
+            session=session,
+            read_timeout=REQUEST_TIMEOUT,
+            max_retries=max_retries,
+        )
 
     def get_aws_costs_report(self, app: str) -> ReportCostResponse:
         params = {
@@ -48,10 +50,9 @@ class CostManagementApi:
         }
         response = self.session.request(
             method="GET",
-            url=f"{self.base_url}/reports/aws/costs/",
-            headers={"Content-Type": "application/json"},
+            url=f"{self.host}/reports/aws/costs/",
             params=params,
-            timeout=self.request_timeout,
+            timeout=self.read_timeout,
         )
         response.raise_for_status()
         return ReportCostResponse.parse_obj(response.json())

tools/cli_commands/cost_report/view.py

@@ -16,7 +16,7 @@ LAYOUT = """\
 """
 
 HEADER = """\
-# Cost Report
+# AWS Cost Report
 """
 
 SUMMARY = """\

tools/qontract_cli.py

@@ -2600,7 +2600,7 @@ def alerts(ctx, file_path):
 
 @get.command()
 @click.pass_context
-def cost_report(ctx):
+def aws_cost_report(ctx):
     command = CostReportCommand.create()
     print(command.execute())
 

tools/test/test_qontract_cli.py

@@ -132,12 +132,12 @@ def mock_cost_report_command(mocker):
     return mocker.patch("tools.qontract_cli.CostReportCommand", autospec=True)
 
 
-def test_get_cost_report(env_vars, mock_queries, mock_cost_report_command):
+def test_get_aws_cost_report(env_vars, mock_queries, mock_cost_report_command):
     mock_cost_report_command.create.return_value.execute.return_value = "some report"
     runner = CliRunner()
     result = runner.invoke(
         qontract_cli.get,
-        "cost-report",
+        "aws-cost-report",
         obj={},
     )