qontract-reconcile 0.10.2.dev67__py3-none-any.whl → 0.10.2.dev69__py3-none-any.whl

{qontract_reconcile-0.10.2.dev67.dist-info → qontract_reconcile-0.10.2.dev69.dist-info}/METADATA

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

@@ -142,7 +142,7 @@ reconcile/aus/version_gates/sts_version_gate_handler.py,sha256=swwwz0YyvrEBf_Inq
 reconcile/aws_account_manager/README.md,sha256=_XFM3GZNHUzv--e_navqJuaUWpjC6QrHfulreHynFf0,262
 reconcile/aws_account_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aws_account_manager/integration.py,sha256=WOE_mi45pvJW4TNKh4mCGSViJiElH--T4Wg0CLMYxpY,14988
-reconcile/aws_account_manager/merge_request_manager.py,sha256=fz9s1VrBGHi0MdUR9D1Pqo7Q2lHlzbgzgYEE4kEYm9s,3950
+reconcile/aws_account_manager/merge_request_manager.py,sha256=q8t-YwD4y_4UpxdoG9TQrEbDpjlzasOQIynFoCjP2OE,3947
 reconcile/aws_account_manager/metrics.py,sha256=YB10ea4kIGwJfs5N14RF-RoXPb-QQWaDBz1jLZ3YWE0,917
 reconcile/aws_account_manager/reconciler.py,sha256=8mwwcWVVNoUzmttzxgnLyePqN823v1t_dQCNCrx1mG0,15035
 reconcile/aws_account_manager/utils.py,sha256=iYPPOtbZ7FiKkz9v5f1YXRIHw5YFOtSavUkF8oMwfJY,1439
@@ -159,7 +159,7 @@ reconcile/aws_version_sync/integration.py,sha256=BUVUC90cNVjFPVpGKxGY9b9x-TRVHDE
 reconcile/aws_version_sync/utils.py,sha256=x-45QT7zAwdNvCg7w_qJNwLaksFcfz1_6KQoD_0IVuA,1727
 reconcile/aws_version_sync/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/aws_version_sync/merge_request_manager/merge_request.py,sha256=2FbqLLdqxycWNvX1eNbwMjWSVBb7q0p-8t5Db0m7b4Q,4842
-reconcile/aws_version_sync/merge_request_manager/merge_request_manager.py,sha256=3bRpw7DluiYw3daRg0yAyCSGYf39Ru0d8lUjoepDSpU,5525
+reconcile/aws_version_sync/merge_request_manager/merge_request_manager.py,sha256=7EwpSMsAYk41yEqb3uB_EjU73qqWeF28c7UTuQaNjUQ,5522
 reconcile/change_owners/README.md,sha256=NEXVw4SioTWTGo9elSQUjqY10RIUoisl4zkzEBvly8s,3946
 reconcile/change_owners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/change_owners/approver.py,sha256=Z3_11vnK2WNOxjEEXVDh0224-_-qbt9d6mBeVE-7fsc,2259
@@ -193,7 +193,7 @@ reconcile/dynatrace_token_provider/validate.py,sha256=40_9QmHoB3-KBc0k_0D4QO00Pp
 reconcile/endpoints_discovery/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/endpoints_discovery/integration.py,sha256=fzy5tv4c_6WoAZGGBNJ276NVNB1OESuSJMhZh4-ZNm8,14711
 reconcile/endpoints_discovery/merge_request.py,sha256=_yLb4tnvoZMCko8rta2C_CvOInJa9pa3HzSmHNtjgGU,2978
-reconcile/endpoints_discovery/merge_request_manager.py,sha256=wUMsumxv8RnWaRattax4HfoRlhtVzmgro3GiJJ1C4Vc,6392
+reconcile/endpoints_discovery/merge_request_manager.py,sha256=a8zTIQIpRrUwXexZClwpQnnkEoS6XNZLJziI9x7ly0s,6389
 reconcile/external_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/external_resources/aws.py,sha256=wzN3GHxyqVa4Lqqg5HdogqNW2RM532t0ZiKaQeVGOL4,10968
 reconcile/external_resources/factories.py,sha256=C0QHT0soEv6z99-ELAAE19S5MaMHhV0t1fSiQn0Coc4,5970
@@ -464,7 +464,7 @@ reconcile/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=
 reconcile/saas_auto_promotions_manager/merge_request_manager/batcher.py,sha256=R2CRtjdOggY5lSqt-A5qz2ymqomx4opVeVV_oqBAW0A,7804
 reconcile/saas_auto_promotions_manager/merge_request_manager/desired_state.py,sha256=isY8frVsL3PlcdZmdZ4O0qyp76oczl4DUMX9uMArs5Y,1222
 reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request.py,sha256=BeAJWLow7b4HQyZ9zz398sQkPeIz8chpMkCts2NU27c,1282
-reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py,sha256=PBvMnnrIT_DGkoVyOU8xwnzZUiuwrHOc1OFSXuAfjDo,6381
+reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py,sha256=wNOsdo7L8IWZa50oE0fA7ib_mFXKCZHe4DmJ1mW5KWY,6378
 reconcile/saas_auto_promotions_manager/merge_request_manager/metrics.py,sha256=sdHp71Wl87tFM-Z_QvqvdHhyrppFLGi4ekksCi_e_bs,977
 reconcile/saas_auto_promotions_manager/merge_request_manager/mr_parser.py,sha256=gG4HuQGgZnPC9xtvQzjVYAuWWBWWVYSZpOo50_ebuhg,8620
 reconcile/saas_auto_promotions_manager/merge_request_manager/open_merge_requests.py,sha256=-qGQOh6Jdp4lomNDij3zWVC0pl6uPHFWS5Woqcp5HQk,410
@@ -501,11 +501,11 @@ reconcile/templating/lib/rendering.py,sha256=IzTbXJ5cO0c9mV6P9HrstOo79ovOcoNVtmy
 reconcile/terraform_init/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/terraform_init/integration.py,sha256=glQ9uy8Kj2aTQXCAupwSFeih7reX_xMX_UuWW_ywBMU,6100
 reconcile/terraform_init/merge_request.py,sha256=3CYtgSd7Q9zjKg4wsDz437EPCRfGeZZ8fZ0Y-ChKXJY,1475
-reconcile/terraform_init/merge_request_manager.py,sha256=fMcT6hbdEF3nFATJpvr8BedvQHq_MzFkgVJSloBNwOQ,3101
+reconcile/terraform_init/merge_request_manager.py,sha256=TQmtHq4DH-xgyYvuRyGu7VEgjPU2Yjj-uexIy-L7i88,3098
 reconcile/terraform_vpc_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/terraform_vpc_resources/integration.py,sha256=8pmcr0YTrW2QynenMCfaaXT4SV8SbH_eXx1OCyh0anA,8181
 reconcile/terraform_vpc_resources/merge_request.py,sha256=loRymUigCIvaaT0s_NzktZchh-DGRQnCICdBSCAcFPY,1503
-reconcile/terraform_vpc_resources/merge_request_manager.py,sha256=Vj2nuQbQyrL4q_il1My-bLxYNh_r3YXqX45P8fwtP6Q,3259
+reconcile/terraform_vpc_resources/merge_request_manager.py,sha256=6jfwgbqXEFQlgLM6zmModpOkQX8wqddpoE0pZJL1Acc,3256
 reconcile/typed_queries/__init__.py,sha256=rRk4CyslLsBr4vAh1pIPgt6s3P4R1M9NSEPLnyQgBpk,61
 reconcile/typed_queries/alerting_services_settings.py,sha256=YKQd60O_2C_H103nLrYgcUInndM2vFypqW_NO706L2E,833
 reconcile/typed_queries/app_interface_custom_messages.py,sha256=bgSAJEzqee8aiPVCj_bIIqb4VTkrF0-vti1dos7ebEg,684
@@ -637,12 +637,12 @@ reconcile/utils/state.py,sha256=az4tBmZ0EdbFcAGiBVUxs3cr2-BVWsuDQiNTvjjQq8s,1637
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
 reconcile/utils/terraform_client.py,sha256=H8frsS370y8xfivKLNBD1dwlBLHvfuR6JSN_syBL5Qc,36033
-reconcile/utils/terrascript_aws_client.py,sha256=hPfWduAsMpVUcYgw1cx7tiAyVmsJ1BdTCqPzyYPTThE,286260
+reconcile/utils/terrascript_aws_client.py,sha256=n22HESuN24UVT9g0cEqLWqy1n6_RnCTGSQqt-Sg39Qw,286203
 reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/vault.py,sha256=aSA8l9cJlPUHpChFGl27nSY-Mpq9FMjBo7Dcgb1BVfM,15036
 reconcile/utils/vaultsecretref.py,sha256=0KUSzuvTRxPyKY919TO3-B_eYg4_76fzKvMF8j5s1G0,911
-reconcile/utils/vcs.py,sha256=fcNwWlhrknxg3QUs8BZ23wxTe3ISS7GFZxwFUZZG-wg,8718
+reconcile/utils/vcs.py,sha256=YtjR3E_VaS7lA4ROzSr7hte-8G-SZ_UmJP5RJ2DCyJk,8807
 reconcile/utils/acs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/acs/base.py,sha256=4UsDrCpAOuddL3PKNuIQYoJP1BtZQNNB8_KEX0lXneg,2532
 reconcile/utils/acs/notifiers.py,sha256=nHVw9C_2-K4nv5zq26jlOTSw1roY6TKlovi1sOfpxpI,4998
@@ -777,7 +777,7 @@ tools/saas_promotion_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 tools/saas_promotion_state/saas_promotion_state.py,sha256=UfwwRLS5Ya4_Nh1w5n1dvoYtchQvYE9yj1VANt2IKqI,3925
 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.dev67.dist-info/METADATA,sha256=Nyd438BM7Sf5HGgYKflFl_4LLGDU4l0YQ-4r5AYn5DM,24665
-qontract_reconcile-0.10.2.dev67.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-qontract_reconcile-0.10.2.dev67.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
-qontract_reconcile-0.10.2.dev67.dist-info/RECORD,,
+qontract_reconcile-0.10.2.dev69.dist-info/METADATA,sha256=__Xodwd_e1SiI9n8rqIwezBhNtoH4c6JYPZvxk3vxl4,24665
+qontract_reconcile-0.10.2.dev69.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+qontract_reconcile-0.10.2.dev69.dist-info/entry_points.txt,sha256=5i9l54La3vQrDLAdwDKQWC0iG4sV9RRfOb1BpvzOWLc,698
+qontract_reconcile-0.10.2.dev69.dist-info/RECORD,,

reconcile/aws_account_manager/merge_request_manager.py

@@ -85,7 +85,7 @@ class MergeRequestManager:
             return None
 
         try:
-            self._vcs.get_file_content_from_app_interface_master(
+            self._vcs.get_file_content_from_app_interface_ref(
                 file_path=account_tmpl_file_path
             )
             # File already exists. nothing to do.

reconcile/aws_version_sync/merge_request_manager/merge_request_manager.py

@@ -116,7 +116,7 @@ class MergeRequestManager(MergeRequestManagerBase[AVSInfo]):
             return None
 
         try:
-            content = self._vcs.get_file_content_from_app_interface_master(
+            content = self._vcs.get_file_content_from_app_interface_ref(
                 file_path=namespace_file
             )
         except GitlabGetError as e:

reconcile/endpoints_discovery/merge_request_manager.py

@@ -149,7 +149,7 @@ class MergeRequestManager(MergeRequestManagerBase[EPDInfo]):
         )
         for app in apps:
             try:
-                content = self._vcs.get_file_content_from_app_interface_master(
+                content = self._vcs.get_file_content_from_app_interface_ref(
                     file_path=app.path
                 )
             except GitlabGetError as e:

reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager_v2.py

@@ -83,7 +83,7 @@ class MergeRequestManagerV2:
             if sub.target_file_path not in content_by_path:
                 try:
                     content_by_path[sub.target_file_path] = (
-                        self._vcs.get_file_content_from_app_interface_master(
+                        self._vcs.get_file_content_from_app_interface_ref(
                             file_path=sub.target_file_path
                         )
                     )

reconcile/terraform_init/merge_request_manager.py

@@ -78,7 +78,7 @@ class MergeRequestManager(MergeRequestManagerBase[Info]):
             return None
 
         try:
-            self._vcs.get_file_content_from_app_interface_master(file_path=data.path)
+            self._vcs.get_file_content_from_app_interface_ref(file_path=data.path)
             # the file exists, nothing to do
             return None
         except GitlabGetError as e:

reconcile/terraform_vpc_resources/merge_request_manager.py

@@ -83,7 +83,7 @@ class MergeRequestManager(MergeRequestManagerBase[Info]):
             return None
 
         try:
-            self._vcs.get_file_content_from_app_interface_master(file_path=data.path)
+            self._vcs.get_file_content_from_app_interface_ref(file_path=data.path)
             # the file exists, nothing to do
             return None
         except GitlabGetError as e:

reconcile/utils/terrascript_aws_client.py

@@ -5179,13 +5179,13 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
         return {condition_type_key: {"values": condition[condition_type_key]}}
 
     @staticmethod
-    def _get_principal_for_s3_bucket_policy(
-        region: str, elb_account_id: str | None
-    ) -> Mapping[str, str]:
+    def _get_principal_for_s3_bucket_policy(region: str) -> Mapping[str, str]:
         if region in AWS_ELB_ACCOUNT_IDS:
-            return {"AWS": f"arn:aws:iam::{elb_account_id}:root"}
+            return {"AWS": f"arn:aws:iam::{AWS_ELB_ACCOUNT_IDS[region]}:root"}
         if region in AWS_US_GOV_ELB_ACCOUNT_IDS:
-            return {"AWS": f"arn:aws-us-gov:iam::{elb_account_id}:root"}
+            return {
+                "AWS": f"arn:aws-us-gov:iam::{AWS_US_GOV_ELB_ACCOUNT_IDS[region]}:root"
+            }
         return {"Service": "logdelivery.elasticloadbalancing.amazonaws.com"}
 
     def populate_tf_resource_alb(self, spec, ocm_map=None):
@@ -5305,8 +5305,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
             region = str(
                 common_values.get("region") or self.default_regions.get(account)
             )
-            elb_account_id = self._get_elb_account_id(region)
-            principal = self._get_principal_for_s3_bucket_policy(region, elb_account_id)
+            principal = self._get_principal_for_s3_bucket_policy(region)
 
             policy = {
                 "Version": "2012-10-17",

reconcile/utils/vcs.py

@@ -216,14 +216,17 @@ class VCS:
             self._app_interface_api.close(mr)
             self._app_interface_api.delete_branch(source_branch)
 
-    def get_file_content_from_app_interface_master(self, file_path: str) -> str:
-        file_path = (
-            f"data/{file_path.lstrip('/')}"
-            if not file_path.startswith("data")
-            else file_path
-        )
+    def get_file_content_from_app_interface_ref(
+        self, file_path: str, ref: str = "master", is_data: bool = True
+    ) -> str:
+        if is_data:
+            file_path = (
+                f"data/{file_path.lstrip('/')}"
+                if not file_path.startswith("data")
+                else file_path
+            )
         return (
-            self._app_interface_api.project.files.get(file_path=file_path, ref="master")
+            self._app_interface_api.project.files.get(file_path=file_path, ref=ref)
             .decode()
             .decode("utf-8")
         )