qontract-reconcile 0.10.1rc188__py3-none-any.whl → 0.10.1rc190__py3-none-any.whl

{qontract_reconcile-0.10.1rc188.dist-info → qontract_reconcile-0.10.1rc190.dist-info}/METADATA

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

@@ -281,7 +281,7 @@ reconcile/rhidp/ocm_oidc_idp/integration.py,sha256=YXhvTLDQr1GoAja6plXg1LXWDJ_YA
 reconcile/rhidp/ocm_oidc_idp/metrics.py,sha256=mfk4grSmH8zfA6Oz5Q4L76Uh1Ip6HlqUl23ap2vWlRE,591
 reconcile/rhidp/ocm_oidc_idp/standalone.py,sha256=DZA2m7se5vG3m05DFtUTRjD0lSfY1OQx2evG2kXi9Zc,3494
 reconcile/rhidp/sso_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/rhidp/sso_client/base.py,sha256=QpQKrphmlyMT3EQUHj2RmCDjSQNTrBPKoi9fKrL09Mg,8463
+reconcile/rhidp/sso_client/base.py,sha256=6ovVq9XMmLCQgue6JmUyT-B49X18C4UAN5q6yMetGdI,8742
 reconcile/rhidp/sso_client/integration.py,sha256=oXpO2G4vM74pr0NS4XSUJb1vRKRDOyXmWAhG5v3-IHE,2023
 reconcile/rhidp/sso_client/metrics.py,sha256=Tq7tSOsqL3XdcPUdozxqzSPIodUeOV87UCTqpuuqqhw,1013
 reconcile/rhidp/sso_client/standalone.py,sha256=Iv3HA0RdUn8WIs4XVlb0ZVjJ_H2zrXJMts_RILdvGqE,3115
@@ -612,8 +612,8 @@ tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sd_app_sre_alert_report.py,sha256=JeLhgzpKCPgLvptwg_4ZvJHLVWKNG1T5845HXTkMBxA,1826
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc188.dist-info/METADATA,sha256=2IlfKQE9ICVEfin5Ct_orxOXkA5d4t3RqU9YLdx6Cps,2320
-qontract_reconcile-0.10.1rc188.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.10.1rc188.dist-info/entry_points.txt,sha256=Af70EWPJxsTiCNF6gA-pWdw1A0Heqn-PZF-oBc5NmiU,302
-qontract_reconcile-0.10.1rc188.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc188.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc190.dist-info/METADATA,sha256=LvZZ7p74Igl6QP3VtQwAhYxztt2CRFMT4sp7uFGDmz8,2320
+qontract_reconcile-0.10.1rc190.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.10.1rc190.dist-info/entry_points.txt,sha256=Af70EWPJxsTiCNF6gA-pWdw1A0Heqn-PZF-oBc5NmiU,302
+qontract_reconcile-0.10.1rc190.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc190.dist-info/RECORD,,

reconcile/rhidp/sso_client/base.py

@@ -35,6 +35,13 @@ DesiredSSOClients = dict[str, tuple[ClusterV1, ClusterAuthOIDCV1]]
 
 def console_url_to_oauth_url(console_url: str, auth_name: str) -> str:
     """Convert a console URL to an OAuth callback URL."""
+    if console_url.startswith("https://console-openshift-console.apps.rosa."):
+        # ROSA cluster
+        return urljoin(
+            console_url.replace("console-openshift-console.apps.rosa", "oauth"),
+            f"/oauth2callback/{auth_name}",
+        )
+    # OSD cluster
     return urljoin(
         console_url.replace("console-openshift-console", "oauth-openshift"),
         f"/oauth2callback/{auth_name}",