qontract-reconcile 0.10.2.dev224__py3-none-any.whl → 0.10.2.dev226__py3-none-any.whl

{qontract_reconcile-0.10.2.dev224.dist-info → qontract_reconcile-0.10.2.dev226.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev224
+Version: 0.10.2.dev226
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Project-URL: homepage, https://github.com/app-sre/qontract-reconcile
 Project-URL: repository, https://github.com/app-sre/qontract-reconcile

{qontract_reconcile-0.10.2.dev224.dist-info → qontract_reconcile-0.10.2.dev226.dist-info}/RECORD

@@ -29,7 +29,7 @@ reconcile/github_repo_permissions_validator.py,sha256=PNqL4dqa2OaNBy-NmLVN-t1HZa
 reconcile/github_users.py,sha256=ZeYNMyvZPVMx6mh5TiKEUQy4W1uw3VmUZOHiXus5I0Y,5073
 reconcile/github_validator.py,sha256=-j17tn3csFVjPMSPL3te48iWVkPZCncRXdeKeLdGjjQ,931
 reconcile/gitlab_fork_compliance.py,sha256=RbHckzLnE9zkOFHJANzoejEMMbMAivmqJVs3Suvp9lU,4591
-reconcile/gitlab_housekeeping.py,sha256=yWNK4ejPyuRDFhtqElAIKEuiGneUmN4xgX9LiRTbM3Y,26056
+reconcile/gitlab_housekeeping.py,sha256=JEnerWbirICkJQy91ZVepcHge2XWrVUazfIeKnZ94ZQ,26345
 reconcile/gitlab_labeler.py,sha256=BA2dbXsN9hErUwJl22qcxfeH7XiPCuQ9LN3NddWdnpo,4540
 reconcile/gitlab_members.py,sha256=yRZOZqwB9_FJ5DWIFEod6hoG0X38z36atInNshAWddI,8263
 reconcile/gitlab_mr_sqs_consumer.py,sha256=i_MDVfA3Uk_TJiNkfEJzhO6_rwR7z3I3dH9oEw686U4,2681
@@ -72,7 +72,7 @@ reconcile/openshift_prometheus_rules.py,sha256=onowXab248zmHH8SbYDTc1W1bl7JiqRFU
 reconcile/openshift_resourcequotas.py,sha256=yUi56PiOn3inMMfq_x_FEHmaW-reGipzoorjdar372g,2415
 reconcile/openshift_resources.py,sha256=I2nO_C37mG3rfyGrd4cGwN3mVseVGuTAHAyhFzLyqF4,1518
 reconcile/openshift_resources_base.py,sha256=728-5nEmWMviSnhQH-EbEp_876VI2PGgC8LnrIfbD3U,42890
-reconcile/openshift_rhcs_certs.py,sha256=obaklp0i-FsmFhY6y7K4bGHKkAUbb86GqqEaYrBo9-4,9985
+reconcile/openshift_rhcs_certs.py,sha256=wty5ayzcIebe4-Vlkf1Zi3UzVqBU8WUtYmsOiYviWNs,10070
 reconcile/openshift_rolebindings.py,sha256=9mlJ2FjWUoH-rsjtasreA_hV-K5Z_YR00qR_RR60OZM,6555
 reconcile/openshift_routes.py,sha256=fXvuPSjcjVw1X3j2EQvUAdbOepmIFdKk-M3qP8QzPiw,1075
 reconcile/openshift_saas_deploy.py,sha256=T1dvb9zajisaJNjbnR6-AZHU-itscHtr4oCqLj8KCK0,13037
@@ -803,7 +803,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y,894
-qontract_reconcile-0.10.2.dev224.dist-info/METADATA,sha256=W3Bf8U-jYuU4vmo0bGfEFaWsoWUiQWDY2nmeQBHvr6U,24431
-qontract_reconcile-0.10.2.dev224.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev224.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev224.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev226.dist-info/METADATA,sha256=bGNtcchcffnsilIn9PgEoNm2KuX18QtvVovsxSIbS1c,24431
+qontract_reconcile-0.10.2.dev226.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev226.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev226.dist-info/RECORD,,

reconcile/gitlab_housekeeping.py

@@ -213,9 +213,10 @@ def verify_on_demand_tests(
         if not dry_run and state_change:
             markdown_report = (
                 f"On-demand Tests: \n\n For latest [commit]({commit.web_url}) You will need to pass following test jobs to get this MR merged.\n\n"
-                f"Add comment with `/test [test_name]` to trigger the tests.\n\n"
+                f"Add a comment with `/test [test_name]` to trigger a test; multiple tests can be triggered from the same comment: repeat the `/test [test_name]` command separated by lines.\n\n"
             )
-            markdown_report += f"* {', '.join(remaining_tests)}\n"
+            markdown_report += f"* {', '.join(remaining_tests)}\n\n"
+            markdown_report += "An update of the MR will reset the on-demand tests. Consider running them once the MR is REVIEWED and no more code changes are required.\n\n"
             gl.delete_merge_request_comments(mr, startswith="On-demand Tests:")
             gl.add_comment_to_merge_request(mr, markdown_report)
             state.add(state_key, remaining_tests, force=True)

reconcile/openshift_rhcs_certs.py

@@ -35,7 +35,7 @@ from reconcile.utils.rhcsv2_certs import RhcsV2Cert, generate_cert
 from reconcile.utils.runtime.integration import DesiredStateShardConfig
 from reconcile.utils.secret_reader import create_secret_reader
 from reconcile.utils.semver_helper import make_semver
-from reconcile.utils.vault import SecretNotFound, _VaultClient
+from reconcile.utils.vault import SecretNotFound, VaultClient
 
 QONTRACT_INTEGRATION = "openshift-rhcs-certs"
 QONTRACT_INTEGRATION_VERSION = make_semver(1, 9, 3)
@@ -115,12 +115,12 @@ def cert_expires_within_threshold(
 def get_vault_cert_secret(
     ns: NamespaceV1,
     cert_resource: NamespaceOpenshiftResourceRhcsCertV1,
-    vault: _VaultClient,
+    vault: VaultClient,
     vault_base_path: str,
 ) -> dict | None:
     vault_cert_secret = None
     try:
-        vault_cert_secret = vault.read_all({
+        vault_cert_secret = vault.read_all({  # type: ignore[attr-defined]
             "path": f"{vault_base_path}/{ns.cluster.name}/{ns.name}/{cert_resource.secret_name}"
         })
     except SecretNotFound:
@@ -134,7 +134,7 @@ def generate_vault_cert_secret(
     dry_run: bool,
     ns: NamespaceV1,
     cert_resource: NamespaceOpenshiftResourceRhcsCertV1,
-    vault: _VaultClient,
+    vault: VaultClient,
     vault_base_path: str,
     issuer_url: str,
     ca_cert_url: str,
@@ -142,7 +142,7 @@ def generate_vault_cert_secret(
     logging.info(
         f"Creating cert with service account credentials for '{cert_resource.service_account_name}'. cluster='{ns.cluster.name}', namespace='{ns.name}', secret='{cert_resource.secret_name}'"
     )
-    sa_password = vault.read(cert_resource.service_account_password.dict())
+    sa_password = vault.read(cert_resource.service_account_password.dict())  # type: ignore[attr-defined]
     if dry_run:
         rhcs_cert = RhcsV2Cert(
             certificate="PLACEHOLDER_CERT",
@@ -162,7 +162,7 @@ def generate_vault_cert_secret(
         logging.info(
             f"Writing cert details to Vault at {vault_base_path}/{ns.cluster.name}/{ns.name}/{cert_resource.secret_name}"
         )
-        vault.write(
+        vault.write(  # type: ignore[attr-defined]
             secret={
                 "data": rhcs_cert.dict(by_alias=True),
                 "path": f"{vault_base_path}/{ns.cluster.name}/{ns.name}/{cert_resource.secret_name}",
@@ -176,7 +176,7 @@ def fetch_openshift_resource_for_cert_resource(
     dry_run: bool,
     ns: NamespaceV1,
     cert_resource: NamespaceOpenshiftResourceRhcsCertV1,
-    vault: _VaultClient,
+    vault: VaultClient,
     rhcs_settings: RhcsProviderSettingsV1,
 ) -> OR:
     vault_base_path = f"{rhcs_settings.vault_base_path}/{QONTRACT_INTEGRATION}"
@@ -217,7 +217,7 @@ def fetch_desired_state(
     ri: ResourceInventory,
     query_func: Callable,
 ) -> None:
-    vault = _VaultClient()
+    vault = VaultClient()
     cert_provider = get_rhcs_provider_settings(query_func=query_func)
 
     for ns in namespaces: