qontract-reconcile 0.10.1rc1112__py3-none-any.whl → 0.10.1rc1114__py3-none-any.whl

{qontract_reconcile-0.10.1rc1112.dist-info → qontract_reconcile-0.10.1rc1114.dist-info}/METADATA

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

@@ -677,7 +677,6 @@ reconcile/utils/external_resource_spec.py,sha256=bhH_xneFwATdFumTPkiQmcVKYI0gcaW
 reconcile/utils/external_resources.py,sha256=GC4wYuSXwk2ifr3aDEwnEiumaYqWhzgKK-hXp6pXemA,7516
 reconcile/utils/filtering.py,sha256=S4PbMHuFr3ED0P2Q_ea5CAaB7FimI62B-F5YTaKrphA,402
 reconcile/utils/git.py,sha256=wzVIYAeKlMGW538U1mkJWUI6h_mFRUY4lawh2AR8hw4,2345
-reconcile/utils/git_secrets.py,sha256=y1rEhwA8DyDpBSAEuhMS7Y2X3mpxT2zQ4zyDFkhLe_g,1936
 reconcile/utils/github_api.py,sha256=R8OvqyPdnRqvP-Efnv9RvIcbBlb4M0KC4RlbnJMD0Tg,2426
 reconcile/utils/gitlab_api.py,sha256=C1nsHQKKybsmFdaG9vsItBjJm69ym4VWbqbKfAEf7oY,29305
 reconcile/utils/gpg.py,sha256=EKG7_fdMv8BMlV5yUdPiqoTx-KrzmVSEAl2sLkaKwWI,1123
@@ -703,7 +702,7 @@ reconcile/utils/oc.py,sha256=AjwQnzLxnMv0ML70GfjTHeYmiNsztI8kgXQF3N0Hvfw,66088
 reconcile/utils/oc_connection_parameters.py,sha256=7DiEGo--TJelfYoZXJFyTBPeTw9kXL3L58vy2fiJnes,9643
 reconcile/utils/oc_filters.py,sha256=Tz3OwtbUaYKmxENFls5CtPVzkZDeFXknw53dJe-wbT8,1382
 reconcile/utils/oc_map.py,sha256=U8cYhiaZsomkofzbIjVrl7E7crRxkS2JKsFpVeeHVE8,8964
-reconcile/utils/ocm_base_client.py,sha256=t5xwO-atG3e64tiMFLF5Szzcq1KLYf4g7g294YmaeMo,6332
+reconcile/utils/ocm_base_client.py,sha256=ntBCtm-njkGsI_wMpdLk5iLukbKz1zKNyo4rCWlKxFU,6427
 reconcile/utils/openshift_resource.py,sha256=ZyQ436YdV80nvKGPuzYyYLLJj8Abjnb3e_PsejxBTNM,24715
 reconcile/utils/openssl.py,sha256=QVvhzhpChq_4Daf_5wE1qeZJr4thg3DDjJPn4bOPD4E,365
 reconcile/utils/output.py,sha256=xh2Not-Xm97KeRx_J5nc2PP5tDwpDLZBeCrWI0S-al4,2034
@@ -870,8 +869,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 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.1rc1112.dist-info/METADATA,sha256=jkBPZb4lP4Bc1Mkkf2qwJBozeU5pM6FhMy6qy3vCsz8,2213
-qontract_reconcile-0.10.1rc1112.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1112.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1112.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1112.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1114.dist-info/METADATA,sha256=vn63-28mfgbBR3tbkdYLhiq552vpOX4DGe0LqDP4rZQ,2213
+qontract_reconcile-0.10.1rc1114.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1114.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1114.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1114.dist-info/RECORD,,

reconcile/utils/ocm_base_client.py

@@ -142,7 +142,11 @@ class OCMBaseClient:
     def delete(self, api_path: str):
         ocm_request.labels(verb="DELETE", client_id=self._access_token_client_id).inc()
         r = self._session.delete(f"{self._url}{api_path}", timeout=REQUEST_TIMEOUT_SEC)
-        r.raise_for_status()
+        try:
+            r.raise_for_status()
+        except Exception:
+            logging.error(r.text)
+            raise
 
     def close(self) -> None:
         self._session.close()

reconcile/utils/git_secrets.py

@@ -1,63 +0,0 @@
-import logging
-import os
-import subprocess
-import tempfile
-
-import requests
-from sretoolbox.utils import retry
-
-from reconcile.utils import git
-
-
-@retry()
-def scan_history(repo_url, existing_keys):
-    logging.info(f"scanning {repo_url}")
-    if requests.get(repo_url, timeout=60).status_code == 404:
-        logging.info(f"not found {repo_url}")
-        return []
-
-    with tempfile.TemporaryDirectory() as wd:
-        git.clone(repo_url, wd)
-        subprocess.run(["git", "secrets", "--install"], check=False, cwd=wd)
-        result = subprocess.run(
-            ["git", "secrets", "--scan-history"],
-            capture_output=True,
-            check=False,
-            cwd=wd,
-        )
-        if result.returncode == 0:
-            return []
-        logging.info(f"found suspects in {repo_url}")
-        suspected_files = get_suspected_files(result.stderr.decode("utf-8"))
-        leaked_keys = get_leaked_keys(wd, suspected_files, existing_keys)
-        if leaked_keys:
-            logging.info(f"found suspected leaked keys: {leaked_keys}")
-        return leaked_keys
-
-
-def get_suspected_files(error):
-    suspects = []
-    for e in error.split("\n"):
-        if not e:
-            break
-        if e.startswith("warning"):
-            continue
-        commit_path_split = e.split(" ")[0].split(":")
-        commit, path = commit_path_split[0], commit_path_split[1]
-
-        suspects.append((commit, path))
-    return set(suspects)
-
-
-def get_leaked_keys(repo_wd, suspected_files, existing_keys):
-    all_leaked_keys = []
-    for s in suspected_files:
-        commit, file_relative_path = s[0], s[1]
-        git.checkout(commit, repo_wd)
-        file_path = os.path.join(repo_wd, file_relative_path)
-        with open(file_path, encoding="locale") as f:
-            content = f.read()
-        leaked_keys = [key for key in existing_keys if key in content]
-        all_leaked_keys.extend(leaked_keys)
-
-    return all_leaked_keys