qontract-reconcile 0.9.1rc235__py3-none-any.whl → 0.9.1rc236__py3-none-any.whl

{qontract_reconcile-0.9.1rc235.dist-info → qontract_reconcile-0.9.1rc236.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.9.1rc235
+Version: 0.9.1rc236
 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
@@ -55,7 +55,6 @@ Requires-Dist: deepdiff6 (==6.2.0)
 Requires-Dist: jsonpath-ng (~=1.5)
 Requires-Dist: networkx (~=2.8)
 Requires-Dist: mypy-boto3-s3 (~=1.24.94)
-Requires-Dist: rich (<14.0.0,>=13.3.0)
 Requires-Dist: dateparser (~=1.1.7)
 
 UNKNOWN

{qontract_reconcile-0.9.1rc235.dist-info → qontract_reconcile-0.9.1rc236.dist-info}/RECORD

@@ -83,8 +83,8 @@ reconcile/openshift_resources.py,sha256=Lkn3KdIqxUCmOzlwoKjM2xVotTbJDfgjMGySvWtB
 reconcile/openshift_resources_base.py,sha256=RUUySaSdb3fY9isyMG1QnPNHZz9yVypB6C-xa-id8oc,40820
 reconcile/openshift_rolebindings.py,sha256=1k0o3hb3ZhhlbUjc8cP7IjKFux0oZApT8kLT8Y-pvqI,6579
 reconcile/openshift_routes.py,sha256=fXvuPSjcjVw1X3j2EQvUAdbOepmIFdKk-M3qP8QzPiw,1075
-reconcile/openshift_saas_deploy.py,sha256=FyYzQ7YkEg_tIqH5ToaZD8T37eO3q_k0XWGx_2YpfME,9981
-reconcile/openshift_saas_deploy_change_tester.py,sha256=dwZ5m0LGGIe630Vxru0EpzAAi9gDRI6kympQn8KjmD8,9353
+reconcile/openshift_saas_deploy.py,sha256=5ELZi8pKji6XIS55aRwusLRNat-RQoSbmw9H1cMN5PM,9949
+reconcile/openshift_saas_deploy_change_tester.py,sha256=cu40xeo1kxNMNiNcPtKd_WKp1d0YC-4HKdqJwPlbuJk,9170
 reconcile/openshift_saas_deploy_trigger_base.py,sha256=sRrPAgnV9sjwTV7tCR2yULBsNrj6pIr2NIDGKt-f3V8,14315
 reconcile/openshift_saas_deploy_trigger_cleaner.py,sha256=iFIkmDnN-ZKeIInT_5lWPkjSPwhidzw1GCmdziaagUk,2935
 reconcile/openshift_saas_deploy_trigger_configs.py,sha256=uWzUV5D5CW0frdi1ys7BObNg-rA-VZKlefd4TD_Z-pY,959
@@ -103,7 +103,7 @@ reconcile/quay_mirror.py,sha256=9pwl1gLzRpsVXF5yPULM4ET_C5F8_xPmH8Mv8AS2AfI,1340
 reconcile/quay_mirror_org.py,sha256=E1OdRe-ppxTkNCwu20iVRhEdG1fPDBroLY02NgiMN7c,10381
 reconcile/quay_permissions.py,sha256=_3PCWjNWoU7VHlYgHzUevvL_jJmEMsWfXV_nzjeiyhU,4099
 reconcile/quay_repos.py,sha256=7609RBVQihis96FNOOe-i9tCTYwcTVy4WpKAL6HpnkU,7031
-reconcile/queries.py,sha256=BtW9hPeU0yOdgiH3ppUqstbT3jatzCCEatXeQKtwPJo,49063
+reconcile/queries.py,sha256=aqt-13egNqEoxceifYhEAMU0vqQmlYfo49Jqh2luG9g,54644
 reconcile/query_validator.py,sha256=oLEZIAsQCzxmmZ7b9dSw-OKuEjpI1dbVu4XfCfjpmi8,1503
 reconcile/requests_sender.py,sha256=914iluuF4UVgG3VyxxtnHOu4yf6YKS2fIy6PViSsFTQ,3875
 reconcile/resource_scraper.py,sha256=vo1N9vLJCYWvXlTwFRIpEuWjx_39ZV9zxJlpoPq4g3U,2330
@@ -183,8 +183,7 @@ reconcile/gql_definitions/common/ocm_environments.py,sha256=yV4UVjdnNmqbR5trQCOA
 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/pipeline_providers.py,sha256=6GgiGxV4Y25VTlfmhunFO_isU0gHKfid4L0YH9AGf80,9398
-reconcile/gql_definitions/common/saas_files.py,sha256=5vz1BY_w7JwW2DD3Spab5dfF1wbEhD9nIKPZ_RMOHEA,14788
-reconcile/gql_definitions/common/saas_target_namespaces.py,sha256=paFgL0lRih-caKXqh6HsDi9bD1o9g8OFYAIR5U-AdI4,2536
+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
@@ -198,7 +197,6 @@ reconcile/gql_definitions/fragments/oc_connection_cluster.py,sha256=DoAYQLQXB-TY
 reconcile/gql_definitions/fragments/ocm_environment.py,sha256=DOfBY4fb02UF5R3ZxtwHBTlxhPYOOBJaqGeENElX7oc,1037
 reconcile/gql_definitions/fragments/resource_requirements.py,sha256=p7bMDzeIMr008A_4skrZjXAwVXA4PtO2rX93iGBYqvk,732
 reconcile/gql_definitions/fragments/resource_values.py,sha256=DS3KqzgjT_wJ36SWPZ9HyNXOBNvbhhGnh06IMQmrFXQ,746
-reconcile/gql_definitions/fragments/saas_target_namespace.py,sha256=LSDaNWa2LNJiUsryeLHsn-mbh9gt2XktYP_XCEetUc0,1518
 reconcile/gql_definitions/fragments/upgrade_policy.py,sha256=73VyC3kbkZ_g3aXmhD016a0axoJxKlIJSGmcue1A2Ow,1077
 reconcile/gql_definitions/fragments/user.py,sha256=6RVsHZVHjOrZKcH8rWGQG9V1OtPpACSZ3wNwca3H8pA,943
 reconcile/gql_definitions/fragments/vault_secret.py,sha256=pXbTPa-ptuT1L5HF83pEGMxhjRVA_b_wfGHS4NoZEW8,837
@@ -223,7 +221,7 @@ reconcile/gql_definitions/openshift_groups/managed_roles.py,sha256=Q9U2hRiAZiCBE
 reconcile/gql_definitions/quay_membership/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/quay_membership/quay_membership.py,sha256=npj_e5xcDfUt_3sPlhZvRElcT2srT2EkBhtwQebKqz8,2842
 reconcile/gql_definitions/saas_auto_promotions_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/gql_definitions/saas_auto_promotions_manager/saas_files_for_auto_promotion.py,sha256=iHs93a7Mlz90LkXVEWlaqIp8OnJTjOUPFXSw7HTzBsw,4274
+reconcile/gql_definitions/saas_auto_promotions_manager/saas_files_for_auto_promotion.py,sha256=W_q90P72ngiPQaeF-pxmRQlI3tP2M2p1LvjhyadF5G8,4264
 reconcile/gql_definitions/service_dependencies/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/gql_definitions/service_dependencies/jenkins_instance_fragment.py,sha256=s2NzPeR0MABYKWp_t9PiAIgiNvVqxQRQvBkfGn1MZ9o,703
 reconcile/gql_definitions/service_dependencies/service_dependencies.py,sha256=OUjr8-S06vOBmVtTYygbucIms5CwV505q6ZaU8jdWl0,5004
@@ -266,7 +264,7 @@ reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manag
 reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=z0zXicF7mVMJuCmUoRt0LqvGPw6jjtuwa4GSik86-hs,3659
 reconcile/saas_auto_promotions_manager/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/utils/deployment_state.py,sha256=rJbYBD4Omq_ZLToSwKBuiE2B_TobTdvTm1pIUpqPuWQ,1349
-reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py,sha256=NmjIUIPOXlsF7neJBWPyPi8_PcMz2gtpcYIVt_aD6fs,8581
+reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py,sha256=IZvhroSPXwfLl3L8IaLpyAqJZM4zorWOOJJ1RXIKsYY,8383
 reconcile/saas_auto_promotions_manager/utils/vcs.py,sha256=f8fvlkssO73T2QDU_7959oIiNSKvvb6OfGJOg5ROa5c,4823
 reconcile/skupper_network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/skupper_network/integration.py,sha256=jF5uPhePnWq4axnxxarEQ_tw71WBxYoTZZUoi9JrZ6M,9831
@@ -332,8 +330,8 @@ reconcile/test/test_quay_repos.py,sha256=TdkcRF_a8PLp01Kti9eZZN-vGup2yPBT4Iba3k0
 reconcile/test/test_queries.py,sha256=SpH3RmNpBjEr_ne3VjAMCgKK8RE1z1zo7bypkT5uoO4,1946
 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=ozBRTN3b6HZAejBOL9tT9fi4Whb0bav_YuUYW0x9TeU,36854
-reconcile/test/test_saasherder_allowed_secret_paths.py,sha256=86ffYbbN0Xng8CTiXf3yR_3VD8qyqRpVTByJFycdXp0,4899
+reconcile/test/test_saasherder.py,sha256=0eH84fV-FBwMWM3McFp9T4oCcXyatOVl18hZyAmptEk,32861
+reconcile/test/test_saasherder_allowed_secret_paths.py,sha256=L9xoTm2BF76RfMacGgi9bHUQ9RUsobIBU83Yh47xxK8,4914
 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=prq1gOyBpKLQJodG59OvXOjwvualzQNLYNhmY4i92No,23652
@@ -345,6 +343,7 @@ reconcile/test/test_terraform_resources.py,sha256=dEpJwaTzE_FzkRjCozDtGzE4egBrb-
 reconcile/test/test_terraform_users.py,sha256=Yt4iN5FMtn7cfVlVqBJ1MMH94Z0DGchyByhpfNUJFxM,1570
 reconcile/test/test_terraform_vpc_peerings.py,sha256=-NXgufo1GCYhbWyVWbtK4KfPNIY6_02GQR53ynwMJZ4,18135
 reconcile/test/test_terraform_vpc_peerings_build_desired_state.py,sha256=43EIGnrm5xAdtuSL6tKDh-nepk4WOKkONMNUOU1BN_Y,37236
+reconcile/test/test_typed_queries.py,sha256=yxLkHCQ2sf7PlWSe9GVk7eJoN3dMezWfuvi30QhVUTM,1059
 reconcile/test/test_unleash.py,sha256=a4jT0Hzlje6AEkwhMmeDUkzo6rsD_WGSZicwFg47mmM,4192
 reconcile/test/test_utils_aws_api.py,sha256=UT1dhPvdW8hTqKrMMQv0JP84dMH9jrBG_-cJ02QfknY,7173
 reconcile/test/test_utils_aws_helper.py,sha256=2FjZ3cY2VLuHpkt2t-6S0xkJnpTbesx8pprP_75-7xI,2307
@@ -430,7 +429,7 @@ reconcile/typed_queries/namespaces_minimal.py,sha256=rUtqNQ0ORXXUTQfnpsMURymAJ4g
 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=IXqCTzCkjmchdjs9pE4eNB6aJhAELCHVsWarW14-3Fw,10562
+reconcile/typed_queries/saas_files.py,sha256=ZCf_Zo1mXjpnsoSzogPSzzFATKkHZvJAsJVtZdQkwEk,2112
 reconcile/typed_queries/saas_files_for_auto_promotions.py,sha256=HxGESxXPUfh7LNNcZs0oXo2PAGYTMN2T8q0miUTUvdc,649
 reconcile/typed_queries/smtp.py,sha256=aSLglYa5bHKmlGwKkxq2RZqyMWuAf0a4S_mOuhDa084,542
 reconcile/typed_queries/tekton_pipeline_providers.py,sha256=2mpHBdsNPQB94tw0H9aenGuqj8EEjYolQ03YEq1CpiY,546
@@ -536,9 +535,9 @@ reconcile/utils/runtime/integration.py,sha256=iUPlei8Kx1ulrN379i9k8b_Npw4zVTZa9u
 reconcile/utils/runtime/meta.py,sha256=hQ_jHPY0zbyA08hzpfu4FzOw25NqMg_fgCr2r9gGXx8,246
 reconcile/utils/runtime/runner.py,sha256=72cc-I6yXyPov8UCLHpyERRy1eiMLpGite2roO0yUlo,7979
 reconcile/utils/saasherder/__init__.py,sha256=J3MBZBFa5YmhqYm08QsjBXz8mFcVOCiOCkyIcw41t7E,343
-reconcile/utils/saasherder/interfaces.py,sha256=IMvRElC80if_BedjBn8VLUsgBhqphQkGZloPGhazh0E,8460
+reconcile/utils/saasherder/interfaces.py,sha256=9q-PbOIki3uVm2Slk02ac7gg4ZVvv_ntZ60WIxBH1Zc,8443
 reconcile/utils/saasherder/models.py,sha256=pmHYafLyasZHeVz_HvHraIb_9ITj4j6S9K604LRtDHg,4700
-reconcile/utils/saasherder/saasherder.py,sha256=yCWDCrQNMoutXCUT0TlND2M0YBC-XR2C0xpUE5FSfAI,78498
+reconcile/utils/saasherder/saasherder.py,sha256=hXwCbDIR9GsMV8sJXxN2pH5kXlsknMS5M-FX43Siv2Y,76909
 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=t4novdX7GeYPMYms97C_BBtLmt0M8CJCmCT7QHENwxg,4687
@@ -551,10 +550,10 @@ release/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 release/test_version.py,sha256=jOMn3Qx-mZC5pnJR0LU9ieIdNaYZSmr1kQ6aCkPngAU,2053
 release/version.py,sha256=Ud36t9FxGHLubMrE2o5aaaZRGB9_9hU_z0RN9go0TQM,3876
 tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tools/app_interface_reporter.py,sha256=QTQUbI1eLhRKahpQAcoTkWgaXNIems2Gh5CIt7h6Ll4,21985
+tools/app_interface_reporter.py,sha256=DIWu0dpBDk_cBweaf2Qun5HnyrLER1bu-pv3kHM5YGY,21861
 tools/glitchtip_access_reporter.py,sha256=oPBnk_YoDuljU3v0FaChzOwwnk4vap1xEE67QEjzdqs,2948
 tools/glitchtip_access_revalidation.py,sha256=PXN5wxl6OX8sxddPaakDF3X79nFLvpm-lz0mWLVelw0,2806
-tools/qontract_cli.py,sha256=EeWMeBqfc6PBwP4Ork_85YbQpMY09hOmtelmWTeTEVY,87995
+tools/qontract_cli.py,sha256=B-NOezDLeFjr1-m9dsLAa9fcBe7WVl4YRIYHakYLjw4,85754
 tools/cli_commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/cli_commands/gpg_encrypt.py,sha256=JryinrDdvztN931enUY3FuDeLVnfs6y58mnK7itNK6Y,4940
 tools/sre_checkpoints/__init__.py,sha256=CDaDaywJnmRCLyl_NCcvxi-Zc0hTi_3OdwKiFOyS39I,145
@@ -562,8 +561,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.1rc235.dist-info/METADATA,sha256=n6fXcNNGxO2Iz4NGU4b7-Te84CgxanPC3i-aQJHHDk4,2287
-qontract_reconcile-0.9.1rc235.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.9.1rc235.dist-info/entry_points.txt,sha256=aIVvB7OTCxYu0QkONzBPfFEyg68Pr8KUVKEEm4ChDVc,333
-qontract_reconcile-0.9.1rc235.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
-qontract_reconcile-0.9.1rc235.dist-info/RECORD,,
+qontract_reconcile-0.9.1rc236.dist-info/METADATA,sha256=fyUnMe9o7NZHsZ-eqev-921QXSwOXb0Wc5QJwDZG8N8,2248
+qontract_reconcile-0.9.1rc236.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.9.1rc236.dist-info/entry_points.txt,sha256=aIVvB7OTCxYu0QkONzBPfFEyg68Pr8KUVKEEm4ChDVc,333
+qontract_reconcile-0.9.1rc236.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
+qontract_reconcile-0.9.1rc236.dist-info/RECORD,,

reconcile/gql_definitions/common/saas_files.py

@@ -20,9 +20,6 @@ from pydantic import (  # noqa: F401 # pylint: disable=W0611
 from reconcile.gql_definitions.fragments.oc_connection_cluster import (
     OcConnectionCluster,
 )
-from reconcile.gql_definitions.fragments.saas_target_namespace import (
-    SaasTargetNamespace,
-)
 from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
 
 
@@ -58,26 +55,6 @@ fragment OcConnectionCluster on Cluster_v1 {
   }
 }
 
-fragment SaasTargetNamespace on Namespace_v1 {
-  name
-  environment {
-    name
-    parameters
-    secretParameters {
-      name
-      secret {
-        ...VaultSecret
-      }
-    }
-  }
-  app {
-    name
-  }
-  cluster {
-    ...OcConnectionCluster
-  }
-}
-
 fragment VaultSecret on VaultSecret_v1 {
     path
     field
@@ -188,15 +165,24 @@ query SaasFiles {
         path
         name
         namespace {
-          ...SaasTargetNamespace
-        }
-        namespaceSelector {
-          jsonPathSelectors {
-            include
-            exclude
+          name
+          environment {
+            name
+            parameters
+            secretParameters {
+              name
+              secret {
+                ...VaultSecret
+              }
+            }
+          }
+          app {
+            name
+          }
+          cluster {
+            ...OcConnectionCluster
           }
         }
-        provider
         ref
         promotion {
           auto
@@ -374,13 +360,28 @@ class SaasResourceTemplateV2_SaasSecretParametersV1(ConfiguredBaseModel):
     secret: VaultSecret = Field(..., alias="secret")
 
 
-class JsonPathSelectorsV1(ConfiguredBaseModel):
-    include: list[str] = Field(..., alias="include")
-    exclude: Optional[list[str]] = Field(..., alias="exclude")
+class EnvironmentV1_SaasSecretParametersV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    secret: VaultSecret = Field(..., alias="secret")
+
+
+class EnvironmentV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    parameters: Optional[Json] = Field(..., alias="parameters")
+    secret_parameters: Optional[list[EnvironmentV1_SaasSecretParametersV1]] = Field(
+        ..., alias="secretParameters"
+    )
+
+
+class SaasResourceTemplateTargetV2_NamespaceV1_AppV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
 
 
-class SaasResourceTemplateTargetNamespaceSelectorV1(ConfiguredBaseModel):
-    json_path_selectors: JsonPathSelectorsV1 = Field(..., alias="jsonPathSelectors")
+class SaasResourceTemplateTargetV2_NamespaceV1(ConfiguredBaseModel):
+    name: str = Field(..., alias="name")
+    environment: EnvironmentV1 = Field(..., alias="environment")
+    app: SaasResourceTemplateTargetV2_NamespaceV1_AppV1 = Field(..., alias="app")
+    cluster: OcConnectionCluster = Field(..., alias="cluster")
 
 
 class PromotionChannelDataV1(ConfiguredBaseModel):
@@ -438,11 +439,7 @@ class SaasResourceTemplateTargetImageV1(ConfiguredBaseModel):
 class SaasResourceTemplateTargetV2(ConfiguredBaseModel):
     path: Optional[str] = Field(..., alias="path")
     name: Optional[str] = Field(..., alias="name")
-    namespace: Optional[SaasTargetNamespace] = Field(..., alias="namespace")
-    namespace_selector: Optional[SaasResourceTemplateTargetNamespaceSelectorV1] = Field(
-        ..., alias="namespaceSelector"
-    )
-    provider: Optional[str] = Field(..., alias="provider")
+    namespace: SaasResourceTemplateTargetV2_NamespaceV1 = Field(..., alias="namespace")
     ref: str = Field(..., alias="ref")
     promotion: Optional[SaasResourceTemplateTargetPromotionV1] = Field(
         ..., alias="promotion"

reconcile/gql_definitions/saas_auto_promotions_manager/saas_files_for_auto_promotion.py

@@ -108,7 +108,7 @@ class SaasResourceTemplateTargetPromotionV1(ConfiguredBaseModel):
 class SaasResourceTemplateTargetV2(ConfiguredBaseModel):
     ref: str = Field(..., alias="ref")
     path: Optional[str] = Field(..., alias="path")
-    namespace: Optional[NamespaceV1] = Field(..., alias="namespace")
+    namespace: NamespaceV1 = Field(..., alias="namespace")
     promotion: Optional[SaasResourceTemplateTargetPromotionV1] = Field(
         ..., alias="promotion"
     )

reconcile/openshift_saas_deploy.py

@@ -9,7 +9,10 @@ from reconcile import (
     mr_client_gateway,
     queries,
 )
-from reconcile.gql_definitions.common.saas_files import PipelinesProviderTektonV1
+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
@@ -24,7 +27,6 @@ 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.saasherder.interfaces import SaasFile
 from reconcile.utils.secret_reader import create_secret_reader
 from reconcile.utils.semver_helper import make_semver
 from reconcile.utils.slack_api import SlackApi
@@ -34,7 +36,7 @@ QONTRACT_INTEGRATION = "openshift-saas-deploy"
 QONTRACT_INTEGRATION_VERSION = make_semver(0, 1, 0)
 
 
-def compose_console_url(saas_file: SaasFile, env_name: str) -> str:
+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}"

reconcile/openshift_saas_deploy_change_tester.py

@@ -9,10 +9,6 @@ from sretoolbox.utils import threaded
 
 import reconcile.openshift_saas_deploy as osd
 from reconcile import queries
-from reconcile.typed_queries.saas_files import (
-    export_model,
-    get_saas_files,
-)
 from reconcile.utils import gql
 from reconcile.utils.gitlab_api import GitLabApi
 from reconcile.utils.semver_helper import make_semver
@@ -210,13 +206,10 @@ def run(
 
     # find the differences in saas-file state
     comparison_saas_file_state = collect_state(
-        [
-            export_model(saas_file)
-            for saas_file in get_saas_files(query_func=comparison_gql_api.query)
-        ]
+        queries.get_saas_files(gqlapi=comparison_gql_api)
     )
     desired_saas_file_state = collect_state(
-        [export_model(saas_file) for saas_file in get_saas_files()]
+        queries.get_saas_files(gqlapi=gql.get_api())
     )
     saas_file_state_diffs = [
         s for s in desired_saas_file_state if s not in comparison_saas_file_state

reconcile/queries.py

@@ -2089,6 +2089,288 @@ def get_app_interface_sql_queries():
     return gqlapi.query(APP_INTERFACE_SQL_QUERIES_QUERY)["sql_queries"]
 
 
+SAAS_FILES_QUERY_V2 = """
+{
+  saas_files: saas_files_v2 {
+    path
+    name
+    app {
+      name
+    }
+    pipelinesProvider {
+      name
+      provider
+      ...on PipelinesProviderTekton_v1 {
+        namespace {
+          name
+          cluster {
+            name
+            consoleUrl
+            serverUrl
+            insecureSkipTLSVerify
+            jumpHost {
+              %s
+            }
+            automationToken {
+              path
+              field
+              version
+              format
+            }
+            internal
+            disable {
+              integrations
+            }
+          }
+        }
+        defaults {
+          pipelineTemplates {
+            openshiftSaasDeploy {
+              name
+            }
+          }
+        }
+        pipelineTemplates {
+          openshiftSaasDeploy {
+            name
+          }
+        }
+      }
+    }
+    deployResources {
+      requests {
+        cpu
+        memory
+      }
+      limits {
+        cpu
+        memory
+      }
+    }
+    slack {
+      output
+      workspace {
+        name
+        integrations {
+          name
+          token {
+            path
+            field
+            version
+            format
+          }
+          channel
+          icon_emoji
+          username
+        }
+      }
+      channel
+      notifications {
+        start
+      }
+    }
+    managedResourceTypes
+    takeover
+    deprecated
+    compare
+    timeout
+    publishJobLogs
+    clusterAdmin
+    imagePatterns
+    allowedSecretParameterPaths
+    use_channel_in_image_tag
+    authentication {
+      code {
+        path
+        field
+        version
+        format
+      }
+      image {
+        path
+        field
+        version
+        format
+      }
+    }
+    parameters
+    secretParameters {
+      name
+      secret {
+        path
+        field
+        version
+        format
+      }
+    }
+    resourceTemplates {
+      name
+      url
+      path
+      provider
+      hash_length
+      parameters
+      secretParameters {
+        name
+        secret {
+          path
+          field
+          version
+          format
+        }
+      }
+      targets {
+        path
+        name
+        namespace {
+          name
+          environment {
+            name
+            parameters
+            secretParameters {
+              name
+              secret {
+                path
+                field
+                version
+                format
+              }
+            }
+          }
+          app {
+            name
+          }
+          cluster {
+            name
+            serverUrl
+            insecureSkipTLSVerify
+            jumpHost {
+              %s
+            }
+            automationToken {
+              path
+              field
+              version
+              format
+            }
+            clusterAdminAutomationToken {
+              path
+              field
+              version
+              format
+            }
+            internal
+            disable {
+              integrations
+            }
+          }
+        }
+        ref
+        promotion {
+          auto
+          publish
+          subscribe
+          promotion_data {
+            channel
+            data {
+              type
+              ... on ParentSaasPromotion_v1 {
+                parent_saas
+                target_config_hash
+              }
+            }
+          }
+        }
+        parameters
+        secretParameters {
+          name
+          secret {
+            path
+            field
+            version
+            format
+          }
+        }
+        upstream {
+          instance {
+            name
+            serverUrl
+          }
+          name
+        }
+        image {
+          org {
+            name
+            instance {
+              url
+            }
+          }
+          name
+        }
+        disable
+        delete
+      }
+    }
+    selfServiceRoles {
+      users {
+        org_username
+        tag_on_merge_requests
+      }
+      bots {
+        org_username
+      }
+    }
+  }
+}
+""" % (
+    indent(JUMPHOST_FIELDS, 14 * " "),
+    indent(JUMPHOST_FIELDS, 14 * " "),
+)
+
+
+def get_saas_files(
+    saas_file_name: Optional[str] = None,
+    env_name: Optional[str] = None,
+    app_name: Optional[str] = None,
+    gqlapi: Optional[gql.GqlApi] = None,
+):
+    """Returns SaasFile resources defined in app-interface."""
+    if gqlapi is None:
+        gqlapi = gql.get_api()
+    saas_files = gqlapi.query(SAAS_FILES_QUERY_V2)["saas_files"]
+
+    if saas_file_name is None and env_name is None and app_name is None:
+        return saas_files
+    if saas_file_name == "" or env_name == "" or app_name == "":
+        return []
+
+    for saas_file in saas_files[:]:
+        if saas_file_name:
+            if saas_file["name"] != saas_file_name:
+                saas_files.remove(saas_file)
+                continue
+        if env_name:
+            resource_templates = saas_file["resourceTemplates"]
+            for rt in resource_templates[:]:
+                targets = rt["targets"]
+                for target in targets[:]:
+                    namespace = target["namespace"]
+                    environment = namespace["environment"]
+                    if environment["name"] != env_name:
+                        targets.remove(target)
+                if not targets:
+                    resource_templates.remove(rt)
+            if not resource_templates:
+                saas_files.remove(saas_file)
+                continue
+        if app_name:
+            if saas_file["app"]["name"] != app_name:
+                saas_files.remove(saas_file)
+                continue
+
+    return saas_files
+
+
 PIPELINES_PROVIDERS_QUERY = """
 {
   pipelines_providers: pipelines_providers_v1 {

reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py

@@ -94,9 +94,6 @@ class SaasFilesInventory:
                         continue
                     if not target.promotion.auto:
                         continue
-                    if not target.namespace:
-                        # this should never happen - it's just to make mypy happy
-                        raise RuntimeError("target.namespace is None")
                     subscriber = Subscriber(
                         saas_name=saas_file.name,
                         template_name=resource_template.name,