qontract-reconcile 0.10.2.dev305__py3-none-any.whl → 0.10.2.dev306__py3-none-any.whl

{qontract_reconcile-0.10.2.dev305.dist-info → qontract_reconcile-0.10.2.dev306.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qontract-reconcile
-Version: 0.10.2.dev305
+Version: 0.10.2.dev306
 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.dev305.dist-info → qontract_reconcile-0.10.2.dev306.dist-info}/RECORD

@@ -458,7 +458,7 @@ reconcile/oum/standalone.py,sha256=EN5y1S-3DwUZYzSRqRMtf63mI2slvBHKiU9zOTjYvWM,7
 reconcile/prometheus_rules_tester/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/prometheus_rules_tester/integration.py,sha256=TWsVBUeRLH3lUCf47sWWVgq4Rpkrq0i_eu2vkqQniP0,9619
 reconcile/rhidp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/rhidp/common.py,sha256=M5UP7_tNWh2LEJ-fMp1SnrNECGHJ0z873tANJK1dpWc,6889
+reconcile/rhidp/common.py,sha256=MIOzjObdvDtZuLvrYBp2GhvPfRp6p-Lohbr_hgEsNYM,7025
 reconcile/rhidp/metrics.py,sha256=Yp0GtpjhieEdru0qkG3osBTJiKUzg6CAjwPoFTQDnCg,417
 reconcile/rhidp/ocm_oidc_idp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/rhidp/ocm_oidc_idp/base.py,sha256=gcrQEmHQ2GF2MtSxBcxTRsK-I19rsfIn9NZvyx8ZbyQ,7133
@@ -721,7 +721,7 @@ reconcile/utils/mr/update_access_report_base.py,sha256=LOXTIonpfxXrvZI9nPqkszW3O
 reconcile/utils/mr/user_maintenance.py,sha256=OC9-3YkpXsYKZGsdOdx-NLq7AkjgrhDR2JL7hov7BV8,5669
 reconcile/utils/ocm/__init__.py,sha256=Y-bp8GomMpyCo0tFW6kJ78-ZG1UIupYRtBzbMWU0kwM,798
 reconcile/utils/ocm/addons.py,sha256=_LDdJ-gapM3s5exKlIUt-MlXZTAUoHezbYBU0QmvfWQ,7335
-reconcile/utils/ocm/base.py,sha256=fMzojq4aR_MWASp7QUWoyPOOgjqJoc_15uiJ3G7uRbw,14618
+reconcile/utils/ocm/base.py,sha256=sy8mD9srj5dJjRIk8u8RRmj_D7h4MnpxtZwm4S4BWf8,14883
 reconcile/utils/ocm/cluster_groups.py,sha256=F8oqVqN_4QUnGL0K61zZhoYIzJeP57EcmZpwmoV0mr4,1751
 reconcile/utils/ocm/clusters.py,sha256=ev-sT247P3qFs9wzxOs_xFj1vKGpdRYm4INgxTR3Fb0,7792
 reconcile/utils/ocm/identity_providers.py,sha256=dKed09N8iWmn39tI_MpwgVe47x23eLsknGbjMUxtwr4,2175
@@ -796,7 +796,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=uQv2QJAmUXP1g2GPIH30WTlvL9soY6m9lefpZEVDM5w,3965
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
 tools/sre_checkpoints/util.py,sha256=KcYVfa3UmJHVP_ocgrKe8NkrO5IDB9aWEDydSokPcRk,975
-qontract_reconcile-0.10.2.dev305.dist-info/METADATA,sha256=5AetTOzLA15dJYuCfvYgMy-ImHqxTgMIX8H7VQtNXUs,24916
-qontract_reconcile-0.10.2.dev305.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev305.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev305.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev306.dist-info/METADATA,sha256=Cx95zCcVgBXYiv2FQXbJOyJ-SCeSI75Q8VDK2I8x5pU,24916
+qontract_reconcile-0.10.2.dev306.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev306.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev306.dist-info/RECORD,,

reconcile/rhidp/common.py

@@ -140,6 +140,8 @@ def build_cluster_objects(
         for cluster in cluster_details
         # we can't calculate the redirect url w/o a console url
         if cluster.ocm_cluster.console
+        # we can't configure an identity provider if external auth is enabled
+        and not cluster.ocm_cluster.external_auth_enabled
     ]
 
 

reconcile/utils/ocm/base.py

@@ -215,6 +215,10 @@ class OCMExternalConfiguration(BaseModel):
     syncsets: dict
 
 
+class OCMExternalAuthConfig(BaseModel):
+    enabled: bool
+
+
 PRODUCT_ID_OSD = "osd"
 PRODUCT_ID_ROSA = "rosa"
 
@@ -274,6 +278,8 @@ class OCMCluster(BaseModel):
 
     external_configuration: OCMExternalConfiguration | None
 
+    external_auth_config: OCMExternalAuthConfig | None
+
     def minor_version(self) -> str:
         version_info = parse_semver(self.version.raw_id)
         return f"{version_info.major}.{version_info.minor}"
@@ -315,6 +321,10 @@ class OCMCluster(BaseModel):
     def base_domain(self) -> str | None:
         return self.dns.base_domain if self.dns else None
 
+    @property
+    def external_auth_enabled(self) -> bool:
+        return self.external_auth_config.enabled if self.external_auth_config else False
+
 
 class OCMLabel(BaseModel):
     """