qontract-reconcile 0.10.2.dev272__py3-none-any.whl → 0.10.2.dev274__py3-none-any.whl

{qontract_reconcile-0.10.2.dev272.dist-info → qontract_reconcile-0.10.2.dev274.dist-info}/METADATA

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

@@ -53,7 +53,7 @@ reconcile/ocm_external_configuration_labels.py,sha256=dRWpFFPe_8tU91k8tCdiZRod_T
 reconcile/ocm_groups.py,sha256=gDnkhkYUEoMkI6y6ctyoKIFpJNS18SVnedW4OzJ8VWs,4174
 reconcile/ocm_machine_pools.py,sha256=KnTYAOw25N-QRb3Y7zbNY8w8xCR55WyqVjycYz24Yxk,17243
 reconcile/ocm_update_recommended_version.py,sha256=Vi3Y2sX-OQxx1mv_xiPQXnmrpsZzGIE38No0yBcTaD4,4204
-reconcile/ocm_upgrade_scheduler_org_updater.py,sha256=MmbQN4SALQRK6vBTJN-dsl_xKRGG1T3sZyCXP1GMA7s,4357
+reconcile/ocm_upgrade_scheduler_org_updater.py,sha256=2bYIGWqdfBTxeydfWh9-iLJwi3L4o9sDeLxLLLzHts4,4353
 reconcile/openshift_base.py,sha256=J4LbsUkvqA1G3JzVg-WsVOB9mtEKFfroFZxNcz_G1kM,53599
 reconcile/openshift_cluster_bots.py,sha256=Dgh7QhmPn1OKAHnzvmRI9kAvzdmuW7INNj11VmcT4Os,10934
 reconcile/openshift_clusterrolebindings.py,sha256=jwSaYQvUUY7noQGc148Dkqm6woYxvOEd1sume7k_sUk,6212
@@ -669,10 +669,10 @@ reconcile/utils/acs/base.py,sha256=4UsDrCpAOuddL3PKNuIQYoJP1BtZQNNB8_KEX0lXneg,2
 reconcile/utils/acs/policies.py,sha256=jpbi3qpGkBD_X6MfzsX12dPajUbmACmhIOz_0rDvYzs,5489
 reconcile/utils/acs/rbac.py,sha256=ugsLM9Pb7FbUbdq85E3VzXGMaB9ZovXob7tdWCxwqZ8,8808
 reconcile/utils/aws_api_typed/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/utils/aws_api_typed/account.py,sha256=4UfsVcOKIkR1b6bYlr6lcnYk5A6T-KZWUi1mZoLL40c,3376
+reconcile/utils/aws_api_typed/account.py,sha256=j73Oqd64UATP_FnAZ7VXh5KZ-pmhQ33CDdY1ULCBLgk,3283
 reconcile/utils/aws_api_typed/api.py,sha256=1h_dQXnE7FUAZi4RRgBEU7nbyAz8awRo0cpuilXyhHE,9239
 reconcile/utils/aws_api_typed/dynamodb.py,sha256=AKUbz8HGzmSq4cnpjJe7PgqsikMkjbpbzUD2UJv2b58,383
-reconcile/utils/aws_api_typed/iam.py,sha256=uuK5JzVmlWpokyixhd_Oy2pBr_31z_d4Gz7bPeDK71E,2864
+reconcile/utils/aws_api_typed/iam.py,sha256=-mpiFiIIMCbNzSi41CoLDk22CMDIi3ehxULiNCkKZ-w,2873
 reconcile/utils/aws_api_typed/organization.py,sha256=rmZkm14t30Bm0ctMTtCNzcDrTjOFkal1TO0pHncNxcg,5513
 reconcile/utils/aws_api_typed/s3.py,sha256=J2uOTtEFgMyKT22pa4DbFnV7zfg575m2DeidQaeselM,1034
 reconcile/utils/aws_api_typed/service_quotas.py,sha256=ywPligZTxGgDhJ4TjWzXg5MbQ4j1iGUxonngII_KOHo,3022
@@ -797,7 +797,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=oF7C4hpIgyMTwTRm3Aun3cDCHIjVar65JoLp6NcJHlU,3909
 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.dev272.dist-info/METADATA,sha256=z6bydm50DmpSTXJnqwc6F8Tmz081Uel-ykp827kXFx0,24501
-qontract_reconcile-0.10.2.dev272.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev272.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev272.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev274.dist-info/METADATA,sha256=AYJoixo8TpMAEPocBAGSY-B3HFEx1EDjIjQoP2ptGHA,24501
+qontract_reconcile-0.10.2.dev274.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev274.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev274.dist-info/RECORD,,

reconcile/ocm_upgrade_scheduler_org_updater.py

@@ -56,7 +56,7 @@ def run(dry_run: bool, gitlab_project_id: str | None) -> None:
         )
         ocm_name = ocm_info["name"]
         ocm_path = ocm_info["path"]
-        ocm = ocm_map.get(ocm_name)
+        ocm = ocm_map[ocm_name]
 
         for ocm_cluster_name, ocm_cluster_spec in ocm.clusters.items():
             found = [

reconcile/utils/aws_api_typed/account.py

@@ -8,7 +8,6 @@ if TYPE_CHECKING:
 else:
     AccountClient = AlternateContactTypeDef = object
 
-import botocore
 from pydantic import BaseModel
 
 
@@ -44,10 +43,7 @@ class AWSApiAccount:
                 Title=title,
                 PhoneNumber=phone_number,
             )
-        except botocore.exceptions.ClientError as e:
-            if e.response["Error"]["Code"] != "AccessDenied":
-                raise
-
+        except self.client.exceptions.AccessDeniedException:
             # This exception is raised if the user does not have permission to perform this action.
             # Let's see if the current security contact is already set to the same values.
             current_contact = self.get_security_contact()

reconcile/utils/aws_api_typed/iam.py

@@ -69,7 +69,7 @@ class AWSApiIam:
                     raise ValueError(
                         "Account alias already exists for another AWS account. Choose another one!"
                     ) from e
-            elif e.response["Error"]["Code"] == "AccessDenied":
+            elif e.response["Error"]["Code"] == "AccessDeniedException":
                 # AccessDeniedException can occur if the user does not have permission to create an account alias.
                 # This can happen if the alias is already set and we don't have permission to change it.
                 # If the existing alias is the one we want, we can ignore the error.