qontract-reconcile 0.9.1rc162__py3-none-any.whl → 0.9.1rc164__py3-none-any.whl

{qontract_reconcile-0.9.1rc162.dist-info → qontract_reconcile-0.9.1rc164.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.9.1rc162
+Version: 0.9.1rc164
 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
@@ -17,7 +17,7 @@ Requires-Dist: Click (<9.0,>=7.0)
 Requires-Dist: gql (==3.1.0)
 Requires-Dist: toml (<0.11.0,>=0.10.0)
 Requires-Dist: jsonpath-rw (<1.5.0,>=1.4.0)
-Requires-Dist: PyGithub (<1.59,>=1.58)
+Requires-Dist: PyGithub (<1.56,>=1.55)
 Requires-Dist: hvac (<0.8.0,>=0.7.0)
 Requires-Dist: ldap3 (<2.10.0,>=2.9.1)
 Requires-Dist: anymarkup (<0.9.0,>=0.7.0)

{qontract_reconcile-0.9.1rc162.dist-info → qontract_reconcile-0.9.1rc164.dist-info}/RECORD

@@ -46,7 +46,7 @@ reconcile/gitlab_permissions.py,sha256=6ZXnSsEhoz-gSeUnBoU0t-4yAMuRggXzVE4tKtVca
 reconcile/gitlab_projects.py,sha256=io68p74nlcTLRrg0mpMenKsAp3nmhqFPXfM2ilprHvc,1700
 reconcile/integrations_manager.py,sha256=8AvlOUr2RwVPrb_OfGPC6zyWxL5NZBAHFRn6UYnXjAA,13937
 reconcile/integrations_validator.py,sha256=zvm_KpMLVusjv-4IAtm0GYAamS2_Z31ia56h0P9tOXM,422
-reconcile/jenkins_job_builder.py,sha256=pWgxViv4OkCAMm6wtwQuf-YrFJgwwaFcsgEWp4lNcBk,4058
+reconcile/jenkins_job_builder.py,sha256=hWIrTLGUhnfpbnaFAVrHcUqixYJFqKJPu-ZahCAGGY8,4023
 reconcile/jenkins_job_builds_cleaner.py,sha256=C7bCPyl1OKKFEBV_d-rgVe47K_VLC-wNCqfC1fyeW38,3230
 reconcile/jenkins_job_cleaner.py,sha256=-haVsulTDOTq519mwCsIjOD2hPcMtKZeicdUlrWLjvQ,1834
 reconcile/jenkins_plugins.py,sha256=m7bGrHqswUioC5-d2cw2lkUXatP7FrhDU42Ver9bSzs,3393
@@ -75,7 +75,7 @@ reconcile/ocm_upgrade_scheduler.py,sha256=z0qVYX1M5wEfSk5q5OTbKPezc6xZHQdy6zfyFS
 reconcile/ocm_upgrade_scheduler_org.py,sha256=3g696Y2p3iLNzqXqOD-nQmu6PkiZ13X9sB0GaKvgZ6w,1254
 reconcile/ocm_upgrade_scheduler_org_updater.py,sha256=KJgJJpSnfQSPP0sY3EfcPaUxhrqrGexSuwqzaUK1JZY,4004
 reconcile/ocp_release_mirror.py,sha256=5qVLz1WpJAs0miPyC1kmGcFoeEI3eA73E_p0-a_XvdI,13174
-reconcile/openshift_base.py,sha256=36kgARd-aPvIgL_mvW_CQrSLbi3-17npDNK_zt3cKwU,42489
+reconcile/openshift_base.py,sha256=eHEW6hrR0cAFRt4Z1vVm1n30T-x4PjF7wcJOKeUgyA4,42271
 reconcile/openshift_clusterrolebindings.py,sha256=cztreWXqrkxLgKvJGGWJg4ZleU1hxvY8Z6rRgCbyahc,5771
 reconcile/openshift_groups.py,sha256=C1L0tIWbXbpvQVCIoc6z9HMGixxWWx5EGmJtWv17s7w,9376
 reconcile/openshift_limitranges.py,sha256=SZkHhGS3m9oBUkzcclRiszfLEB7jQ8z8xh9P2Y8KTzg,3393
@@ -87,17 +87,17 @@ reconcile/openshift_resources.py,sha256=Lkn3KdIqxUCmOzlwoKjM2xVotTbJDfgjMGySvWtB
 reconcile/openshift_resources_base.py,sha256=AvUs4kJtFaBV9HGA1RvP0LjW0oBSr0AOsNwm6lrrwYM,40781
 reconcile/openshift_rolebindings.py,sha256=1k0o3hb3ZhhlbUjc8cP7IjKFux0oZApT8kLT8Y-pvqI,6579
 reconcile/openshift_routes.py,sha256=fXvuPSjcjVw1X3j2EQvUAdbOepmIFdKk-M3qP8QzPiw,1075
-reconcile/openshift_saas_deploy.py,sha256=mqgDmGHvQKcTGEcLbrceide8SDkxnGOJ4xPXCI4rxAA,9258
+reconcile/openshift_saas_deploy.py,sha256=URaGXvp5C4rrQS3rgBLS-Czw5eJadByvYh1wvbENajI,8710
 reconcile/openshift_saas_deploy_change_tester.py,sha256=gdEke-uNKv1v8vuveThCn8_zEdP-BpiltS_OugqDFhg,9105
-reconcile/openshift_saas_deploy_trigger_base.py,sha256=FSgtkOL0A5nVq8EbD3cHFvawI9GTLmKDBFGIwreIavU,14071
-reconcile/openshift_saas_deploy_trigger_cleaner.py,sha256=U1JsDxO2Sr0zY4lPpXJhbnLe-6trjedqtSrRiRnqLio,2740
+reconcile/openshift_saas_deploy_trigger_base.py,sha256=WARMn3elQ8TN0Z-9NKQLQZMhtSN2JO6iD3pRaaa44GY,13343
+reconcile/openshift_saas_deploy_trigger_cleaner.py,sha256=fbSO48dnIMPV6XKPDoPD0pEFrhHYWfZcmvQfxAwQ-Ps,2728
 reconcile/openshift_saas_deploy_trigger_configs.py,sha256=uWzUV5D5CW0frdi1ys7BObNg-rA-VZKlefd4TD_Z-pY,959
 reconcile/openshift_saas_deploy_trigger_images.py,sha256=Yl4lMtxqab-c04I2Ju8isAJuYuNTbHN01Bk3dF9nTos,967
 reconcile/openshift_saas_deploy_trigger_moving_commits.py,sha256=VqjwgRhA-yOSq0WFPqGIJVgYkdq_UrTHcVusBzOFgMY,973
 reconcile/openshift_saas_deploy_trigger_upstream_jobs.py,sha256=etfBGj7GDXTOhNHKc40ee5QM0Chq3oHE40HrbWgopc8,971
 reconcile/openshift_saas_deploy_wrapper.py,sha256=worob8HdaQ31kndkQoWXqD-wK2jAIa4IR5um6KRsyf4,1854
 reconcile/openshift_serviceaccount_tokens.py,sha256=UlBRjfAxzf9-h4uxQwHqrYnBWMUGFqqfp6KvW2lM76k,6369
-reconcile/openshift_tekton_resources.py,sha256=2BiTYkJqMqqrOdI6jxhLvTJQNWCeWpgxaz1v2LzU-Eo,13558
+reconcile/openshift_tekton_resources.py,sha256=nSJDPqL6Rl3jeUQKS6mFIqkWPdbXu_FNCeHER8w_GyY,13552
 reconcile/openshift_upgrade_watcher.py,sha256=4LtXziBS1tGfUiioGGzx6h7ZHXdGk97DSMLNblcGmHk,4843
 reconcile/openshift_users.py,sha256=dKWS3AVmgMKcblafHYz1pLVnTOp1ZzfePGQCaTpVc_8,5213
 reconcile/openshift_vault_secrets.py,sha256=Hy6pVWLsbEjxvn4S1k1zacbM447i5uDdyeT263-bNOI,1562
@@ -113,13 +113,13 @@ reconcile/query_validator.py,sha256=oLEZIAsQCzxmmZ7b9dSw-OKuEjpI1dbVu4XfCfjpmi8,
 reconcile/requests_sender.py,sha256=m00QET0mh6rys5r0y5uurZS7RIylXf04HU1dTdhjt0A,3791
 reconcile/resource_scraper.py,sha256=vo1N9vLJCYWvXlTwFRIpEuWjx_39ZV9zxJlpoPq4g3U,2330
 reconcile/saas_file_owners.py,sha256=w9U3HQNX5PXz0Rr6L07kFkFU1pj4DLCmRwEytScP2ks,11298
-reconcile/saas_file_validator.py,sha256=GCEFZyaioou58LUpE8ARHuGoYHns-56GGF6cEm_8TSI,1775
+reconcile/saas_file_validator.py,sha256=beNvXE0lDS3QlfYYVi2ydnJw8Z6bBw0VLQwvsEcEMhQ,1235
 reconcile/sendgrid_teammates.py,sha256=v7zdkhjn-1uD-n3dzCmpGu_zlHfG_7UHAD9zT7FBg1Y,4379
 reconcile/sentry_config.py,sha256=iIrjc3N8WTURb0UiB4gELoT6tk3EhlSqPJWD8-RKo3c,20262
 reconcile/sentry_helper.py,sha256=gBrLZmpXCmnk1q3Mn6f-Ir7mL34h7YTKfsk0mmc0IdU,2198
 reconcile/service_dependencies.py,sha256=L3GgAFGeqGxqh7_Fzt0L3geS4x2yAQz8zQ_wUiYmPXY,4654
 reconcile/signalfx_endpoint_monitoring.py,sha256=D1m8iq0EAKie0OD59FOcVCtpWWZ7xlo6lwBS9urwMIk,2894
-reconcile/slack_base.py,sha256=K3fSYx46G1djoPb07_C9j6ChhMCt5LgV5l6v2TFkNZk,3479
+reconcile/slack_base.py,sha256=bsVx9mwqFjBFGdG61QRQ77RjJKof9iXfduuQs4Fa-h4,3444
 reconcile/slack_usergroups.py,sha256=I9lj-DCPnsSxM0IofKry0vKiAVaLZSsT-gZGh2YW9rU,26841
 reconcile/sql_query.py,sha256=qnNPKwHIRz4rNMnFqMn0LHPiODkmUWi4qHfJVK08bVQ,22044
 reconcile/status.py,sha256=tRYtzPFsGETOfN57rcsLIJRl7cZVFkfQXNsUtoeJ7ns,545
@@ -157,7 +157,7 @@ reconcile/glitchtip/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 reconcile/glitchtip/integration.py,sha256=52TnE8OH3I-GMg7p3IvlbnV-ysgnGBM2Rt57Hi0KI7s,6216
 reconcile/glitchtip/reconciler.py,sha256=U0ywAmdKjBU8Y75_YJhKEbTUJmX0IDjHvgLDb31xXPY,11608
 reconcile/glitchtip_project_dsn/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/glitchtip_project_dsn/integration.py,sha256=Dg3NVrR5fnFJXJqqkPJy3Niil7aCOsD9JjCGgYVtcwU,7811
+reconcile/glitchtip_project_dsn/integration.py,sha256=IvFlSYumDPhUw7gLfFX1P8tg-7Vns0ot2-Nqf2_sE18,7997
 reconcile/gql_definitions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/change_owners/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/change_owners/queries/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -168,7 +168,6 @@ reconcile/gql_definitions/cna/queries/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCe
 reconcile/gql_definitions/cna/queries/cna_provisioners.py,sha256=daQw9Nqith1jaFFDXc68iFggPxq1WUCF8C54F-3WiDg,2653
 reconcile/gql_definitions/cna/queries/cna_resources.py,sha256=B8deNpCTpRDLuJIULT4zSArPocMTsYTdweOZj5wtGdc,2728
 reconcile/gql_definitions/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/common/app_code_component_repos.py,sha256=kWjhUj-_BQCYIbzxGXVJA0UbrWmNc8QXqubqMo8kdqU,1853
 reconcile/gql_definitions/common/app_interface_vault_settings.py,sha256=GEjbO_R9qSWy-tyLoSR8P1usQ3QPA8kxIofd507xJzs,1789
 reconcile/gql_definitions/common/clusters.py,sha256=5aPRj5ureg59tTD7E_xzni9fIqYh9tLcg3nz6iZW6cw,23942
 reconcile/gql_definitions/common/clusters_minimal.py,sha256=iYnAPQ7jDtEu06XgkDlltXa2_iJsp56rIfDqEYef-uM,5257
@@ -176,8 +175,6 @@ reconcile/gql_definitions/common/namespaces.py,sha256=HNu55aeBQUGr4JfjQFj8sGAE2S
 reconcile/gql_definitions/common/namespaces_minimal.py,sha256=0n9f2ldd_aEN9tzcqKvtzZ53ceH-1v411vVkD8wPaeY,3539
 reconcile/gql_definitions/common/pagerduty_instances.py,sha256=8NBHKRXg_OKG9NsJv6FOj8UVFcjkdJg-9E16ZqZIRPQ,2006
 reconcile/gql_definitions/common/pgp_reencryption_settings.py,sha256=tS68-tBBd7BJYmfTjtdTlxpABF3f_z9eJdtaKnyZc0Q,2305
-reconcile/gql_definitions/common/saas_files.py,sha256=oMR5w7GHxG5QgAzmbB1ZmtzTglwuxnPLNnerVp1JVwY,14975
-reconcile/gql_definitions/common/saasherder_settings.py,sha256=jxrFr03NmiwV3uegKCxQgB5iveC2IaGZIoguXoiNMgs,1797
 reconcile/gql_definitions/common/smtp_client_settings.py,sha256=Pb8VgTGFqCh4_rI0BOHoXuicfdNyol1kIN8NLONHaxI,2252
 reconcile/gql_definitions/common/users.py,sha256=C5EvC5gNBHqWuY4tvOG5oZUiFV4eognyu-KjBRsIkMM,1685
 reconcile/gql_definitions/dashdotdb_slo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -185,7 +182,6 @@ reconcile/gql_definitions/dashdotdb_slo/slo_documents_query.py,sha256=B7IoVDjyMm
 reconcile/gql_definitions/fragments/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/fragments/aws_infra_management_account.py,sha256=IuXBBDc0GHPvbw7TZcTM750L1gl8Rkqgf3Cco_YPe2w,1258
 reconcile/gql_definitions/fragments/jumphost_common_fields.py,sha256=yQYTbQs9yQDO9Vs-pv_99e_dSq48_SwUVpotRfFlihM,1038
-reconcile/gql_definitions/fragments/oc_connection_cluster.py,sha256=DoAYQLQXB-TYuQNLpnlNzzHYPzxAW64Fd9-94-1ZTLE,1623
 reconcile/gql_definitions/fragments/resource_values.py,sha256=DS3KqzgjT_wJ36SWPZ9HyNXOBNvbhhGnh06IMQmrFXQ,746
 reconcile/gql_definitions/fragments/user.py,sha256=6RVsHZVHjOrZKcH8rWGQG9V1OtPpACSZ3wNwca3H8pA,943
 reconcile/gql_definitions/fragments/vault_secret.py,sha256=pXbTPa-ptuT1L5HF83pEGMxhjRVA_b_wfGHS4NoZEW8,837
@@ -255,11 +251,11 @@ reconcile/templates/aws_access_key_email.j2,sha256=2MUr1ERmyISzKgHqsWYLd-1Wbl-pe
 reconcile/templates/email.yml.j2,sha256=R3zJrO8kV5RmEViSK9CdF7hH6Q-hdaEjeOkGuFUhXoI,513
 reconcile/templates/jira-checkpoint-missinginfo.j2,sha256=c_Vvg-lEENsB3tgxm9B6Y9igCUQhCnFDYh6xw-zcIbU,570
 reconcile/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/test/conftest.py,sha256=KxmkS055BlnzF0LaNbekFLLEsgYcrWOxULMi2zPAoV4,3251
+reconcile/test/conftest.py,sha256=zCGUR0Ej5_0ts1wNE4ahXC1-GdYQdtNT-Idk4RQFfkw,2719
 reconcile/test/fixtures.py,sha256=VhvLXH0AWXEyu3FgPp7bcSTPmDPfMEa2v-_9cd8dCmw,572
 reconcile/test/test_aggregated_list.py,sha256=iiWitQuNYC58aimWaiBoE4NROHjr1NCgQ91MnHEG_Ro,6412
 reconcile/test/test_amtool.py,sha256=vxRhGieeydMBOb9UI2ziMHjJa8puMeGNsUhGhy-yMnk,1032
-reconcile/test/test_auto_promoter.py,sha256=_TBlDpl2DjjoCYR-DwiS1DvsJo6qr2FyNjVmQlxlEsU,10405
+reconcile/test/test_auto_promoter.py,sha256=PH1g9kRENrTOYF9h1LM3vIq00uLl1F2CnFwht1igUHg,4278
 reconcile/test/test_aws_ami_share.py,sha256=eSITdDoXs8mMY7P2lFxAX2DA0sJ9RW6D1tG8Rek0gLE,1981
 reconcile/test/test_aws_iam_keys.py,sha256=MfE9EvItyPNPAl5QaLlJFUvvrZFiar518TM2wWNjJn4,1829
 reconcile/test/test_aws_iam_password_reset.py,sha256=fnkqB90adR7W4L4saNdrtIiwnQB9bXgqJ9R1CKxjSnk,860
@@ -304,8 +300,8 @@ reconcile/test/test_quay_repos.py,sha256=TdkcRF_a8PLp01Kti9eZZN-vGup2yPBT4Iba3k0
 reconcile/test/test_queries.py,sha256=jrc9OCGLGPrqX_XUSKHiOpIAVPHa1omYJ-Zy7a5Hk9U,2262
 reconcile/test/test_repo_owners.py,sha256=uRYMLbMmh-9usF0TerabZTZV-Z1CS4I6ybT-LQqCLe8,1423
 reconcile/test/test_requests_sender.py,sha256=7fd9C2kEFS0-CYtlsif66N1kO9c44pzuBPAJKR9igqU,5385
-reconcile/test/test_saasherder.py,sha256=wLUte46D8klMhAfhBIENgfgkzNLMSjzfT4x81tEe5hQ,33141
-reconcile/test/test_saasherder_allowed_secret_paths.py,sha256=L9xoTm2BF76RfMacGgi9bHUQ9RUsobIBU83Yh47xxK8,4914
+reconcile/test/test_saasherder.py,sha256=CDj2w2cWqMGqZfwzthlT4PMZ8vgKz1EXdGHcoh07Lvw,34141
+reconcile/test/test_saasherder_allowed_secret_paths.py,sha256=_fRNiu6NApgnzhkE7f3wY3svfezf7CZ5OZ64AY-ViB4,2522
 reconcile/test/test_secret_reader.py,sha256=kz7nzcPjvA08cytnvcA_PMA98AEyqJWsESkYeRn5xCk,4994
 reconcile/test/test_slack_base.py,sha256=UqMjYt4hPmStJfog06qwJM_afbf-E9uzy-GX741KgTY,5058
 reconcile/test/test_slack_usergroups.py,sha256=FxAuKIS1bx4LiVxNidvirpyHtiZepqMaW3aGxYJn0OI,23609
@@ -372,8 +368,6 @@ reconcile/typed_queries/namespaces.py,sha256=vItPrn7sfcHOix-VvkzQkf54_ljzI_ymyxh
 reconcile/typed_queries/namespaces_minimal.py,sha256=rUtqNQ0ORXXUTQfnpsMURymAJ4gYtE77V-Lb3LiJFEY,278
 reconcile/typed_queries/ocp_release_mirror.py,sha256=jwX29Tcdvov8oEDNkE4t1j-2Hz8QJrjg9ITppP-panQ,313
 reconcile/typed_queries/pagerduty_instances.py,sha256=QCHqEAakiH6eSob0Pnnn3IBd8Ga0zpEp1Z6Qu3v2uH4,733
-reconcile/typed_queries/repos.py,sha256=RKBsf7IDS6NsXTtXxJ9Ol9G3bxG9sr3vW9QQ2bahEHo,512
-reconcile/typed_queries/saas_files.py,sha256=ZCf_Zo1mXjpnsoSzogPSzzFATKkHZvJAsJVtZdQkwEk,2112
 reconcile/typed_queries/smtp.py,sha256=aSLglYa5bHKmlGwKkxq2RZqyMWuAf0a4S_mOuhDa084,542
 reconcile/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/utils/aggregated_list.py,sha256=svF8qu2U8iAIUPrGbKiMzuzz2RffI0GOJzWDxBDgSIQ,3332
@@ -430,6 +424,7 @@ reconcile/utils/promtool.py,sha256=G8Rar7sA85J8vrAgesaZdPaJ11M-RqdsgcSDUuNgWN8,2
 reconcile/utils/quay_api.py,sha256=EuOegpb-7ntEjkKLFwM2Oo4Nw7SyFtmyl3sQ9aXMtrM,8152
 reconcile/utils/raw_github_api.py,sha256=ZHC-SZuAyRe1zaMoOU7Krt1-zecDxENd9c_NzQYqK9g,2968
 reconcile/utils/repo_owners.py,sha256=j-pUjc9PuDzq7KpjNLpnhqfU8tUG4nj2WMhFp4ick7g,6629
+reconcile/utils/saasherder.py,sha256=RGUofmzjoECPbwupJAnAWLVZeXpyhmL0EM4-zGckpSQ,79380
 reconcile/utils/secret_reader.py,sha256=eHbFZIBtr7BZ3YIrHcVzxwqy-Xw_8RexVkhmZGSa2sg,10361
 reconcile/utils/semver_helper.py,sha256=4Rrkz9Cj9A6oHPVgA-nGj6MBoxlFT4eyxTcslWqow3I,771
 reconcile/utils/sentry_client.py,sha256=eJ8YrjKpgHGJYP38rDDETkUhT_fnJd-K34po4WHEXIU,11913
@@ -451,9 +446,9 @@ reconcile/utils/glitchtip/client.py,sha256=xra8V8R6p0NGISD5PWbl4uSIecoIm7xBqVTIL
 reconcile/utils/glitchtip/models.py,sha256=hZphtws-06IJUdd5uTpt22r8cv5Z4MLNE4OTo3zo6Lc,3800
 reconcile/utils/mr/__init__.py,sha256=O9Qlx8tnSncM0D8UjEQ-0ECZ8zs3FVd0w-h9P6OCMpQ,2444
 reconcile/utils/mr/app_interface_reporter.py,sha256=XCaM4p-kiBJtGfeDHl9RbgSx4glhsL3mimiEoGrNid0,1996
-reconcile/utils/mr/auto_promoter.py,sha256=AsFNOQWxOF2R19kJftpYXlsmiryDQCJxx3H83mMky3E,8331
+reconcile/utils/mr/auto_promoter.py,sha256=fr9xQP_qDZE0TVn2R9mo-ulspC1h9xAP3cDu7yzF3K4,7650
 reconcile/utils/mr/aws_access.py,sha256=2Qk0ph5S_iQpTQ5GcVrUTBOuFkw_T4rvIA5ThzUiV18,2719
-reconcile/utils/mr/base.py,sha256=0-HDFU4Gmze33FoRMe8kxAddLEOfZaMGtssaUto8KH4,6318
+reconcile/utils/mr/base.py,sha256=TJ1h26p-Ms1BhjyLAg7y_uQAfgI-Jsj77vKAqmcK9S4,6233
 reconcile/utils/mr/clusters_updates.py,sha256=WQ5HDlKmJqDaAdK8ZX3AN-9iKJpHt031LM2dC8s0IUI,2153
 reconcile/utils/mr/labels.py,sha256=RKg8_dSQBZBoRbU-a8VH90UTYmwjFH1GodLQDsRrcDE,525
 reconcile/utils/mr/notificator.py,sha256=MbXA7pgaB-CN1R1kY88MNQ27ZMXX56myqJY4jRSqDhQ,2419
@@ -466,10 +461,6 @@ reconcile/utils/runtime/environment.py,sha256=cJgCMRBeschdeKJuk_N6BhDWaOCZbo-41i
 reconcile/utils/runtime/integration.py,sha256=iUPlei8Kx1ulrN379i9k8b_Npw4zVTZa9u_d_y96eYU,10461
 reconcile/utils/runtime/meta.py,sha256=hQ_jHPY0zbyA08hzpfu4FzOw25NqMg_fgCr2r9gGXx8,246
 reconcile/utils/runtime/runner.py,sha256=yXWEQF5S8DAnEo6XDyJ8R8Z1Y8wi0ykL8_OKn3vzBQA,7546
-reconcile/utils/saasherder/__init__.py,sha256=J3MBZBFa5YmhqYm08QsjBXz8mFcVOCiOCkyIcw41t7E,343
-reconcile/utils/saasherder/interfaces.py,sha256=HAcSoGHacCNkNDcvKaYpnogVpWheL0wstDoygPsbVeU,8448
-reconcile/utils/saasherder/models.py,sha256=nAFwtSYMCCjDoT85R9JifKo4NOTrZ8wYWuvKO8n1u8s,4705
-reconcile/utils/saasherder/saasherder.py,sha256=gKve2Z-GXPuIb-Go3C6CtLTGgm5-6xYr4TQJ3_WgGIE,76569
 reconcile/utils/terraform/__init__.py,sha256=zNbiyTWo35AT1sFTElL2j_AA0jJ_yWE_bfFn-nD2xik,250
 reconcile/utils/terraform/config.py,sha256=5UVrd563TMcvi4ooa5JvWVDW1I3bIWg484u79evfV_8,164
 reconcile/utils/terraform/config_client.py,sha256=91611UNL4xFdoERiRRamb8Da55amV62kGlSws2JzVrE,4417
@@ -491,8 +482,8 @@ tools/sre_checkpoints/util.py,sha256=zEDbGr18ZeHNQwW8pUsr2JRjuXIPz--WAGJxZo9sv_Y
 tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.9.1rc162.dist-info/METADATA,sha256=uGjhqqC6Z7G3qeCgtExjPl4uYFeSgO9s-OQ2IbxdVfI,2259
-qontract_reconcile-0.9.1rc162.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.9.1rc162.dist-info/entry_points.txt,sha256=3BPvsRryM1C4S_mb5kXmP5AVv-wJBzVCrOJyv6qUmc0,195
-qontract_reconcile-0.9.1rc162.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
-qontract_reconcile-0.9.1rc162.dist-info/RECORD,,
+qontract_reconcile-0.9.1rc164.dist-info/METADATA,sha256=LcfNXIQP59di8kjIiUsOqFcH7S3wyZQiTH36PElzOkk,2259
+qontract_reconcile-0.9.1rc164.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.9.1rc164.dist-info/entry_points.txt,sha256=3BPvsRryM1C4S_mb5kXmP5AVv-wJBzVCrOJyv6qUmc0,195
+qontract_reconcile-0.9.1rc164.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
+qontract_reconcile-0.9.1rc164.dist-info/RECORD,,

reconcile/glitchtip_project_dsn/integration.py

@@ -117,6 +117,9 @@ def fetch_desired_state(
     for glitchtip_project in glitchtip_projects:
         org = Organization(name=glitchtip_project.organization.name)
         project = Project(name=glitchtip_project.name)
+        if project not in glitchtip_client.projects(organization_slug=org.slug):
+            logging.info(f"Project {project.name} does not exist (yet). Skipping.")
+            continue
         key = glitchtip_client.project_key(
             organization_slug=org.slug, project_slug=project.slug
         )

reconcile/jenkins_job_builder.py

@@ -7,10 +7,7 @@ from reconcile import queries
 from reconcile.utils import gql
 from reconcile.utils.defer import defer
 from reconcile.utils.jjb_client import JJB
-from reconcile.utils.secret_reader import (
-    SecretReader,
-    SecretReaderBase,
-)
+from reconcile.utils.secret_reader import SecretReader
 from reconcile.utils.state import init_state
 
 QUERY = """
@@ -71,7 +68,7 @@ def collect_configs(instance_name, config_name):
 
 
 def init_jjb(
-    secret_reader: SecretReaderBase,
+    secret_reader: SecretReader,
     instance_name: Optional[str] = None,
     config_name: Optional[str] = None,
     print_only: bool = False,

reconcile/openshift_base.py

@@ -310,17 +310,17 @@ def populate_current_state(
 
 
 def fetch_current_state(
-    namespaces: Optional[Iterable[Mapping]] = None,
-    clusters: Optional[Iterable[Mapping]] = None,
-    thread_pool_size: Optional[int] = None,
-    integration: Optional[str] = None,
-    integration_version: Optional[str] = None,
-    override_managed_types: Optional[Iterable[str]] = None,
-    internal: Optional[bool] = None,
-    use_jump_host: bool = True,
-    init_api_resources: bool = False,
-    cluster_admin: bool = False,
-) -> tuple[ResourceInventory, OC_Map]:
+    namespaces=None,
+    clusters=None,
+    thread_pool_size=None,
+    integration=None,
+    integration_version=None,
+    override_managed_types=None,
+    internal=None,
+    use_jump_host=True,
+    init_api_resources=False,
+    cluster_admin=False,
+):
     ri = ResourceInventory()
     settings = queries.get_app_interface_settings()
     oc_map = OC_Map(

reconcile/openshift_saas_deploy.py

@@ -1,7 +1,10 @@
 import logging
 import sys
 from collections.abc import Callable
-from typing import Optional
+from typing import (
+    Any,
+    Optional,
+)
 
 import reconcile.jenkins_plugins as jenkins_base
 import reconcile.openshift_base as ob
@@ -9,50 +12,45 @@ from reconcile import (
     mr_client_gateway,
     queries,
 )
-from reconcile.gql_definitions.common.saas_files import (
-    PipelinesProviderTektonV1,
-    SaasFileV2,
-)
 from reconcile.openshift_tekton_resources import build_one_per_saas_file_tkn_object_name
 from reconcile.slack_base import slackapi_from_slack_workspace
 from reconcile.status import ExitCodes
-from reconcile.typed_queries.app_interface_vault_settings import (
-    get_app_interface_vault_settings,
-)
-from reconcile.typed_queries.saas_files import (
-    get_saas_files,
-    get_saasherder_settings,
-)
 from reconcile.utils.defer import defer
 from reconcile.utils.gitlab_api import GitLabApi
 from reconcile.utils.openshift_resource import ResourceInventory
 from reconcile.utils.saasherder import SaasHerder
-from reconcile.utils.secret_reader import create_secret_reader
+from reconcile.utils.secret_reader import SecretReader
 from reconcile.utils.semver_helper import make_semver
 from reconcile.utils.slack_api import SlackApi
-from reconcile.utils.state import init_state
 
 QONTRACT_INTEGRATION = "openshift-saas-deploy"
 QONTRACT_INTEGRATION_VERSION = make_semver(0, 1, 0)
 
 
-def compose_console_url(saas_file: SaasFileV2, env_name: str) -> str:
-    if not isinstance(saas_file.pipelines_provider, PipelinesProviderTektonV1):
-        raise ValueError(
-            f"Unsupported pipelines_provider: {saas_file.pipelines_provider}"
-        )
-    pipeline_template_name = (
-        saas_file.pipelines_provider.defaults.pipeline_templates.openshift_saas_deploy.name
-        if not saas_file.pipelines_provider.pipeline_templates
-        else saas_file.pipelines_provider.pipeline_templates.openshift_saas_deploy.name
-    )
+def compose_console_url(
+    saas_file: dict[str, Any], saas_file_name: str, env_name: str
+) -> str:
+    pp = saas_file["pipelinesProvider"]
+    pp_ns = pp["namespace"]
+    pp_ns_name = pp_ns["name"]
+    pp_cluster = pp_ns["cluster"]
+    pp_cluster_console_url = pp_cluster["consoleUrl"]
+
+    pipeline_template_name = pp["defaults"]["pipelineTemplates"]["openshiftSaasDeploy"][
+        "name"
+    ]
+
+    if pp["pipelineTemplates"]:
+        pipeline_template_name = pp["pipelineTemplates"]["openshiftSaasDeploy"]["name"]
+
     pipeline_name = build_one_per_saas_file_tkn_object_name(
-        pipeline_template_name, saas_file.name
+        pipeline_template_name, saas_file_name
     )
+
     return (
-        f"{saas_file.pipelines_provider.namespace.cluster.console_url}/k8s/ns/{saas_file.pipelines_provider.namespace.name}/"
+        f"{pp_cluster_console_url}/k8s/ns/{pp_ns_name}/"
         + "tekton.dev~v1beta1~Pipeline/"
-        + f"{pipeline_name}/Runs?name={saas_file.name}-{env_name}"
+        + f"{pipeline_name}/Runs?name={saas_file_name}-{env_name}"
     )
 
 
@@ -93,37 +91,34 @@ def run(
     gitlab_project_id: Optional[str] = None,
     defer: Optional[Callable] = None,
 ) -> None:
-    vault_settings = get_app_interface_vault_settings()
-    secret_reader = create_secret_reader(use_vault=vault_settings.vault)
-
-    all_saas_files = get_saas_files()
-    saas_files = get_saas_files(saas_file_name, env_name)
+    all_saas_files = queries.get_saas_files()
+    saas_files = queries.get_saas_files(saas_file_name, env_name)
     if not saas_files:
         logging.error("no saas files found")
-        raise RuntimeError("no saas files found")
+        sys.exit(ExitCodes.ERROR)
 
     # notify different outputs (publish results, slack notifications)
     # we only do this if:
     # - this is not a dry run
     # - there is a single saas file deployed
     notify = not dry_run and len(saas_files) == 1
-    slack = None
     if notify:
         saas_file = saas_files[0]
-        if saas_file.slack:
+        slack_info = saas_file.get("slack")
+        if slack_info:
             if not saas_file_name or not env_name:
                 raise RuntimeError(
                     "saas_file_name and env_name must be provided "
                     + "when using slack notifications"
                 )
             slack = slackapi_from_slack_workspace(
-                saas_file.slack.dict(by_alias=True),
-                secret_reader,
+                slack_info,
+                SecretReader(queries.get_secret_reader_settings()),
                 QONTRACT_INTEGRATION,
                 init_usergroups=False,
             )
             ri = ResourceInventory()
-            console_url = compose_console_url(saas_file, env_name)
+            console_url = compose_console_url(saas_file, saas_file_name, env_name)
             if (
                 defer
             ):  # defer is provided by the method decorator. this makes just mypy happy
@@ -139,7 +134,8 @@ def run(
                     )
                 )
             # deployment start notification
-            if saas_file.slack.notifications and saas_file.slack.notifications.start:
+            slack_notifications = slack_info.get("notifications")
+            if slack_notifications and slack_notifications.get("start"):
                 slack_notify(
                     saas_file_name,
                     env_name,
@@ -148,9 +144,16 @@ def run(
                     console_url,
                     in_progress=True,
                 )
+        else:
+            slack = None
 
-    jenkins_map = jenkins_base.get_jenkins_map()
-    saasherder_settings = get_saasherder_settings()
+    # instance exists in v1 saas files only
+    desired_jenkins_instances = [
+        s["instance"]["name"] for s in saas_files if s.get("instance")
+    ]
+    jenkins_map = jenkins_base.get_jenkins_map(
+        desired_instances=desired_jenkins_instances
+    )
     settings = queries.get_app_interface_settings()
     try:
         instance = queries.get_gitlab_instance()
@@ -161,28 +164,26 @@ def run(
         gl = None
 
     saasherder = SaasHerder(
-        saas_files=saas_files,
+        saas_files,
         thread_pool_size=thread_pool_size,
+        gitlab=gl,
         integration=QONTRACT_INTEGRATION,
         integration_version=QONTRACT_INTEGRATION_VERSION,
-        secret_reader=secret_reader,
-        hash_length=saasherder_settings.hash_length,
-        repo_url=saasherder_settings.repo_url,
-        gitlab=gl,
+        settings=settings,
         jenkins_map=jenkins_map,
-        state=init_state(integration=QONTRACT_INTEGRATION, secret_reader=secret_reader),
+        initialise_state=True,
     )
     if len(saasherder.namespaces) == 0:
         logging.warning("no targets found")
         sys.exit(ExitCodes.SUCCESS)
 
     ri, oc_map = ob.fetch_current_state(
-        namespaces=[ns.dict(by_alias=True) for ns in saasherder.namespaces],
+        namespaces=saasherder.namespaces,
         thread_pool_size=thread_pool_size,
         integration=QONTRACT_INTEGRATION,
         integration_version=QONTRACT_INTEGRATION_VERSION,
         init_api_resources=True,
-        cluster_admin=bool(saasherder.cluster_admin),
+        cluster_admin=saasherder.cluster_admin,
         use_jump_host=use_jump_host,
     )
     if defer:  # defer is provided by the method decorator. this makes just mypy happy
@@ -208,7 +209,7 @@ def run(
         ri,
         thread_pool_size,
         caller=saas_file_name,
-        all_callers=[sf.name for sf in all_saas_files if not sf.deprecated],
+        all_callers=[sf["name"] for sf in all_saas_files if not sf["deprecated"]],
         wait_for_namespace=True,
         no_dry_run_skip_compare=(not saasherder.compare),
         take_over=saasherder.take_over,
@@ -247,13 +248,7 @@ def run(
     # - there is a single saas file deployed
     # - output is 'events'
     # - no errors were registered
-    if (
-        notify
-        and slack
-        and actions
-        and saas_file.slack
-        and saas_file.slack.output == "events"
-    ):
+    if notify and slack and actions and slack_info.get("output") == "events":
         for action in actions:
             message = (
                 f"[{action['cluster']}] "