qontract-reconcile 0.10.1rc1182__py3-none-any.whl → 0.10.1rc1184__py3-none-any.whl

{qontract_reconcile-0.10.1rc1182.dist-info → qontract_reconcile-0.10.1rc1184.dist-info}/METADATA

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

@@ -43,7 +43,7 @@ reconcile/jenkins_job_builder.py,sha256=2aeOSS5pwKJgF4EzoHBWlOYNbzLj3qYzv6u55Qg6
 reconcile/jenkins_job_builds_cleaner.py,sha256=ksO5TXHxIMV_SF8kO86Wz7qGnYwbdt10wdhpb4aaEyQ,3851
 reconcile/jenkins_job_cleaner.py,sha256=dQGInds5RV-s9caec0212GveZ32xlCi2HiPyrIkVyFM,1761
 reconcile/jenkins_roles.py,sha256=pNNYcnmyDCTVytG2mi3BFhq9A7_3l301oFRQtY_q6S8,4452
-reconcile/jenkins_webhooks.py,sha256=K5h0OlCghoHlpot40IRq4BuezfKB1rj4Xk0dCUvqp3o,1952
+reconcile/jenkins_webhooks.py,sha256=dzMT1ywXjeAo5sHj-ittW06Ed3beAUPjnc_oCAtD-Rg,2150
 reconcile/jenkins_webhooks_cleaner.py,sha256=JsN_NVPfZJwv1JtSzZXDIHUqGiefL-DRffFnDGau9aY,1539
 reconcile/jenkins_worker_fleets.py,sha256=PMNGOX0krubFjInPiFT0za0KCiWBLEcVDuXdKRd1BrE,5378
 reconcile/jira_permissions_validator.py,sha256=GSjLwHrstuO4dGb9Oxfmg_9PLLreFsbJJ8WHhUM8FSY,13144
@@ -678,7 +678,7 @@ reconcile/utils/external_resources.py,sha256=y7Wz32cOAmCsUhQ6T-1N6lktnLikGkaHQ0S
 reconcile/utils/filtering.py,sha256=S4PbMHuFr3ED0P2Q_ea5CAaB7FimI62B-F5YTaKrphA,402
 reconcile/utils/git.py,sha256=wzVIYAeKlMGW538U1mkJWUI6h_mFRUY4lawh2AR8hw4,2345
 reconcile/utils/github_api.py,sha256=R8OvqyPdnRqvP-Efnv9RvIcbBlb4M0KC4RlbnJMD0Tg,2426
-reconcile/utils/gitlab_api.py,sha256=ar3D1gaPGm71ecQReMvbMbBzCa8TRs3Pn1ZZJP_lwSw,28453
+reconcile/utils/gitlab_api.py,sha256=YokTr77DJVWl7nALjCJdJnPKgBJfUBETkE8FtrT7ckg,28455
 reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
 reconcile/utils/gql.py,sha256=C0thIm_k9MBldfqwHzyqtYZk9sIvMdm9IbbnXLGwjD8,14158
 reconcile/utils/grouping.py,sha256=vr9SFHZ7bqmHYrvYcEZt-Er3-yQYfAAdq5sHLZVmXPY,456
@@ -688,7 +688,7 @@ reconcile/utils/imap_client.py,sha256=h8YDiCSCvroErhpH_-KGYI7Y2WU2Q2oSpuxDFbOkSb
 reconcile/utils/instrumented_wrappers.py,sha256=eVwMoa6FCrYxLv3RML3WpZF9qKVfCTjMxphgVXG03OM,1073
 reconcile/utils/jenkins_api.py,sha256=RaKuZmO7_lbI-hE6c_Pq2a6CQdmBVj7BcP2jR68cIbI,7081
 reconcile/utils/jira_client.py,sha256=oWi7rcAP1C59oIBTPg6kRntI25Zm4e7FyvdVYvZ9RZ8,7881
-reconcile/utils/jjb_client.py,sha256=9Aw4SfV4pBNW5Kj7dGZwakUlwsWuqtAAiSD9o1F4AZA,14524
+reconcile/utils/jjb_client.py,sha256=Tfphxxh70K12aq5WJ6aQ_0uhpDvlBRZLUN9-TKvjBuM,14996
 reconcile/utils/jsonpath.py,sha256=wdxOMqR-GMpQf5vRPWRMqAF7bCiXDBkkcFfY2U4j_tk,5536
 reconcile/utils/jump_host.py,sha256=svtWy64zZAx7XYY62vu580KgwdatmHjX4-BdxEl58Uw,5158
 reconcile/utils/keycloak.py,sha256=YWSEUGrOVqFaJUk055dKUWpLDPdDRvhcmvR-lfbmxdE,3388
@@ -726,7 +726,7 @@ reconcile/utils/sqs_gateway.py,sha256=XNIf3PY4UCPNufP2Ul0UJj3fKlt5larBba-VTT-41F
 reconcile/utils/state.py,sha256=W0_awkLAPX18hNOF_60o73tkPxDUylqbzYNHfl_sDsk,16386
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
-reconcile/utils/terraform_client.py,sha256=LjX2U2E0Dglt2S_KA5jWQ_dVC8sPn4FEAh0xW_d6JTk,35953
+reconcile/utils/terraform_client.py,sha256=IQV6JsoGH-Fy987stSJ3_A2f2ys_cIj6s9761krePi4,36035
 reconcile/utils/terrascript_aws_client.py,sha256=q6Ydbjle7K5Z3LYpoRJGXnb50ix6aGN6jLvP2vglPz8,283769
 reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
@@ -882,8 +882,8 @@ tools/test/test_qontract_cli.py,sha256=iuzKbQ6ahinvjoQmQLBrG4shey0z-1rB6qCgS8T6d
 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.1rc1182.dist-info/METADATA,sha256=gdReu60z2THXeO2P__JA2nYHErSt6uI8EoVgnxsl5ro,2213
-qontract_reconcile-0.10.1rc1182.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
-qontract_reconcile-0.10.1rc1182.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1182.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1182.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1184.dist-info/METADATA,sha256=8DHsuGLxV4LuSR7LPUvgLMjGqffzD8xy5iCyTv2Ltuc,2213
+qontract_reconcile-0.10.1rc1184.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
+qontract_reconcile-0.10.1rc1184.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1184.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1184.dist-info/RECORD,,

reconcile/jenkins_webhooks.py

@@ -24,7 +24,13 @@ def get_hooks_to_add(desired_state, gl):
             current_hooks = gl.get_project_hooks(project_url)
             for h in current_hooks:
                 job_url = h.url
-                trigger = "mr" if h.merge_requests_events else "push"
+                trigger = []
+                if h.merge_requests_events:
+                    trigger.append("mr")
+                if h.push_events:
+                    trigger.append("push")
+                if h.note_events:
+                    trigger.append("note")
                 item = {
                     "job_url": job_url.strip("/"),
                     "trigger": trigger,

reconcile/utils/gitlab_api.py

@@ -670,9 +670,9 @@ class GitLabApi:  # pylint: disable=too-many-public-methods
         hook = {
             "url": url,
             "enable_ssl_verification": 1,
-            "note_events": int(trigger == "mr"),
-            "push_events": int(trigger == "push"),
-            "merge_requests_events": int(trigger == "mr"),
+            "note_events": int("note" in trigger),
+            "push_events": int("push" in trigger),
+            "merge_requests_events": int("mr" in trigger),
         }
         gitlab_request.labels(integration=INTEGRATION_NAME).inc()
         p.hooks.create(hook)

reconcile/utils/jjb_client.py

@@ -294,11 +294,8 @@ class JJB:  # pylint: disable=too-many-public-methods
                         self.instance_urls[name], job["name"]
                     )
                     project_url = project_url_raw.strip("/").replace(".git", "")
-                    gitlab_triggers = job["triggers"][0]["gitlab"]
-                    mr_trigger = gitlab_triggers["trigger-merge-request"]
-                    push_trigger = gitlab_triggers["trigger-push"]
-                    trigger = "mr" if mr_trigger else "push" if push_trigger else None
-                    if trigger is None:
+                    trigger = self.get_gitlab_webhook_trigger(job)
+                    if not trigger:
                         continue
                     hook = {
                         "job_url": job_url,
@@ -399,3 +396,19 @@ class JJB:  # pylint: disable=too-many-public-methods
             if "github-pull-request" in trigger:
                 return trigger["github-pull-request"].get("trigger-phrase")
         return None
+
+    @staticmethod
+    def get_gitlab_webhook_trigger(job: dict) -> list[str]:
+        gitlab_triggers = job["triggers"][0]["gitlab"]
+        # pr-check job should be triggered by merge request events
+        # and certain comments: [test]|/retest|/lgtm|/lgtm cancel|/hold|/hold cancel
+        if gitlab_triggers.get("trigger-merge-request"):
+            return ["mr", "note"]
+        # build main/master job should be triggered by push events
+        elif gitlab_triggers.get("trigger-push"):
+            return ["push"]
+        # On-demand test job should be triggered by special comment
+        elif gitlab_triggers.get("trigger-note"):
+            return ["note"]
+        else:
+            return []

reconcile/utils/terraform_client.py

@@ -68,6 +68,10 @@ class TerraformCommandError(CalledProcessError):
     pass
 
 
+class RdsUpgradeValidationError(Exception):
+    pass
+
+
 class DeletionApprovalExpirationValueError(Exception):
     pass
 
@@ -218,7 +222,7 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
         if disable_deletions_detected:
             raise RuntimeError("Terraform plan has disabled deletions detected")
 
-    @retry()
+    @retry(no_retry_exceptions=RdsUpgradeValidationError)
     def terraform_plan(
         self, spec: TerraformSpec, enable_deletion: bool
     ) -> tuple[bool, list[AccountUser], bool]:
@@ -788,21 +792,19 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
                 None,
             )
             if target is None:
-                logging.error(
+                raise RdsUpgradeValidationError(
                     f"Cannot upgrade RDS instance: {resource_name} "
                     f"from {before_version} to {after_version}"
                 )
-                return
             allow_major_version_upgrade = after.get(
                 "allow_major_version_upgrade",
                 False,
             )
             if target["IsMajorVersionUpgrade"] and not allow_major_version_upgrade:
-                logging.error(
+                raise RdsUpgradeValidationError(
                     "allow_major_version_upgrade is not enabled for upgrading RDS instance: "
                     f"{resource_name} to a new major version."
                 )
-                return
 
             blue_green_update = after.get("blue_green_update", [])
             if blue_green_update and blue_green_update[0]["enabled"]:
@@ -859,36 +861,32 @@ class TerraformClient:  # pylint: disable=too-many-public-methods
             return False
 
         if not is_supported(engine, version):
-            logging.error(
+            raise RdsUpgradeValidationError(
                 f"Cannot upgrade RDS instance: {resource_name}. "
                 f"Engine version {version} is not supported for blue/green updates."
             )
-            return
 
         if replica:
-            logging.error(
+            raise RdsUpgradeValidationError(
                 f"Cannot upgrade RDS instance: {resource_name}. "
                 "Blue/green updates are not supported for instances with read replicas."
             )
-            return
 
         if engine == "postgres" and self._aws_api is not None:
             pg_details = self._aws_api.describe_db_parameter_group(
                 account_name, parameter_group, region_name
             )
             if pg_details.get("rds.logical_replication") != "1":
-                logging.error(
+                raise RdsUpgradeValidationError(
                     f"Cannot upgrade RDS instance: {resource_name}. "
                     f"Blue/green updates require logical replication to be enabled in the Parameter group {parameter_group}."
                 )
-                return
 
         if "storage_type" in changed_fields or "allocated_storage" in changed_fields:
-            logging.error(
+            raise RdsUpgradeValidationError(
                 f"Cannot upgrade RDS instance: {resource_name}. "
                 f"Blue/green updates are not supported when 'storage_type' or 'allocated_storage' has changed."
             )
-            return
 
 
 class TerraformPlanFailed(Exception):