qontract-reconcile 0.10.1rc756__py3-none-any.whl → 0.10.1rc758__py3-none-any.whl

{qontract_reconcile-0.10.1rc756.dist-info → qontract_reconcile-0.10.1rc758.dist-info}/METADATA

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

@@ -54,7 +54,7 @@ reconcile/mr_client_gateway.py,sha256=WhjMd-sIXDFCV8-rt8CEjurJ5OYB1pOD0K3o0tZRXQ
 reconcile/ocm_additional_routers.py,sha256=KfcFDVbNoc6n5dHWjYdAf1_DiVqVG6Tw23WLKoV8cdg,3306
 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=TjpQYE61wbHTAWGHkGnHzLQh31-pAzM8FC_Il53BpAI,7141
+reconcile/ocm_aws_infrastructure_access.py,sha256=kDnJP6aOFO263LSbdCxJMmUwVsM3LgdzebtIUOoIhH8,7130
 reconcile/ocm_clusters.py,sha256=YWfBF25E55Odm0L3dXnqRbC_bDuYIsBPg4j6DEpWCGw,16703
 reconcile/ocm_external_configuration_labels.py,sha256=imEpDv1RBpCSj8tHDv0R76hmNCFtcUzVNgS1yOVl8vs,3870
 reconcile/ocm_github_idp.py,sha256=glwXMsIBcl38-OmDDQCpe0YoLLXfoRgVQmqwXMEXjds,3946
@@ -105,7 +105,7 @@ reconcile/service_dependencies.py,sha256=PMKP9vc6oL-78rzyF_RE8DzLSQMSqN8vCqt9sWp
 reconcile/signalfx_endpoint_monitoring.py,sha256=D1m8iq0EAKie0OD59FOcVCtpWWZ7xlo6lwBS9urwMIk,2894
 reconcile/slack_base.py,sha256=K3fSYx46G1djoPb07_C9j6ChhMCt5LgV5l6v2TFkNZk,3479
 reconcile/slack_usergroups.py,sha256=XC7bYHP322EFWrEaR4Orw_sOoMFmuV3o08OC0UE4xLQ,27592
-reconcile/sql_query.py,sha256=zZkihfI-f0JjMez9A83HGTlVwqqbkP8lLjRg-z7sOUU,25878
+reconcile/sql_query.py,sha256=FAQI9EIHsokZBbGwvGU4vnjg1fHemxpYQE20UtCB1qo,25941
 reconcile/status.py,sha256=cY4IJFXemhxptRJqR4qaaOWqei9e4jgLXuVSGajMsjg,544
 reconcile/status_board.py,sha256=nA74_133jukxVShjPKJpkXOA3vggDTTEhYTegoXbN1M,8632
 reconcile/terraform_aws_route53.py,sha256=R8eZHlvP368nvtmLd_cMSK3RGxD7jso9qE7NP92iniU,9986
@@ -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=RqFUwH2xiWFN1U6plp-UG77iFkK60b8YKODsD4YWWyc,49880
+reconcile/aus/base.py,sha256=89tNKGZAsfCiYivF-oU15nois91eP4b8tRRT45zaY9M,49886
 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
@@ -473,10 +473,10 @@ reconcile/test/test_make.py,sha256=zTdjgq-3idFlec_0qJenk9wWw0QMLvSpJfPsptXmync,6
 reconcile/test/test_ocm_additional_routers.py,sha256=dtbpUnD5un6Q3VoLbuFRb_njmt5SSCnBzvSSBcO_Xxs,4248
 reconcile/test/test_ocm_clusters.py,sha256=aBzL3eW_g3bTP2wmKE1hr8-f33OOhBiKDxJ0fNxWGCQ,23888
 reconcile/test/test_ocm_clusters_manifest_updates.py,sha256=jFRVfc5jby1kI2x_gT6wcqPPgkav1et9wZH6JqQbNSY,3278
-reconcile/test/test_ocm_machine_pools.py,sha256=3qo6t2Jfr1Wee0NUacyLTDmatp0o7CUNpkVOpHiOiGk,29737
+reconcile/test/test_ocm_machine_pools.py,sha256=X4S5lksvljAgCMSW7fDGguc6JMtNQ0bO2WAoLC2AAJw,29737
 reconcile/test/test_ocm_update_recommended_version.py,sha256=iA4BVirTGVXlwcOyeR52IuNO81X_8NR6ZNd7ZFE7igs,4328
 reconcile/test/test_ocm_upgrade_scheduler_org_updater.py,sha256=V91g2XQMa2nvKwkLVWkiPwNL6pMQE16s4jO0oXJ6wdk,4330
-reconcile/test/test_openshift_base.py,sha256=uVsnMghAQhHaJTreeOw4x2INTKJ6qeiZiiteWeKflW8,33874
+reconcile/test/test_openshift_base.py,sha256=YgTKcLmzmt9oR12s_022LAp9qr1R_CBOppYwoknspzE,33868
 reconcile/test/test_openshift_cluster_bots.py,sha256=L-yuKvMgB0LBCdfLu7wozh_lk6S_m3umXt3m_ECfLEI,8023
 reconcile/test/test_openshift_namespace_labels.py,sha256=P1hqi6P88NijNrurdXG_QR2usyo3EYZSy9zpwYHvDsM,12104
 reconcile/test/test_openshift_namespaces.py,sha256=HmRnCE5EnFt3MYceVEFHmk8wWRtCrxu2AFGFkY9pdyA,9214
@@ -501,7 +501,7 @@ reconcile/test/test_secret_reader.py,sha256=kz7nzcPjvA08cytnvcA_PMA98AEyqJWsESkY
 reconcile/test/test_slack_base.py,sha256=gpbWOLNxMMX6fyAbs1JakhLTnwfedb3f7WpUae4tQZE,5060
 reconcile/test/test_slack_usergroups.py,sha256=UO-OzqbGMSpNsyddu2TbWOzSiVze6Bq95Ph1QIJqLWY,23990
 reconcile/test/test_sql_query.py,sha256=rC-lf1_isT9i2ZIV9W0hkUkLi2oBIjZMRMhk-6mV-34,11029
-reconcile/test/test_status_board.py,sha256=WdAq4pFoWWqcOcfgMzssZD3xfvT1QLrEHJqUARldtvA,7875
+reconcile/test/test_status_board.py,sha256=go3YSWo03OLIdK95SuiDJa1Nqk-eN_9QtS7dfmu9__8,7875
 reconcile/test/test_terraform_aws_route53.py,sha256=xHggb8K1P76OyCfFcogbkmyKle-NlUylcbDnuv3IqvY,771
 reconcile/test/test_terraform_cloudflare_dns.py,sha256=aQTXX8Vr4h9aWvJZTnpZEhMGYoBpT2d45ZxU_ECIQ6o,3425
 reconcile/test/test_terraform_cloudflare_resources.py,sha256=NK_uktyWihkQ3gMN4bCaKerpi43CXAVYGIKTfcz05rY,13550
@@ -721,7 +721,7 @@ reconcile/utils/mr/ocm_upgrade_scheduler_org_updates.py,sha256=RzEKRT_BhvB2ud9py
 reconcile/utils/mr/user_maintenance.py,sha256=cHPBn8zrReWLHalyk-EFdkFJe9zjVjRoZhT4t2zZfGE,3956
 reconcile/utils/ocm/__init__.py,sha256=xv7CJp7K9LCQfa4gL_W0MMCOD1P4qOy8t5aZj1xXNUE,808
 reconcile/utils/ocm/addons.py,sha256=IHlqOO12TAdYwwU6Oedz3ussF1kELj9EI5GxPP6LKi8,7376
-reconcile/utils/ocm/base.py,sha256=sdcINGBy1FlotY0MZuVC--Yn3zcYDn_N33ownMD8SQE,14030
+reconcile/utils/ocm/base.py,sha256=KPS1CgiALlq7INdgTDpN7MmtZ6uQMSWcUDjeGHmp5Z4,14065
 reconcile/utils/ocm/cluster_groups.py,sha256=F8oqVqN_4QUnGL0K61zZhoYIzJeP57EcmZpwmoV0mr4,1751
 reconcile/utils/ocm/clusters.py,sha256=Nw9m-jgN3GHHCh6w9UOBbMV4rtS24_-Ep09jAWQ-_fE,7653
 reconcile/utils/ocm/identity_providers.py,sha256=dKed09N8iWmn39tI_MpwgVe47x23eLsknGbjMUxtwr4,2175
@@ -783,8 +783,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.1rc756.dist-info/METADATA,sha256=e3uCbsaVAAU1U51hxqtUNTNVP_7hwDox4K9PcBo6J_c,2382
-qontract_reconcile-0.10.1rc756.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc756.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc756.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc756.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc758.dist-info/METADATA,sha256=AV5BARka8wT3N8-xnQvmBspzkrCa7ewkyMWLaQ2xb-s,2382
+qontract_reconcile-0.10.1rc758.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc758.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc758.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc758.dist-info/RECORD,,

reconcile/aus/base.py

@@ -850,8 +850,8 @@ def is_gate_applicable_to_cluster(gate: OCMVersionGate, cluster: OCMCluster) ->
     # consider only gates after the clusters current minor version
     # OCM onls supports creating gate agreements for later minor versions than the
     # current cluster version
-    if not semver.match(
-        f"{cluster.minor_version()}.0", f"<{gate.version_raw_id_prefix}.0"
+    if not parse_semver(f"{cluster.minor_version()}.0").match(
+        f"<{gate.version_raw_id_prefix}.0"
     ):
         return False
 

reconcile/ocm_aws_infrastructure_access.py

@@ -140,7 +140,7 @@ def act(
     dry_run, ocm_map, current_state, current_failed, desired_state, current_deleting
 ):
     to_delete = [c for c in current_state if c not in desired_state]
-    to_delete = to_delete + current_failed
+    to_delete += current_failed
     for item in to_delete:
         cluster = item["cluster"]
         user_arn = item["user_arn"]

reconcile/sql_query.py

@@ -15,7 +15,6 @@ from typing import (
 )
 
 import jinja2
-from ruamel import yaml
 
 from reconcile import (
     openshift_base,
@@ -34,6 +33,7 @@ from reconcile.utils.openshift_resource import (
     OpenshiftResource,
     ResourceInventory,
 )
+from reconcile.utils.ruamel import create_ruamel_instance
 from reconcile.utils.secret_reader import SecretReader
 from reconcile.utils.semver_helper import make_semver
 from reconcile.utils.smtp_client import (
@@ -591,6 +591,7 @@ def _build_openshift_resources(
     query_name = query["name"]
     common_resource_labels = _build_common_resource_labels(query)
     openshift_resources: list[OpenshiftResource] = []
+    yml = create_ruamel_instance()
     if pull_secret:
         labels = pull_secret["labels"] or {}
         labels.update(common_resource_labels)
@@ -651,7 +652,7 @@ def _build_openshift_resources(
     )
     openshift_resources.append(
         OpenshiftResource(
-            body=yaml.safe_load(job_yaml),
+            body=yml.load(job_yaml),
             integration=QONTRACT_INTEGRATION,
             integration_version=QONTRACT_INTEGRATION_VERSION,
         )

reconcile/test/test_ocm_machine_pools.py

@@ -32,7 +32,7 @@ from reconcile.ocm_machine_pools import (
 from reconcile.utils.ocm import OCM
 
 
-class TestPool(AbstractPool):
+class PoolStub(AbstractPool):
     created = False
     deleted = False
     updated = False
@@ -57,8 +57,8 @@ class TestPool(AbstractPool):
 
 
 @pytest.fixture
-def test_pool() -> TestPool:
-    return TestPool(
+def test_pool() -> PoolStub:
+    return PoolStub(
         id="pool1",
         replicas=2,
         labels=None,
@@ -133,7 +133,7 @@ def ocm_mock():
 
 
 def test_diff__has_diff_autoscale(cluster_machine_pool: ClusterMachinePoolV1):
-    pool = TestPool(id="pool1", cluster="cluster1", cluster_type=ClusterType.OSD)
+    pool = PoolStub(id="pool1", cluster="cluster1", cluster_type=ClusterType.OSD)
 
     assert cluster_machine_pool.autoscale is None
     assert not pool._has_diff_autoscale(cluster_machine_pool)

reconcile/test/test_openshift_base.py

@@ -766,7 +766,7 @@ def build_openshift_resource(
         "metadata": {"name": name},
     }
     if extra_body:
-        body = body | extra_body
+        body |= extra_body
 
     return resource.OpenshiftResource(
         body=body,

reconcile/test/test_status_board.py

@@ -18,7 +18,7 @@ from reconcile.status_board import (
 from reconcile.utils.ocm_base_client import OCMBaseClient
 
 
-class TestStatusBoard(AbstractStatusBoard):
+class StatusBoardStub(AbstractStatusBoard):
     created: Optional[bool] = False
     deleted: Optional[bool] = False
     summarized: Optional[bool] = False
@@ -99,21 +99,21 @@ def test_status_board_handler(mocker: MockerFixture) -> None:
     ocm = mocker.patch("reconcile.status_board.OCMBaseClient")
     h = StatusBoardHandler(
         action="create",
-        status_board_object=TestStatusBoard(name="foo", fullname="foo"),
+        status_board_object=StatusBoardStub(name="foo", fullname="foo"),
     )
 
     h.act(dry_run=False, ocm=ocm)
-    assert isinstance(h.status_board_object, TestStatusBoard)
+    assert isinstance(h.status_board_object, StatusBoardStub)
     assert h.status_board_object.created
     assert h.status_board_object.summarized
 
     h = StatusBoardHandler(
         action="delete",
-        status_board_object=TestStatusBoard(name="foo", fullname="foo"),
+        status_board_object=StatusBoardStub(name="foo", fullname="foo"),
     )
 
     h.act(dry_run=False, ocm=ocm)
-    assert isinstance(h.status_board_object, TestStatusBoard)
+    assert isinstance(h.status_board_object, StatusBoardStub)
     assert h.status_board_object.deleted
     assert h.status_board_object.summarized
 

reconcile/utils/ocm/base.py

@@ -8,13 +8,13 @@ from typing import (
     TypeVar,
 )
 
-import semver
 from pydantic import (
     BaseModel,
     Field,
 )
 
 from reconcile.utils.aws_helper import get_account_uid_from_arn, get_role_name_from_arn
+from reconcile.utils.semver_helper import parse_semver
 
 LabelSetTypeVar = TypeVar("LabelSetTypeVar", bound=BaseModel)
 ACTIVE_SUBSCRIPTION_STATES = {"Active", "Reserved"}
@@ -246,8 +246,8 @@ class OCMCluster(BaseModel):
     external_configuration: Optional[OCMExternalConfiguration]
 
     def minor_version(self) -> str:
-        version_info = semver.parse(self.version.raw_id)
-        return f"{version_info['major']}.{version_info['minor']}"
+        version_info = parse_semver(self.version.raw_id)
+        return f"{version_info.major}.{version_info.minor}"
 
     def available_upgrades(self) -> list[str]:
         return self.version.available_upgrades