qontract-reconcile 0.10.1rc784__py3-none-any.whl → 0.10.1rc786__py3-none-any.whl

{qontract_reconcile-0.10.1rc784.dist-info → qontract_reconcile-0.10.1rc786.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc784
+Version: 0.10.1rc786
 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
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.11
-Requires-Dist: sretoolbox ~=2.5.2
+Requires-Dist: sretoolbox ~=2.5
 Requires-Dist: Click <9.0,>=7.0
 Requires-Dist: gql ==3.1.0
 Requires-Dist: toml <0.11.0,>=0.10.0
@@ -21,11 +21,11 @@ Requires-Dist: hvac <0.8.0,>=0.7.0
 Requires-Dist: ldap3 <2.10.0,>=2.9.1
 Requires-Dist: anymarkup <0.9.0,>=0.7.0
 Requires-Dist: python-gitlab <1.12.0,>=1.11.0
-Requires-Dist: semver ~=2.13
-Requires-Dist: boto3 ==1.34.15
-Requires-Dist: botocore ==1.34.15
+Requires-Dist: semver ~=3.0
+Requires-Dist: boto3 ==1.34.94
+Requires-Dist: botocore ==1.34.94
 Requires-Dist: mypy-boto3-s3 ==1.34.14
-Requires-Dist: urllib3 <1.27.0,>=1.26.11
+Requires-Dist: urllib3 ~=2.2
 Requires-Dist: slack-sdk <4.0,>=3.10
 Requires-Dist: pypd <1.2.0,>=1.1.0
 Requires-Dist: Jinja2 <3.2.0,>=2.10.1
@@ -36,7 +36,7 @@ Requires-Dist: terrascript ==0.9.0
 Requires-Dist: tabulate <0.9.0,>=0.8.6
 Requires-Dist: UnleashClient ~=5.11
 Requires-Dist: prometheus-client ~=0.8
-Requires-Dist: sentry-sdk ~=1.14.0
+Requires-Dist: sentry-sdk ~=2.0
 Requires-Dist: jenkins-job-builder ~=4.3.0
 Requires-Dist: parse ==1.18.0
 Requires-Dist: sendgrid <6.5.0,>=6.4.8

{qontract_reconcile-0.10.1rc784.dist-info → qontract_reconcile-0.10.1rc786.dist-info}/RECORD

@@ -55,7 +55,7 @@ reconcile/ocm_additional_routers.py,sha256=KfcFDVbNoc6n5dHWjYdAf1_DiVqVG6Tw23WLK
 reconcile/ocm_addons.py,sha256=qqAyqRBRbdZQvAcjb-QlSVyRAyQBZk6iVlgnI4jyi7s,3353
 reconcile/ocm_addons_upgrade_tests_trigger.py,sha256=L1ktYynIR7pmHiYtdCTdLGJRKX72B54KUAuPLOccXzo,3995
 reconcile/ocm_aws_infrastructure_access.py,sha256=kDnJP6aOFO263LSbdCxJMmUwVsM3LgdzebtIUOoIhH8,7130
-reconcile/ocm_clusters.py,sha256=YWfBF25E55Odm0L3dXnqRbC_bDuYIsBPg4j6DEpWCGw,16703
+reconcile/ocm_clusters.py,sha256=ZUW4aqZuRDNzNS_Ojx-sjWIxemdgiJUIJn51YaQa_7k,16733
 reconcile/ocm_external_configuration_labels.py,sha256=imEpDv1RBpCSj8tHDv0R76hmNCFtcUzVNgS1yOVl8vs,3870
 reconcile/ocm_github_idp.py,sha256=glwXMsIBcl38-OmDDQCpe0YoLLXfoRgVQmqwXMEXjds,3946
 reconcile/ocm_groups.py,sha256=CluPyvmwE5JOZS2HQSReC1sD8L1ChhnJlAg8lcwdtxc,3395
@@ -122,7 +122,7 @@ reconcile/vpc_peerings_validator.py,sha256=Kv22HJVlTW9l9GB2eXwjPWqdDbr_VuvQBNPtt
 reconcile/aus/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aus/advanced_upgrade_service.py,sha256=MPqcWpq1QeYzBsB8rtTlo102h_cR_q83oOYtWAncuAk,22391
 reconcile/aus/aus_label_source.py,sha256=qoP8Fgxuu1tCuhG6ixCWve7Ll-KD6a79E2uLAmC0ifw,4184
-reconcile/aus/base.py,sha256=89tNKGZAsfCiYivF-oU15nois91eP4b8tRRT45zaY9M,49886
+reconcile/aus/base.py,sha256=n53ZtW5MpBitN745mymFxcq7LT5X8si8U0-l8hH6AEc,49878
 reconcile/aus/cluster_version_data.py,sha256=j4UyEBi5mQuvPq5Lo7a_L_0blxvH790wJV07uAiikFU,7126
 reconcile/aus/healthchecks.py,sha256=S8_KPn_zFiOo_wf5XlVmz-I3tUDYAim3EGSqiSPMvLQ,2707
 reconcile/aus/metrics.py,sha256=nKT4m2zGT-QOMR0c-z-npVNKWsNMubzdffpU_f9n4II,3927
@@ -131,7 +131,7 @@ reconcile/aus/ocm_addons_upgrade_scheduler_org.py,sha256=t2_J7CuovTm6FGvwWI6Hsyi
 reconcile/aus/ocm_upgrade_scheduler.py,sha256=2uPn13y3QGCHLoKwCc1Z7q9wQsoQf_F1HATMYUbl53s,3695
 reconcile/aus/ocm_upgrade_scheduler_org.py,sha256=f7pE_XrX9695EMZpg-CFZiakZ9vZ9BoRpkE2I9UC0sI,3190
 reconcile/aus/upgrades.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/aus/version_gate_approver.py,sha256=4Y8OWn0Gc-ijzeiBd9NR9cTC3JYCMuumwm-e3IBnIlE,7350
+reconcile/aus/version_gate_approver.py,sha256=CegHHAroouQt9Hjj1EHFLYlgs2FSGwpJx0IMpJBf5uw,7379
 reconcile/aus/version_gates/__init__.py,sha256=DUODBcyey5-fTsuKquG3RU7BbWBuUWpqEQeHejbBCUI,479
 reconcile/aus/version_gates/handler.py,sha256=S_isQPYHbG4DERiUEvQBZ6ngiFX3uMmATA-Q_eNKmFk,839
 reconcile/aus/version_gates/ingress_gate_handler.py,sha256=ZCtyggBzzcb0prtdbMpJsVkj5leYN-vS7srM9vbq9xo,1096
@@ -647,7 +647,7 @@ reconcile/utils/pagerduty_api.py,sha256=fcSAUez6w51woDvbm0plJW2qSw6_NXQs1Fit_KTN
 reconcile/utils/parse_dhms_duration.py,sha256=TONpLnec5gHeF7k815YNJpQyDjXhkxZIcv9s8ffbTSY,1840
 reconcile/utils/password_validator.py,sha256=XwuWg-8CPlcuG7dl_oQ1G1h2gSVSnfMym_VkuprpWVg,2183
 reconcile/utils/prometheus.py,sha256=i5aCQ_I4WOg76iEjglVxxO9-OKby2N80ScErAbDtHE8,3848
-reconcile/utils/promotion_state.py,sha256=avYxHUf4zK3dBhXEdUEry79EOSgJ7gfStvvOpcedZnI,2575
+reconcile/utils/promotion_state.py,sha256=Gf58uvBWqGDZtNsnGbi6-K4LC94Mm_bJDs_Ztq1FPSs,2603
 reconcile/utils/promtool.py,sha256=kT2rFZSBaRqW7SSHAuYzGZzQxM5Dzk8KW1NnEUYZU_s,2896
 reconcile/utils/quay_api.py,sha256=EuOegpb-7ntEjkKLFwM2Oo4Nw7SyFtmyl3sQ9aXMtrM,8152
 reconcile/utils/raw_github_api.py,sha256=ZHC-SZuAyRe1zaMoOU7Krt1-zecDxENd9c_NzQYqK9g,2968
@@ -750,7 +750,7 @@ reconcile/utils/runtime/sharding.py,sha256=roCdbnBklhTK_g34zbgQYqzpKPaNQ8J6Xd9XL
 reconcile/utils/saasherder/__init__.py,sha256=J3MBZBFa5YmhqYm08QsjBXz8mFcVOCiOCkyIcw41t7E,343
 reconcile/utils/saasherder/interfaces.py,sha256=XXY35h8VWQ66z3LBPxaoUAMkIW50264DQiecrzyV6oA,9076
 reconcile/utils/saasherder/models.py,sha256=1DKXUmiTS_MejUfSpFCeuBLMTgR4ldv2N1tAz8qHAwc,5547
-reconcile/utils/saasherder/saasherder.py,sha256=LHvW9F1sSgCB0zJ9AM-ROsEx96wpDwE78kLMj5LKZnM,86177
+reconcile/utils/saasherder/saasherder.py,sha256=OoDilZnlv_nVDzDkOSXpSozFWp6-ZpEcsXTgqAI8e40,86305
 reconcile/utils/terraform/__init__.py,sha256=zNbiyTWo35AT1sFTElL2j_AA0jJ_yWE_bfFn-nD2xik,250
 reconcile/utils/terraform/config.py,sha256=5UVrd563TMcvi4ooa5JvWVDW1I3bIWg484u79evfV_8,164
 reconcile/utils/terraform/config_client.py,sha256=py-Ree-QUYD6Hvng6bM40VgSuttteehIKNgwOSoJO1o,4706
@@ -785,8 +785,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 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.1rc784.dist-info/METADATA,sha256=iirIbkjHkjlb5fv0PhRZw_CL44Hr7n9dtau5yPk4JOM,2382
-qontract_reconcile-0.10.1rc784.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc784.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc784.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc784.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc786.dist-info/METADATA,sha256=zg_8UE4AWFXth3D4RUmhNeKdk5Qr0zu7CfO_FeJ35MQ,2364
+qontract_reconcile-0.10.1rc786.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc786.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc786.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc786.dist-info/RECORD,,

reconcile/aus/base.py

@@ -18,7 +18,6 @@ from typing import (
     cast,
 )
 
-import semver
 from croniter import croniter
 from pydantic import BaseModel, Extra
 from semver import VersionInfo
@@ -1013,7 +1012,7 @@ def _calculate_node_pool_diffs(
         for pool in node_pools:
             pool_version_id = pool.get("version", {}).get("id")
             pool_version = get_version(ocm_api, pool_version_id)["raw_id"]
-            if semver.match(pool_version, f"<{spec.current_version}"):
+            if parse_semver(pool_version).match(f"<{spec.current_version}"):
                 next_schedule = (now + timedelta(minutes=MIN_DELTA_MINUTES)).strftime(
                     "%Y-%m-%dT%H:%M:%SZ"
                 )

reconcile/aus/version_gate_approver.py

@@ -5,8 +5,6 @@ from typing import (
     Optional,
 )
 
-import semver
-
 from reconcile.aus.advanced_upgrade_service import aus_label_key
 from reconcile.aus.base import gates_to_agree, get_orgs_for_environment
 from reconcile.aus.version_gates import (
@@ -45,9 +43,10 @@ from reconcile.utils.runtime.integration import (
     PydanticRunParams,
     QontractReconcileIntegration,
 )
+from reconcile.utils.semver_helper import make_semver
 
 QONTRACT_INTEGRATION = "version-gate-approver"
-QONTRACT_INTEGRATION_VERSION = semver.format_version(0, 1, 0)
+QONTRACT_INTEGRATION_VERSION = make_semver(0, 1, 0)
 
 
 class VersionGateApproverParams(PydanticRunParams):

reconcile/ocm_clusters.py

@@ -6,8 +6,6 @@ from collections.abc import (
 )
 from typing import Any, Optional
 
-import semver
-
 import reconcile.utils.mr.clusters_updates as cu
 import reconcile.utils.ocm as ocmmod
 from reconcile import (
@@ -35,10 +33,10 @@ from reconcile.utils.runtime.integration import (
     PydanticRunParams,
     QontractReconcileIntegration,
 )
-from reconcile.utils.semver_helper import parse_semver
+from reconcile.utils.semver_helper import make_semver, parse_semver
 
 QONTRACT_INTEGRATION = "ocm-clusters"
-QONTRACT_INTEGRATION_VERSION = semver.format_version(0, 1, 0)
+QONTRACT_INTEGRATION_VERSION = make_semver(0, 1, 0)
 
 
 def _set_rosa_ocm_attrs(cluster: Mapping[str, Any]):
@@ -122,10 +120,10 @@ def _cluster_version_needs_update(
     if not desired_version:
         return True
 
-    desired_version = parse_semver(desired_version)
-    current_version = parse_semver(current_version)
+    parsed_desired_version = parse_semver(desired_version)
+    parsed_current_version = parse_semver(current_version)
 
-    if current_version > desired_version:
+    if parsed_current_version > parsed_desired_version:
         # current version is geater due to an upgrade.
         # submit MR to update cluster version
         logging.info(
@@ -135,7 +133,7 @@ def _cluster_version_needs_update(
         )
         return True
 
-    if current_version < desired_version:
+    if parsed_current_version < parsed_desired_version:
         raise ClusterVersionError(
             f"[{cluster}] desired version [{desired_version}] is greater than "
             f"current version [{current_version}]. Please correct version to be "

reconcile/utils/promotion_state.py

@@ -22,6 +22,7 @@ class PromotionData(BaseModel):
     success: bool
     target_config_hash: Optional[str]
     saas_file: Optional[str]
+    check_in: Optional[str]
 
     class Config:
         smart_union = True

reconcile/utils/saasherder/saasherder.py

@@ -16,6 +16,7 @@ from collections.abc import (
     Sequence,
 )
 from contextlib import suppress
+from datetime import datetime, timezone
 from types import TracebackType
 from typing import (
     Any,
@@ -1965,6 +1966,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
         if not (self.state and self._promotion_state):
             raise Exception("state is not initialized")
 
+        now = datetime.now(timezone.utc)
         for promotion in self.promotions:
             if promotion is None:
                 continue
@@ -1982,6 +1984,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                             saas_file=promotion.saas_file,
                             success=success,
                             target_config_hash=promotion.target_config_hash,
+                            check_in=str(now),
                         ),
                     )
                     logging.info(