qontract-reconcile 0.9.1rc222__py3-none-any.whl → 0.9.1rc224__py3-none-any.whl

{qontract_reconcile-0.9.1rc222.dist-info → qontract_reconcile-0.9.1rc224.dist-info}/METADATA

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

@@ -16,7 +16,7 @@ reconcile/aws_iam_password_reset.py,sha256=GDoBo4VFSABgRFjEfwRXlXlNGb7beVt5pSrNr
 reconcile/aws_support_cases_sos.py,sha256=i6bSWnlH9fh14P14PjVhFLwNl-q3fD733_rXKM_O51c,2992
 reconcile/blackbox_exporter_endpoint_monitoring.py,sha256=W_VJagnsJR1v5oqjlI3RJJE0_nhtJ0m81RS8zWA5u5c,3538
 reconcile/checkpoint.py,sha256=figtZRuWUvdpdSnkhAqeGvO5dI02TT6J3heyeFhlwqM,5016
-reconcile/cli.py,sha256=k4NQ-Uu4EY50JkXK6QPAeCRo6vLzu49Al27vuAh4wuI,72161
+reconcile/cli.py,sha256=rHAMkvPwt---iPbQ2XloG7zrguvoO7Yz-0ZZiDrilwQ,72161
 reconcile/closedbox_endpoint_monitoring_base.py,sha256=0xg_d8dwd36Y8GY1mE-LLO1LQpPEMM77bzAfc_KdgzU,4870
 reconcile/cluster_deployment_mapper.py,sha256=2Ah-nu-Mdig0pjuiZl_XLrmVAjYzFjORR3dMlCgkmw0,2352
 reconcile/dashdotdb_base.py,sha256=Ca75-OQiu5HeA8Q6zQpEYuhyCSjeuWe99K4y9ipTORM,4032
@@ -121,7 +121,7 @@ reconcile/sql_query.py,sha256=AtJQseNBzigiY3Ii4Je0DDBDj8sxzsCTaxLyIaXkPcU,22432
 reconcile/status.py,sha256=tRYtzPFsGETOfN57rcsLIJRl7cZVFkfQXNsUtoeJ7ns,545
 reconcile/template_tester.py,sha256=vZz8GM46waQUGd3OVnhW5OLTqctFMH_Hh1QXxT5hduM,2384
 reconcile/terraform_aws_route53.py,sha256=06VIlIb95BzVkxV_1TPiaY9sQO-TkvQXL4V_qzuXxxA,9814
-reconcile/terraform_cloudflare_dns.py,sha256=1nYuAFAEAFh1k66mpDgjgfSywajTwC01j4noB4SxlYU,12616
+reconcile/terraform_cloudflare_dns.py,sha256=AiWI4_uR4UgJ26_YMoNFAUG92Row3ne2aa5BJplqFR8,12569
 reconcile/terraform_cloudflare_resources.py,sha256=BQg12mHm1iaxf086FFPZutPbWKUMaddqu-nREPR8ptA,14887
 reconcile/terraform_cloudflare_users.py,sha256=lTbrxi8OtW9Pfcr7Yp-70ihldMQKx9dJ7ZgbGHey1XE,13627
 reconcile/terraform_resources.py,sha256=gQ-LT0TGwf9OR4RF5EWDmNHUnKWnbhrIMtyIdUgP4D4,16782
@@ -446,7 +446,7 @@ reconcile/utils/raw_github_api.py,sha256=ZHC-SZuAyRe1zaMoOU7Krt1-zecDxENd9c_NzQY
 reconcile/utils/repo_owners.py,sha256=j-pUjc9PuDzq7KpjNLpnhqfU8tUG4nj2WMhFp4ick7g,6629
 reconcile/utils/secret_reader.py,sha256=eHbFZIBtr7BZ3YIrHcVzxwqy-Xw_8RexVkhmZGSa2sg,10361
 reconcile/utils/semver_helper.py,sha256=4Rrkz9Cj9A6oHPVgA-nGj6MBoxlFT4eyxTcslWqow3I,771
-reconcile/utils/sentry_client.py,sha256=eJ8YrjKpgHGJYP38rDDETkUhT_fnJd-K34po4WHEXIU,11913
+reconcile/utils/sentry_client.py,sha256=UqJfI0xTSVrqy4j3Os4olU8Ph-qq4V9-m0RLB_73M-w,12001
 reconcile/utils/sharding.py,sha256=gkYf0lD3IUKQPEmdRJZ70mdDT1c9qWjbdP7evRsUis4,839
 reconcile/utils/slack_api.py,sha256=Jdk8lIc9h9waj2R8JqRo3nkAV2wfoUdMvZv0wIJgeCU,13954
 reconcile/utils/smtp_client.py,sha256=gJNbBQJpAt5PX4t_TaeNHsXM8vt50bFgndml6yK2b5o,2800
@@ -458,7 +458,7 @@ reconcile/utils/terraform_client.py,sha256=AYnA1pW7JgNuroHzhrLW8gZ8yN-pLKwH_aAnR
 reconcile/utils/terrascript_aws_client.py,sha256=h5bCWv7MUk4b_dS3as4Aq9uyMcTxxDaT6tBj67tE0Hg,251172
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/unleash.py,sha256=xY8fXxJApZhYnhJHmqNAK1YPNWf6larzDtk0VuNvn08,2875
-reconcile/utils/vault.py,sha256=L0zamAiM39Vskv-uF_rcQf5iKvo1zSN0oU4UYRwBFhM,14375
+reconcile/utils/vault.py,sha256=CnhNu0pZfqS14kD1dQmBldITvTcSJHaHfk-KPNNDC7k,14471
 reconcile/utils/vaultsecretref.py,sha256=VpqOrqobbrd_4rK-KdV9Esud6W1w8ZAUUN1xCjq8g5Q,932
 reconcile/utils/glitchtip/__init__.py,sha256=FT6iBhGqoe7KExFdbgL8AYUb64iW_4snF5__Dcl7yt0,258
 reconcile/utils/glitchtip/client.py,sha256=xra8V8R6p0NGISD5PWbl4uSIecoIm7xBqVTILkfRSh8,8454
@@ -514,8 +514,8 @@ tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y
 tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.9.1rc222.dist-info/METADATA,sha256=VAlrvDSfnTZ-9jit5wk_x_510NL2gt20yR6HELHyks8,2248
-qontract_reconcile-0.9.1rc222.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.9.1rc222.dist-info/entry_points.txt,sha256=3BPvsRryM1C4S_mb5kXmP5AVv-wJBzVCrOJyv6qUmc0,195
-qontract_reconcile-0.9.1rc222.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
-qontract_reconcile-0.9.1rc222.dist-info/RECORD,,
+qontract_reconcile-0.9.1rc224.dist-info/METADATA,sha256=O_dU1aFg8s4UObH9oT92-vSuuHHWJyZvurbV4JkS8x4,2248
+qontract_reconcile-0.9.1rc224.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.9.1rc224.dist-info/entry_points.txt,sha256=3BPvsRryM1C4S_mb5kXmP5AVv-wJBzVCrOJyv6qUmc0,195
+qontract_reconcile-0.9.1rc224.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
+qontract_reconcile-0.9.1rc224.dist-info/RECORD,,

reconcile/cli.py

@@ -1693,7 +1693,7 @@ def terraform_cloudflare_resources(
 @integration.command(short_help="Manage Cloudflare DNS using Terraform.")
 @print_to_file
 @enable_deletion(default=False)
-@threaded(default=20)
+@threaded(default=10)
 @binary(["terraform"])
 @binary_version("terraform", ["version"], TERRAFORM_VERSION_REGEX, TERRAFORM_VERSION)
 @account_name

reconcile/terraform_cloudflare_dns.py

@@ -205,18 +205,14 @@ def get_cloudflare_provider_rps(
     """
     Setting Cloudlare Terraform provider's RPS based on the size of the zone to improve performance of MR checks.
     Specifically it was observed that 1000 records zone will result in around 250 seconds build time, and it become
-    problematic for MR merge throughput when exceeding 5 minutes. Therefore setting rps to 2 for smaller zone to
-    save throttle quota, and 6 for the large zones so MR checks won't take more than 250 seconds.
+    problematic for MR merge throughput when exceeding 5 minutes. Therefore setting rps lower for smaller zone to
+    save throttle quota, and higher for the large zones so MR checks won't take more than 250 seconds.
     """
 
     if not records:
         return DEFAULT_PROVIDER_RPS
     size = len(records)
-    if size <= 50:
-        return 2
-    if size <= 1000:
-        return DEFAULT_PROVIDER_RPS
-    return 6
+    return min(-(-size // 50), DEFAULT_PROVIDER_RPS)
 
 
 def create_backend_config(

reconcile/utils/sentry_client.py

@@ -1,5 +1,5 @@
-import functools
 import json
+from functools import lru_cache
 
 import parse
 import requests
@@ -12,6 +12,9 @@ class SentryClient:  # pylint: disable=too-many-public-methods
     def __init__(self, host, token):
         self.host = host
         self.auth_token = token
+        self.get_organizations = lru_cache()(self._get_organizations)
+        self.get_projects = lru_cache()(self._get_projects)
+        self.get_users = lru_cache()(self._get_users)
 
     @retry()
     def _do_sentry_api_call(self, method, path, slugs, payload=None):
@@ -58,8 +61,7 @@ class SentryClient:  # pylint: disable=too-many-public-methods
         return all_results
 
     # Organization functions
-    @functools.lru_cache(maxsize=128)
-    def get_organizations(self):
+    def _get_organizations(self):
         response = self._do_sentry_api_call("get", "organizations", [])
         return response
 
@@ -68,8 +70,7 @@ class SentryClient:  # pylint: disable=too-many-public-methods
         return response
 
     # Project functions
-    @functools.lru_cache(maxsize=128)
-    def get_projects(self):
+    def _get_projects(self):
         response = self._do_sentry_api_call("get", "projects", [])
         return response
 
@@ -275,8 +276,7 @@ class SentryClient:  # pylint: disable=too-many-public-methods
         return response
 
     # User/Member functions
-    @functools.lru_cache(maxsize=128)
-    def get_users(self):
+    def _get_users(self):
         response = self._do_sentry_api_call(
             "get", "organizations", [self.ORGANIZATION, "members"]
         )

reconcile/utils/vault.py

@@ -1,10 +1,10 @@
 import base64
-import functools
 import logging
 import os
 import threading
 import time
 from collections.abc import Mapping
+from functools import lru_cache
 from typing import Optional
 
 import hvac
@@ -93,6 +93,9 @@ class _VaultClient:
             )
             self.kube_auth_enabled = True
 
+        self._get_mount_version = lru_cache(maxsize=128)(self.__get_mount_version)
+        self._read_all_v2 = lru_cache(maxsize=2048)(self.__read_all_v2)
+
         # This is a threaded world. Let's define a big
         # connections pool to live in that world
         # (this avoids the warning "Connection pool is
@@ -207,8 +210,7 @@ class _VaultClient:
         mount_point = path_split[0]
         return self._get_mount_version(mount_point)
 
-    @functools.lru_cache(maxsize=128)
-    def _get_mount_version(self, mount_point):
+    def __get_mount_version(self, mount_point):
         try:
             self._client.secrets.kv.v2.read_configuration(mount_point)
             version = 2
@@ -217,8 +219,7 @@ class _VaultClient:
 
         return version
 
-    @functools.lru_cache(maxsize=2048)
-    def _read_all_v2(
+    def __read_all_v2(
         self, path: str, version: Optional[str]
     ) -> tuple[dict, Optional[str]]:
         path_split = path.split("/")