qontract-reconcile 0.10.1rc1166__py3-none-any.whl → 0.10.1rc1168__py3-none-any.whl

{qontract_reconcile-0.10.1rc1166.dist-info → qontract_reconcile-0.10.1rc1168.dist-info}/METADATA

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

@@ -48,7 +48,7 @@ reconcile/jenkins_webhooks_cleaner.py,sha256=JsN_NVPfZJwv1JtSzZXDIHUqGiefL-DRffF
 reconcile/jenkins_worker_fleets.py,sha256=PMNGOX0krubFjInPiFT0za0KCiWBLEcVDuXdKRd1BrE,5378
 reconcile/jira_permissions_validator.py,sha256=t8FBjBJniRMODQNXfoHKst6qLDOzlua6hqy7rm7tmzs,13222
 reconcile/jira_watcher.py,sha256=L_UL2MKm2SoIGNsCLThm28pnqCkoFc154JWsD6bURug,3593
-reconcile/ldap_users.py,sha256=uEWQ0V41tN9KCZi4ZKPamjrJ6djSpdpvDBo7yJ0e7ZI,3008
+reconcile/ldap_users.py,sha256=7hdO5CAPl-VNBvDRmKHg13LoblHXXPt7YEKNGomAoGg,3158
 reconcile/mr_client_gateway.py,sha256=WhjMd-sIXDFCV8-rt8CEjurJ5OYB1pOD0K3o0tZRXQg,1885
 reconcile/ocm_additional_routers.py,sha256=KfcFDVbNoc6n5dHWjYdAf1_DiVqVG6Tw23WLKoV8cdg,3306
 reconcile/ocm_addons.py,sha256=qqAyqRBRbdZQvAcjb-QlSVyRAyQBZk6iVlgnI4jyi7s,3353
@@ -94,7 +94,7 @@ reconcile/quay_mirror.py,sha256=mFp4Z5Nwl-DcFbbsJBOB8f9ldohFT-V67o868d5ux1s,1536
 reconcile/quay_mirror_org.py,sha256=utrJpJaKCs7U6WX6DODdfCeB0EmX-lUC8Y5fkmpgFSs,10764
 reconcile/quay_permissions.py,sha256=9KOutS1w4RFQqkvMSy54VtsKNx56-phzP6yI_rEW-B8,4244
 reconcile/quay_repos.py,sha256=cuEYG0HUe0ut5yvLdEwOF5-CmccpXQHRb_wDazvDrvQ,6895
-reconcile/queries.py,sha256=04Xkm1wVg803ukZ_28Ud6AeiLJGVihl4f_UVoERv9uU,51509
+reconcile/queries.py,sha256=RF3lGuwo_Y6J_NDdb7XN4s9vBWxHPzfTzw_8mCZcwLQ,51542
 reconcile/query_validator.py,sha256=MSh5pKLBksws4AqfuvT8nrIGucIbqX-IOzYyPYTLO7k,1491
 reconcile/requests_sender.py,sha256=914iluuF4UVgG3VyxxtnHOu4yf6YKS2fIy6PViSsFTQ,3875
 reconcile/resource_scraper.py,sha256=znXCHrU7YwPfKuxGBiUrV7T1tYtn4vlz9qmZlfy6Flg,2307
@@ -527,7 +527,7 @@ reconcile/test/test_integrations_manager.py,sha256=xpyQAVz57wAbovrcQzAeuyq8VzdIt
 reconcile/test/test_jenkins_worker_fleets.py,sha256=o1jlT7OBBSgu0M3iI4xMdz_x6SciF7yhNBpLk5gTJfg,2361
 reconcile/test/test_jira_permissions_validator.py,sha256=zhtAL97IkCyY9R29fDRvDCE1z9S7OVQV7gqu-7Vo5-4,16279
 reconcile/test/test_jump_host.py,sha256=EeHMhT5rTZgx__R_29mtCBWt-NZCcKsQ6CR-B3xmCps,3284
-reconcile/test/test_ldap_users.py,sha256=8jjzVgoiRRylGad6-TvkugoFGXt3eko--zVVKjmZDn4,3812
+reconcile/test/test_ldap_users.py,sha256=_clylG-Qfes8yNb9T3CMaDQovLwyVZlTfJgRtGHARgE,4080
 reconcile/test/test_make.py,sha256=zTdjgq-3idFlec_0qJenk9wWw0QMLvSpJfPsptXmync,677
 reconcile/test/test_ocm_additional_routers.py,sha256=vX_O5js8PDTXU2mLD89tcMBqdpDKRNFWwxBB_UKP3Cc,4206
 reconcile/test/test_ocm_clusters.py,sha256=QDieDrP7pjH7jw5pFcZkUGx1lUhd2Cdg8BM0bRnhhI8,24322
@@ -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
@@ -786,7 +786,7 @@ reconcile/utils/mr/notificator.py,sha256=cp80wFzu_ZzrJPye7L1pI0H6JRGb7hOGuNxJYUq
 reconcile/utils/mr/ocm_update_recommended_version.py,sha256=p_aVP0TGrlKk9WBwgQnYWqUDsED_Hg6G5Bqj0UvtRwA,1536
 reconcile/utils/mr/ocm_upgrade_scheduler_org_updates.py,sha256=ojnIjw-8vRnmCCxOGBOEgPZLH4nC1hcuef74LWw2Rpk,3004
 reconcile/utils/mr/promote_qontract.py,sha256=wgvX2CBlcZaihKJSXJ0zcEK8NGaEP2_DUQDz0STzGes,7158
-reconcile/utils/mr/user_maintenance.py,sha256=cHPBn8zrReWLHalyk-EFdkFJe9zjVjRoZhT4t2zZfGE,3956
+reconcile/utils/mr/user_maintenance.py,sha256=ZlR1Id_r2BUXsoerJW-0Ioh5bcbwlnQxBBhSs-ri9Dk,5099
 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=iL_uMN03URDisWHpsaGGto_pLx652epUkuld_9ctx5o,14555
@@ -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.1rc1166.dist-info/METADATA,sha256=ru93sln6IVHsJ8rmuUw2C1jLSzNMey-obelfXbhXBvU,2213
-qontract_reconcile-0.10.1rc1166.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1166.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1166.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1166.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1168.dist-info/METADATA,sha256=S5PpMUixHxBbTgNxlV_1wOQVEw9FKiyt5Tw4H9p0Uuc,2213
+qontract_reconcile-0.10.1rc1168.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1168.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1168.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1168.dist-info/RECORD,,

reconcile/ldap_users.py

@@ -37,6 +37,9 @@ def init_users() -> list[dict[str, list]]:
         for a in user.get("aws_accounts", []):
             item = {"type": PathTypes.AWS_ACCOUNTS, "path": "data" + a["path"]}
             users[u].append(item)
+        for s in user.get("schedules"):
+            item = {"type": PathTypes.SCHEDULE, "path": "data" + s["path"]}
+            users[u].append(item)
 
     return [{"username": username, "paths": paths} for username, paths in users.items()]
 

reconcile/queries.py

@@ -1832,6 +1832,9 @@ USERS_QUERY = """
     gabi_instances {
       path
     }
+    schedules {
+      path
+    }
     {% endif %}
   }
 }

reconcile/test/test_ldap_users.py

@@ -14,6 +14,7 @@ def patched_queries_get_users(mocker):
             "requests": [{"path": "test_path1"}],
             "queries": [{"path": "another_test_path1"}],
             "gabi_instances": [{"path": "yet_another_test_path1"}],
+            "schedules": [{"path": "and_yet_another_test_path1"}],
             "path": "blah",
         },
         {
@@ -21,6 +22,7 @@ def patched_queries_get_users(mocker):
             "requests": [{"path": "test_path2"}],
             "queries": [{"path": "another_test_path2"}],
             "gabi_instances": [{"path": "yet_another_test_path2"}],
+            "schedules": [{"path": "and_yet_another_test_path2"}],
             "path": "blah",
         },
         {
@@ -28,6 +30,7 @@ def patched_queries_get_users(mocker):
             "requests": [{"path": "test_path3"}],
             "queries": [{"path": "another_test_path3"}],
             "gabi_instances": [{"path": "yet_another_test_path3"}],
+            "schedules": [{"path": "and_yet_another_test_path3"}],
             "path": "blah",
         },
     ]
@@ -100,6 +103,7 @@ def test_ldap_users_no_dry_run(
             {"path": "datatest_path3", "type": 1},
             {"path": "dataanother_test_path3", "type": 2},
             {"path": "datayet_another_test_path3", "type": 3},
+            {"path": "dataand_yet_another_test_path3", "type": 5},
         ],
     )
     assert patched_create_delete_user.method_calls[0][0] == "().submit"

reconcile/utils/mr/user_maintenance.py

@@ -1,3 +1,5 @@
+from pathlib import Path
+
 from ruamel import yaml
 
 from reconcile.utils.gitlab_api import GitLabApi
@@ -11,6 +13,7 @@ class PathTypes:
     QUERY = 2
     GABI = 3
     AWS_ACCOUNTS = 4
+    SCHEDULE = 5
 
 
 class CreateDeleteUserAppInterface(MergeRequestBase):
@@ -68,6 +71,24 @@ class CreateDeleteUserAppInterface(MergeRequestBase):
                             commit_message=self.title,
                             content=new_content,
                         )
+            elif path_type == PathTypes.SCHEDULE:
+                raw_file = gitlab_cli.project.files.get(file_path=path, ref=self.branch)
+                content = yaml.load(raw_file.decode(), Loader=yaml.RoundTripLoader)
+                delete_indexes: list[tuple[int, int]] = []
+                for schedule_index, schedule_record in enumerate(content["schedule"]):
+                    for user_index, user in enumerate(schedule_record["users"]):
+                        if self.username == Path(user["$ref"]).stem:
+                            delete_indexes.append((schedule_index, user_index))
+                for schedule_index, user_index in reversed(delete_indexes):
+                    del content["schedule"][schedule_index]["users"][user_index]
+                new_content = "---\n"
+                new_content += yaml.dump(content, Dumper=yaml.RoundTripDumper)
+                gitlab_cli.update_file(
+                    branch_name=self.branch,
+                    file_path=path,
+                    commit_message=self.title,
+                    content=new_content,
+                )
 
 
 class CreateDeleteUserInfra(MergeRequestBase):

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)