qontract-reconcile 0.10.1rc1165__py3-none-any.whl → 0.10.1rc1167__py3-none-any.whl

{qontract_reconcile-0.10.1rc1165.dist-info → qontract_reconcile-0.10.1rc1167.dist-info}/METADATA

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

@@ -29,7 +29,7 @@ reconcile/github_repo_invites.py,sha256=3GOBGZq1DKMIuyYsDxHqXDnMTWlJfeu248-m3ajf
 reconcile/github_repo_permissions_validator.py,sha256=dcbXdUx6imjNchjp3pg9-z1i7lFEGOr_28GvsiwO5Xw,1734
 reconcile/github_users.py,sha256=nfTq78QRONIfDVj-5O3bD6psllJjzWFnog-EJ1WqFPU,3672
 reconcile/github_validator.py,sha256=cVTVxJIGR4a1Jz8wrdXEAb_CMpXUzvykVmUURX4cook,917
-reconcile/gitlab_fork_compliance.py,sha256=5joAIGOOLhHme1ipa7ZQeQkUOVe3dKbRO1wJtTwyNR4,4178
+reconcile/gitlab_fork_compliance.py,sha256=c7UfqSAsW04c1bWJmXXaQDwtUcG4Kb6nCJAyRU2uAuw,4449
 reconcile/gitlab_housekeeping.py,sha256=D0DOqC-xuMBMct04_MI8Lq32OAi_QMvvGLOz_E-77Dw,22482
 reconcile/gitlab_labeler.py,sha256=4xJHmVX155fclrHqkR926sL1GH6RTN5XfZ8PnqNXbRA,4534
 reconcile/gitlab_members.py,sha256=PrJE9OhDRdGG_gHM_77nQojLb4B18jtUu8DxgLsRS88,8417
@@ -727,7 +727,7 @@ reconcile/utils/state.py,sha256=W0_awkLAPX18hNOF_60o73tkPxDUylqbzYNHfl_sDsk,1638
 reconcile/utils/structs.py,sha256=LcbLEg8WxfRqM6nW7NhcWN0YeqF7SQzxOgntmLs1SgY,352
 reconcile/utils/template.py,sha256=wTvRU4AnAV_o042tD4Mwls2dwWMuk7MKnde3MaCjaYg,331
 reconcile/utils/terraform_client.py,sha256=LjX2U2E0Dglt2S_KA5jWQ_dVC8sPn4FEAh0xW_d6JTk,35953
-reconcile/utils/terrascript_aws_client.py,sha256=9-3mmZtiIrpu_uZrPPtSWgf-elbAG6jeureCUzkWQO4,283459
+reconcile/utils/terrascript_aws_client.py,sha256=k2N_ojFPhiPwI0KdkPpfgboq7D9OgledxTSwKarHpKM,283460
 reconcile/utils/three_way_diff_strategy.py,sha256=oQcHXd9LVhirJfoaOBoHUYuZVGfyL2voKr6KVI34zZE,4833
 reconcile/utils/throughput.py,sha256=iP4UWAe2LVhDo69mPPmgo9nQ7RxHD6_GS8MZe-aSiuM,344
 reconcile/utils/vault.py,sha256=pi0PuyopvCq1gW0cldvy1-Ff6bqLUlCKC2MW0sifvSE,15043
@@ -880,8 +880,8 @@ tools/test/test_qontract_cli.py,sha256=iuzKbQ6ahinvjoQmQLBrG4shey0z-1rB6qCgS8T6d
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 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.1rc1165.dist-info/METADATA,sha256=WgrEVc7k3o_Wv9JDkjYEymjXxq-jl9KYmgVKaDf1WMI,2213
-qontract_reconcile-0.10.1rc1165.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1165.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1165.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1165.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1167.dist-info/METADATA,sha256=-KUvwqzuEkYD_mXI8afbG7E0vT8PLKe4l31VW7ay1oI,2213
+qontract_reconcile-0.10.1rc1167.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1167.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1167.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1167.dist-info/RECORD,,

reconcile/gitlab_fork_compliance.py

@@ -5,8 +5,12 @@ from gitlab import GitlabGetError
 from gitlab.const import MAINTAINER_ACCESS
 
 from reconcile import queries
+from reconcile.typed_queries.app_interface_vault_settings import (
+    get_app_interface_vault_settings,
+)
 from reconcile.utils.gitlab_api import GitLabApi
 from reconcile.utils.mr.labels import BLOCKED_BOT_ACCESS
+from reconcile.utils.secret_reader import create_secret_reader
 
 LOG = logging.getLogger(__name__)
 
@@ -38,10 +42,11 @@ class GitlabForkCompliance:
         self.maintainers_group = maintainers_group
 
         self.instance = queries.get_gitlab_instance()
-        self.settings = queries.get_app_interface_settings()
+        vault_settings = get_app_interface_vault_settings()
+        self.secret_reader = create_secret_reader(use_vault=vault_settings.vault)
 
         self.gl_cli = GitLabApi(
-            self.instance, project_id=project_id, settings=self.settings
+            self.instance, project_id=project_id, secret_reader=self.secret_reader
         )
         self.mr = self.gl_cli.get_merge_request(mr_id)
 
@@ -94,7 +99,7 @@ class GitlabForkCompliance:
             self.src = GitLabApi(
                 self.instance,
                 project_id=self.mr.source_project_id,
-                settings=self.settings,
+                secret_reader=self.secret_reader,
             )
         except GitlabGetError:
             self.handle_error("access denied for user {bot}", MSG_ACCESS)

reconcile/utils/terrascript_aws_client.py

@@ -2433,7 +2433,7 @@ class TerrascriptClient:  # pylint: disable=too-many-public-methods
         values = {}
         values["name"] = identifier
 
-        action = ["s3:*Object"]
+        action = ["s3:*Object*"]
         if common_values.get("acl", "private") == "public-read":
             action.append("s3:PutObjectAcl")
         allow_object_tagging = common_values.get("allow_object_tagging", False)