qontract-reconcile 0.10.1rc793__py3-none-any.whl → 0.10.1rc795__py3-none-any.whl

{qontract_reconcile-0.10.1rc793.dist-info → qontract_reconcile-0.10.1rc795.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc793
+Version: 0.10.1rc795
 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
@@ -46,7 +46,6 @@ Requires-Dist: kubernetes ~=24.0
 Requires-Dist: websocket-client <0.55.0,>=0.35
 Requires-Dist: sshtunnel >=0.4.0
 Requires-Dist: croniter <1.1.0,>=1.0.15
-Requires-Dist: transity-statuspageio <0.1,>=0.0.3
 Requires-Dist: pydantic ~=1.10.6
 Requires-Dist: MarkupSafe ==2.1.1
 Requires-Dist: filetype ~=1.2.0

{qontract_reconcile-0.10.1rc793.dist-info → qontract_reconcile-0.10.1rc795.dist-info}/RECORD

@@ -431,7 +431,7 @@ reconcile/skupper_network/models.py,sha256=DNTI7HZv-rqY42GIIxyRuvroHLvdH6rJerjIq
 reconcile/skupper_network/reconciler.py,sha256=XS-1oKBr_1l3dYUAVqUH6gCHg1G5ZuOfY_7fgGVAiFA,9996
 reconcile/skupper_network/site_controller.py,sha256=A3K-62BjJ5HiFVydV0ouGoD1NwrO7XhAH15BHAcS9fk,1550
 reconcile/statuspage/__init__.py,sha256=o9vR6sp3ARDQFZrbCEShelTxjF1XgfLaElK_QVt_248,261
-reconcile/statuspage/atlassian.py,sha256=IxtGHd4GXYlJ2Qt3k-MfylM-SIYS7DYaCpjtQvPAmbY,13758
+reconcile/statuspage/atlassian.py,sha256=1W9wQyO0B0qcw5Zrke8h7Rv9xhpXLyMezM7N-5XE8Dg,13665
 reconcile/statuspage/integration.py,sha256=---tzyl381RddAkIhXb7n3ySjUhuX7FBBI152SYsRfk,3654
 reconcile/statuspage/page.py,sha256=cJH2sDA8jiAmSdaDitQqNjkyDq_UP2w3s7eauCi-yt4,3740
 reconcile/statuspage/state.py,sha256=HD9EOoKm_nEqCMLIwW809En3cq5VhyzKJPUbsh-bae8,1617
@@ -770,7 +770,7 @@ tools/app_interface_metrics_exporter.py,sha256=zkwkxdAUAxjdc-pzx2_oJXG25fo0Fnyd5
 tools/app_interface_reporter.py,sha256=upA-J-n-HXHKVDINRuMR7vTt-iJvQORKUVi9D3leQto,17738
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=8kbBJk04mkq28kWoRDDkfCGIF3GRg3pJrFAh1sW0dbk,2821
-tools/qontract_cli.py,sha256=ilm3Ezw86rgFKLBgL-FV0xSRLHaFHfG0CKmYZfDe1VU,116022
+tools/qontract_cli.py,sha256=shVGUSDTqa8KO1H6P6YD4fpygQSzZuGxB-5MdhTtzUs,113982
 tools/sd_app_sre_alert_report.py,sha256=e9vAdyenUz2f5c8-z-5WY0wv-SJ9aePKDH2r4IwB6pc,5063
 tools/template_validation.py,sha256=-U-lTGeLaci8yWPEblCJeev2DOlY1jM9QOOh-O1zts8,3376
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -788,8 +788,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.1rc793.dist-info/METADATA,sha256=pa6ro62kS2lKnya9PY8ITjbQy-s8wAgrS-N65BECpL0,2364
-qontract_reconcile-0.10.1rc793.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc793.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc793.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc793.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc795.dist-info/METADATA,sha256=Ovpk0jb54wUWpHAZyy7CYWlvtanybjVhy_aS0MtypCM,2314
+qontract_reconcile-0.10.1rc795.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc795.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc795.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc795.dist-info/RECORD,,

reconcile/statuspage/atlassian.py

@@ -7,7 +7,6 @@ from typing import (
 )
 
 import requests
-import statuspageio  # type: ignore
 from pydantic import BaseModel
 from requests import Response
 from sretoolbox.utils import retry
@@ -49,14 +48,9 @@ class AtlassianAPI(Protocol):
     def delete_component(self, id: str) -> None: ...
 
 
-class LegacyLibAtlassianAPI:
+class AtlassianRESTAPI:
     """
-    This API class wraps the statuspageio python library for basic component operations.
-    This class is named Legacy for a couple reasons:
-    * the underlying library is not maintained anymore
-    * the library has no type annotated
-    * the library does not support pagination which becomes important for this API
-    Therefore this lib will be replaced by a think wrapper based on uplink in an upcoming PR.
+    This API class wraps the statuspageio REST API for basic component operations.
     """
 
     def __init__(self, page_id: str, api_url: str, token: str):
@@ -64,9 +58,6 @@ class LegacyLibAtlassianAPI:
         self.api_url = api_url
         self.token = token
         self.auth_headers = {"Authorization": f"OAuth {self.token}"}
-        self._client = statuspageio.Client(
-            api_key=self.token, page_id=self.page_id, organization_id="unset"
-        )
 
     @retry(max_attempts=10)
     def _do_get(self, url: str, params: dict[str, Any]) -> Response:
@@ -96,14 +87,22 @@ class LegacyLibAtlassianAPI:
         return all_components
 
     def update_component(self, id: str, data: dict[str, Any]) -> None:
-        self._client.components.update(id, **data)
+        url = f"{self.api_url}/v1/pages/{self.page_id}/components/{id}"
+        requests.patch(
+            url, json={"component": data}, headers=self.auth_headers
+        ).raise_for_status()
 
     def create_component(self, data: dict[str, Any]) -> str:
-        result = self._client.components.create(**data)
-        return result["id"]
+        url = f"{self.api_url}/v1/pages/{self.page_id}/components"
+        response = requests.post(
+            url, json={"component": data}, headers=self.auth_headers
+        )
+        response.raise_for_status()
+        return response.json()["id"]
 
     def delete_component(self, id: str) -> None:
-        self._client.components.delete(id)
+        url = f"{self.api_url}/v1/pages/{self.page_id}/components/{id}"
+        requests.delete(url, headers=self.auth_headers).raise_for_status()
 
 
 class AtlassianStatusPageProvider(StatusPageProvider):
@@ -364,7 +363,7 @@ def init_provider_for_page(
     """
     return AtlassianStatusPageProvider(
         page_name=page.name,
-        api=LegacyLibAtlassianAPI(
+        api=AtlassianRESTAPI(
             page_id=page.page_id,
             api_url=page.api_url,
             token=token,

tools/qontract_cli.py

@@ -32,7 +32,6 @@ from rich.console import (
 )
 from rich.table import Table
 from rich.tree import Tree
-from sretoolbox.utils import threaded
 
 import reconcile.aus.base as aus
 import reconcile.openshift_base as ob
@@ -1197,69 +1196,6 @@ def clusters_aws_account_ids(ctx):
     print_output(ctx.obj["options"], results, columns)
 
 
-@get.command()
-@click.pass_context
-def terraform_users_credentials(ctx) -> None:
-    credentials = []
-    state = init_state(integration="account-notifier")
-
-    skip_accounts, appsre_pgp_key, _ = tfu.get_reencrypt_settings()
-
-    if skip_accounts:
-        accounts, working_dirs, _, aws_api = tfu.setup(
-            False,
-            1,
-            skip_accounts,
-            account_name=None,
-            appsre_pgp_key=appsre_pgp_key,
-        )
-
-        tf = Terraform(
-            tfu.QONTRACT_INTEGRATION,
-            tfu.QONTRACT_INTEGRATION_VERSION,
-            tfu.QONTRACT_TF_PREFIX,
-            accounts,
-            working_dirs,
-            10,
-            aws_api,
-            init_users=True,
-        )
-        for account, output in tf.outputs.items():
-            if account in skip_accounts:
-                user_passwords = tf.format_output(output, tf.OUTPUT_TYPE_PASSWORDS)
-                console_urls = tf.format_output(output, tf.OUTPUT_TYPE_CONSOLEURLS)
-                for user_name, enc_password in user_passwords.items():
-                    item = {
-                        "account": account,
-                        "console_url": console_urls[account],
-                        "user_name": user_name,
-                        "encrypted_password": enc_password,
-                    }
-                    credentials.append(item)
-
-    secrets = state.ls()
-
-    def _get_secret(secret_key: str):
-        if secret_key.startswith("/output/"):
-            secret_data = state.get(secret_key[1:])
-            if secret_data["account"] not in skip_accounts:
-                return secret_data
-        return None
-
-    secret_result = threaded.run(
-        _get_secret,
-        secrets,
-        10,
-    )
-
-    for secret in secret_result:
-        if secret and secret["account"] not in skip_accounts:
-            credentials.append(secret)
-
-    columns = ["account", "console_url", "user_name", "encrypted_password"]
-    print_output(ctx.obj["options"], credentials, columns)
-
-
 @root.command()
 @click.argument("account_name")
 @click.pass_context