qontract-reconcile 0.9.1rc241__py3-none-any.whl → 0.9.1rc243__py3-none-any.whl

{qontract_reconcile-0.9.1rc241.dist-info → qontract_reconcile-0.9.1rc243.dist-info}/METADATA

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

@@ -183,8 +183,8 @@ 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=Qwe2Wt_gkeEGnCt2w1VwQBNgbSWZiYc7oAya1YqDz44,14795
+reconcile/gql_definitions/common/saas_target_namespaces.py,sha256=5DVpj16kzRWmWmG5DgaFdb6SGEwAFu27FlPmxTJcXWQ,2543
 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 +198,7 @@ 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/saas_target_namespace.py,sha256=Bnf_qQg3a6tt1GVTD89dWmTkxIe9GosJrLl-jW5JKeo,1559
 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
@@ -222,8 +222,6 @@ reconcile/gql_definitions/openshift_groups/managed_groups.py,sha256=_Cr0z4BJlWF0
 reconcile/gql_definitions/openshift_groups/managed_roles.py,sha256=Q9U2hRiAZiCBEHmT1ipHhS2z1Yn5VIXvpIxNJgNrw_Y,2607
 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/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
@@ -257,7 +255,7 @@ reconcile/jenkins/types.py,sha256=-WMs4TsCEcbJNF_n-615Fealk08boBYZcTzVUk3Wlns,26
 reconcile/ocm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/ocm/types.py,sha256=gCuVra66cIk2Wvoj8PQ-hvsZiozFDFXxUOilPdC0w-c,3138
 reconcile/saas_auto_promotions_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/saas_auto_promotions_manager/integration.py,sha256=LjAGspKJsPa43WnRk3tbiDdJuh2KZ9_v80V5TQbg0Rs,6160
+reconcile/saas_auto_promotions_manager/integration.py,sha256=BHiTU_gCQ39OwjaQ9pWFLvDvgy14rVAutUOjAEqOsTE,6091
 reconcile/saas_auto_promotions_manager/publisher.py,sha256=HHVuYyEeBSvjuwh0XB8VQaGV3TeQvW-4Mh6YNyrNbtM,1255
 reconcile/saas_auto_promotions_manager/subscriber.py,sha256=iWT27JhhDMhQC8Qam5nnR0NKK8NhlT8guAsmLClhIw0,5754
 reconcile/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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=aQ-rVGjJfD0eAWFwU0ocOGTF5BHld-49yBwSmgKtUvg,8371
 reconcile/saas_auto_promotions_manager/utils/vcs.py,sha256=mgD8_eHOK-yCETQBYW4BRttgYK_eeBEbj1O59KBO9GQ,5053
 reconcile/skupper_network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/skupper_network/integration.py,sha256=jF5uPhePnWq4axnxxarEQ_tw71WBxYoTZZUoi9JrZ6M,9831
@@ -284,7 +282,7 @@ reconcile/templates/aws_access_key_email.j2,sha256=2MUr1ERmyISzKgHqsWYLd-1Wbl-pe
 reconcile/templates/email.yml.j2,sha256=OZgczNRgXPj2gVYTgwQyHAQrMGu7xp-e4W1rX19GcrU,690
 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=di10dQFgeIjh_wbRDMC1P2Ko0nNkLZtgir5ZBrtoRlo,4745
+reconcile/test/conftest.py,sha256=QsvEVVuiVs_qIbwYI1A9mbcM8yY8pmya-hsdHblcJLU,5219
 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
@@ -390,8 +388,8 @@ reconcile/test/test_version_bump.py,sha256=q6-3Y1roriI6YWpFwaHOMN7emEP3yL33sh_0V
 reconcile/test/test_vpc_peerings_validator.py,sha256=j4MlmIoGptMJsYNfJAChHRkilSxtqBEUJBQhL6Uqfmo,3710
 reconcile/test/test_wrong_region.py,sha256=7KzL7OaICQ9Z3DW27zt_ykMN7_87owAFC-2CYjvGoyA,2138
 reconcile/test/saas_auto_promotions_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/test/saas_auto_promotions_manager/conftest.py,sha256=mxbL8OZY_yJoZu3jaioGdZsWGxtVWqOUX4miUCZzNjg,1676
-reconcile/test/saas_auto_promotions_manager/test_integration_test.py,sha256=dm4tH8ITXmm-VIWp7pEUk5DKHVRsA3tbhvhMlARuqWo,4666
+reconcile/test/saas_auto_promotions_manager/conftest.py,sha256=_tXaxYxn7PfX2N_wi0czF9uoetEmog8coyHsO_6mUcw,2481
+reconcile/test/saas_auto_promotions_manager/test_integration_test.py,sha256=TkxVbWDQ5H8zj4cTWgq3EaCsiu7u7GvOCxt90X_r6CE,4603
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/merge_request_manager/conftest.py,sha256=Ogww6W3CbRq1BTHnNbWVKQ5BXJa2s5-lcYNdyoLKi1I,3101
@@ -415,9 +413,9 @@ reconcile/test/saas_auto_promotions_manager/utils/__init__.py,sha256=47DEQpj8HBS
 reconcile/test/saas_auto_promotions_manager/utils/deployment_state/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/test/saas_auto_promotions_manager/utils/deployment_state/test_deployment_state.py,sha256=bTMwr-d_VYls1iq1NRPyrKr1KRQ5iC84DP2uywaB9dU,1257
 reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_multiple_publishers_for_single_channel.py,sha256=Mdb0awCvAhAP9QV74N_SpOcmuiPVRv8ezgCCBNxtrbE,2477
-reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_saas_files_with_auto_promote.py,sha256=rbVgbwQPji9_9OZ1sT-SElDBwXjWkp-2ABq1yTT78I8,2706
-reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_saas_files_without_auto_promote.py,sha256=s8uTltkuu32HPMhtCqod7yBkx_zwUjiHLsNltXO6Muc,2233
+reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_multiple_publishers_for_single_channel.py,sha256=A2bw4U2jcwpQpTd8nab2Pe7QeF-__2CEJp8kWocVHVc,2414
+reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_saas_files_with_auto_promote.py,sha256=bGT1dlFk2NGOvAa1U4t4eNpWvVUxLMIFI-8sp0W_4nk,2643
+reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_saas_files_without_auto_promote.py,sha256=6EYKmXDN9ckkMvdUBZlUiunCKuwQ9UmnPijKvXU8iZo,2170
 reconcile/typed_queries/__init__.py,sha256=rRk4CyslLsBr4vAh1pIPgt6s3P4R1M9NSEPLnyQgBpk,61
 reconcile/typed_queries/app_interface_vault_settings.py,sha256=N0GiRYDzlPipTOMM50ieR08BxsXaGAga6GxiIKjQDS8,1002
 reconcile/typed_queries/clusters.py,sha256=mjEudUxMl0pqT0CIbDhgRONLQqfhTvDPS4SVyl0zIpM,393
@@ -431,7 +429,6 @@ reconcile/typed_queries/ocp_release_mirror.py,sha256=jwX29Tcdvov8oEDNkE4t1j-2Hz8
 reconcile/typed_queries/pagerduty_instances.py,sha256=QCHqEAakiH6eSob0Pnnn3IBd8Ga0zpEp1Z6Qu3v2uH4,733
 reconcile/typed_queries/repos.py,sha256=RKBsf7IDS6NsXTtXxJ9Ol9G3bxG9sr3vW9QQ2bahEHo,512
 reconcile/typed_queries/saas_files.py,sha256=rdrmz6vxcnUfswaeD6f57Yax-Y1DOutGCc60BBUXJK0,10593
-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
 reconcile/typed_queries/terraform_namespaces.py,sha256=71ARJ-GzkU9tBM0IfJTL3NF4349SJy-Mgs_DwAgUz_g,444
@@ -474,7 +471,7 @@ reconcile/utils/ldap_client.py,sha256=atreTLA1f7gnG54Ub3JWkToP9tCwAci-q17dqB5XSh
 reconcile/utils/lean_terraform_client.py,sha256=no9MMgG6TsgjM3EypIhLQtRmPZl9eNnZ0k0llWSBn6Y,865
 reconcile/utils/make.py,sha256=QaEwucrzbl8-VHS66Wfdjfo0ubmAcvt_hZGpiGsKU50,231
 reconcile/utils/metrics.py,sha256=7DO12hEJ7sNOjrTNmA24l5wmAe4MT0WgY-Y2iPhBgXI,2015
-reconcile/utils/oc.py,sha256=-vPfw85S5Bgzy53OJqreP3UE2nL9fiAaiOWhzfxyPBs,68448
+reconcile/utils/oc.py,sha256=SMjqezK6XQEWYgkXAEVGeNXdbEC1wAnzdAn439fK-L0,68610
 reconcile/utils/oc_connection_parameters.py,sha256=jlEMObRAx0NuWQfEF7NXkLoY-Ewrr9egA7nUr_oUHyM,10011
 reconcile/utils/oc_filters.py,sha256=RWn8pC5A7ZZT7C6WPq9bOw5KBNkiAb5puFSr_FpdAf8,1358
 reconcile/utils/oc_map.py,sha256=2y8A2B7iSNG4dTxaF9OkKlbw0DYcUwjeF3uv-P0lTBM,9538
@@ -562,8 +559,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.1rc241.dist-info/METADATA,sha256=j_dBPZOz2zaslrUBqttox_EnkEpYw7AbnbDkRpMVKE0,2287
-qontract_reconcile-0.9.1rc241.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.9.1rc241.dist-info/entry_points.txt,sha256=aIVvB7OTCxYu0QkONzBPfFEyg68Pr8KUVKEEm4ChDVc,333
-qontract_reconcile-0.9.1rc241.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
-qontract_reconcile-0.9.1rc241.dist-info/RECORD,,
+qontract_reconcile-0.9.1rc243.dist-info/METADATA,sha256=qS1WgtZ7FKOBBRdze5SVZeHuFnArF6mR6uYKQDZa5vs,2287
+qontract_reconcile-0.9.1rc243.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.9.1rc243.dist-info/entry_points.txt,sha256=aIVvB7OTCxYu0QkONzBPfFEyg68Pr8KUVKEEm4ChDVc,333
+qontract_reconcile-0.9.1rc243.dist-info/top_level.txt,sha256=j0CHPIc8TsVRB50wOz_jhxjjaRyCJB3NOQeXhuHS67c,34
+qontract_reconcile-0.9.1rc243.dist-info/RECORD,,

reconcile/gql_definitions/common/saas_files.py

@@ -60,6 +60,7 @@ fragment OcConnectionCluster on Cluster_v1 {
 
 fragment SaasTargetNamespace on Namespace_v1 {
   name
+  path
   environment {
     name
     parameters

reconcile/gql_definitions/common/saas_target_namespaces.py

@@ -56,6 +56,7 @@ fragment OcConnectionCluster on Cluster_v1 {
 
 fragment SaasTargetNamespace on Namespace_v1 {
   name
+  path
   environment {
     name
     parameters

reconcile/gql_definitions/fragments/saas_target_namespace.py

@@ -48,6 +48,7 @@ class AppV1(ConfiguredBaseModel):
 
 class SaasTargetNamespace(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
+    path: str = Field(..., alias="path")
     environment: EnvironmentV1 = Field(..., alias="environment")
     app: AppV1 = Field(..., alias="app")
     cluster: OcConnectionCluster = Field(..., alias="cluster")

reconcile/saas_auto_promotions_manager/integration.py

@@ -29,9 +29,7 @@ from reconcile.typed_queries.app_interface_vault_settings import (
 )
 from reconcile.typed_queries.github_orgs import get_github_orgs
 from reconcile.typed_queries.gitlab_instances import get_gitlab_instances
-from reconcile.typed_queries.saas_files_for_auto_promotions import (
-    get_saas_files_for_auto_promotions,
-)
+from reconcile.typed_queries.saas_files import get_saas_files
 from reconcile.utils.defer import defer
 from reconcile.utils.secret_reader import create_secret_reader
 from reconcile.utils.semver_helper import make_semver
@@ -138,7 +136,7 @@ def init_external_dependencies(
         vcs=vcs,
         renderer=Renderer(),
     )
-    saas_files = get_saas_files_for_auto_promotions()
+    saas_files = get_saas_files()
     saas_inventory = SaasFilesInventory(saas_files=saas_files)
     deployment_state = DeploymentState(
         state=init_state(integration=OPENSHIFT_SAAS_DEPLOY, secret_reader=secret_reader)

reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py

@@ -1,16 +1,14 @@
 import logging
 from collections.abc import Iterable
 
-from reconcile.gql_definitions.saas_auto_promotions_manager.saas_files_for_auto_promotion import (
-    ParentSaasPromotionV1,
-    SaasFileV2,
-)
+from reconcile.gql_definitions.common.saas_files import ParentSaasPromotionV1
 from reconcile.saas_auto_promotions_manager.publisher import Publisher
 from reconcile.saas_auto_promotions_manager.subscriber import (
     Channel,
     ConfigHash,
     Subscriber,
 )
+from reconcile.typed_queries.saas_files import SaasFile
 
 
 class SaasFileInventoryError(Exception):
@@ -27,7 +25,7 @@ class SaasFilesInventory:
     This basically spans a directed graph, with subscribers as the root.
     """
 
-    def __init__(self, saas_files: Iterable[SaasFileV2]):
+    def __init__(self, saas_files: Iterable[SaasFile]):
         self._saas_files = saas_files
         self._channels_by_name: dict[str, Channel] = {}
         self.subscribers: list[Subscriber] = []
@@ -94,9 +92,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,

reconcile/test/conftest.py

@@ -57,8 +57,16 @@ def data_default_none(
             continue
 
         if field.alias not in data:
+            # Settings defaults
             if field.allow_none:
                 data[field.alias] = None
+            else:
+                if isinstance(field.type_, type) and issubclass(field.type_, str):
+                    data[field.alias] = "I was too lazy to define a string here"
+                elif isinstance(field.type_, type) and issubclass(field.type_, int):
+                    data[field.alias] = 42
+                elif isinstance(field.type_, type) and issubclass(field.type_, bool):
+                    data[field.alias] = False
         else:
             if isinstance(field.type_, type) and issubclass(field.type_, BaseModel):
                 if isinstance(data[field.alias], dict):

reconcile/test/saas_auto_promotions_manager/conftest.py

@@ -2,6 +2,7 @@ from collections.abc import (
     Callable,
     Iterable,
     Mapping,
+    MutableMapping,
 )
 from unittest.mock import (
     MagicMock,
@@ -10,20 +11,38 @@ from unittest.mock import (
 
 import pytest
 
-from reconcile.gql_definitions.saas_auto_promotions_manager.saas_files_for_auto_promotion import (
-    SaasFileV2,
-)
 from reconcile.saas_auto_promotions_manager.utils.vcs import VCS
+from reconcile.typed_queries.saas_files import SaasFile
 from reconcile.utils.gitlab_api import GitLabApi
 from reconcile.utils.state import State
 
 
 @pytest.fixture
 def saas_files_builder(
-    gql_class_factory: Callable[[type[SaasFileV2], Mapping], SaasFileV2]
-) -> Callable[[Iterable[Mapping]], list[SaasFileV2]]:
-    def builder(data: Iterable[Mapping]) -> list[SaasFileV2]:
-        return [gql_class_factory(SaasFileV2, d) for d in data]
+    gql_class_factory: Callable[[type[SaasFile], Mapping], SaasFile]
+) -> Callable[[Iterable[MutableMapping]], list[SaasFile]]:
+    def builder(data: Iterable[MutableMapping]) -> list[SaasFile]:
+        for d in data:
+            if "app" not in d:
+                d["app"] = {}
+            if "pipelinesProvider" not in d:
+                d["pipelinesProvider"] = {}
+            if "managedResourceTypes" not in d:
+                d["managedResourceTypes"] = []
+            if "imagePatterns" not in d:
+                d["imagePatterns"] = []
+            for rt in d.get("resourceTemplates", []):
+                for t in rt.get("targets", []):
+                    ns = t["namespace"]
+                    if "name" not in ns:
+                        ns["name"] = "some_name"
+                    if "environment" not in ns:
+                        ns["environment"] = {}
+                    if "app" not in ns:
+                        ns["app"] = {}
+                    if "cluster" not in ns:
+                        ns["cluster"] = {}
+        return [gql_class_factory(SaasFile, d) for d in data]
 
     return builder
 

reconcile/test/saas_auto_promotions_manager/test_integration_test.py

@@ -5,9 +5,6 @@ from collections.abc import (
 )
 from unittest.mock import create_autospec
 
-from reconcile.gql_definitions.saas_auto_promotions_manager.saas_files_for_auto_promotion import (
-    SaasFileV2,
-)
 from reconcile.saas_auto_promotions_manager.integration import SaasAutoPromotionsManager
 from reconcile.saas_auto_promotions_manager.merge_request_manager.merge_request_manager import (
     MergeRequestManager,
@@ -22,11 +19,12 @@ from reconcile.saas_auto_promotions_manager.utils.saas_files_inventory import (
     SaasFilesInventory,
 )
 from reconcile.saas_auto_promotions_manager.utils.vcs import VCS
+from reconcile.typed_queries.saas_files import SaasFile
 from reconcile.utils.state import State
 
 
 def test_integration_test(
-    saas_files_builder: Callable[[Iterable[Mapping]], list[SaasFileV2]],
+    saas_files_builder: Callable[[Iterable[Mapping]], list[SaasFile]],
     vcs_builder: Callable[..., VCS],
     s3_state_builder: Callable[[Mapping], State],
 ):

reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_multiple_publishers_for_single_channel.py

@@ -4,16 +4,14 @@ from collections.abc import (
     Mapping,
 )
 
-from reconcile.gql_definitions.saas_auto_promotions_manager.saas_files_for_auto_promotion import (
-    SaasFileV2,
-)
 from reconcile.saas_auto_promotions_manager.utils.saas_files_inventory import (
     SaasFilesInventory,
 )
+from reconcile.typed_queries.saas_files import SaasFile
 
 
 def test_multiple_publishers_for_single_channel(
-    saas_files_builder: Callable[[Iterable[Mapping]], list[SaasFileV2]]
+    saas_files_builder: Callable[[Iterable[Mapping]], list[SaasFile]]
 ):
     saas_files = saas_files_builder(
         [

reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_saas_files_with_auto_promote.py

@@ -4,16 +4,14 @@ from collections.abc import (
     Mapping,
 )
 
-from reconcile.gql_definitions.saas_auto_promotions_manager.saas_files_for_auto_promotion import (
-    SaasFileV2,
-)
 from reconcile.saas_auto_promotions_manager.utils.saas_files_inventory import (
     SaasFilesInventory,
 )
+from reconcile.typed_queries.saas_files import SaasFile
 
 
 def test_single_channel(
-    saas_files_builder: Callable[[Iterable[Mapping]], list[SaasFileV2]]
+    saas_files_builder: Callable[[Iterable[Mapping]], list[SaasFile]]
 ):
     saas_files = saas_files_builder(
         [

reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_saas_files_without_auto_promote.py

@@ -4,16 +4,14 @@ from collections.abc import (
     Mapping,
 )
 
-from reconcile.gql_definitions.saas_auto_promotions_manager.saas_files_for_auto_promotion import (
-    SaasFileV2,
-)
 from reconcile.saas_auto_promotions_manager.utils.saas_files_inventory import (
     SaasFilesInventory,
 )
+from reconcile.typed_queries.saas_files import SaasFile
 
 
 def test_saas_files_without_auto_promote(
-    saas_files_builder: Callable[[Iterable[Mapping]], list[SaasFileV2]]
+    saas_files_builder: Callable[[Iterable[Mapping]], list[SaasFile]]
 ):
     saas_files = saas_files_builder(
         [

reconcile/utils/oc.py

@@ -711,27 +711,33 @@ class OCDeprecated:  # pylint: disable=too-many-public-methods
         cmd = ["sa", "-n", namespace, "get-token", name]
         return self._run(cmd)
 
+    def _process_api_resources(self, results):
+        for line in results:
+            r = line.split()
+            kind = r[-1]
+            namespaced = r[-2].lower() == "true"
+            group_version = r[-3].split("/", 1)
+            # Core group (v1)
+            group = ""
+            api_version = group_version
+            if len(group_version) > 1:
+                # group/version
+                group = group_version[0]
+                api_version = group_version[1]
+            obj = OCDeprecatedApiResource(kind, group, api_version, namespaced)
+            d = self.api_resources.setdefault(kind, [])
+            d.append(obj)
+
     def get_api_resources(self):
         with self.api_resources_lock:
             if not self.api_resources:
                 cmd = ["api-resources", "--no-headers"]
-                results = self._run(cmd).decode("utf-8").split("\n")
-                for line in results:
-                    r = line.split()
-                    kind = r[-1]
-                    namespaced = r[-2].lower() == "true"
-                    group_version = r[-3].split("/", 1)
-                    # Core group (v1)
-                    group = ""
-                    api_version = group_version
-                    if len(group_version) > 1:
-                        # group/version
-                        group = group_version[0]
-                        api_version = group_version[1]
-                    obj = OCDeprecatedApiResource(kind, group, api_version, namespaced)
-                    d = self.api_resources.setdefault(kind, [])
-                    d.append(obj)
-
+                try:
+                    results = self._run(cmd).decode("utf-8").split("\n")
+                    self._process_api_resources(results)
+                except AttributeError:
+                    results = self._run(cmd).split("\n")
+                    self._process_api_resources(results)
         return self.api_resources
 
     def get_version(self):

reconcile/gql_definitions/saas_auto_promotions_manager/saas_files_for_auto_promotion.py

@@ -1,154 +0,0 @@
-"""
-Generated by qenerate plugin=pydantic_v1. DO NOT MODIFY MANUALLY!
-"""
-from collections.abc import Callable  # noqa: F401 # pylint: disable=W0611
-from datetime import datetime  # noqa: F401 # pylint: disable=W0611
-from enum import Enum  # noqa: F401 # pylint: disable=W0611
-from typing import (  # noqa: F401 # pylint: disable=W0611
-    Any,
-    Optional,
-    Union,
-)
-
-from pydantic import (  # noqa: F401 # pylint: disable=W0611
-    BaseModel,
-    Extra,
-    Field,
-    Json,
-)
-
-from reconcile.gql_definitions.fragments.vault_secret import VaultSecret
-
-
-DEFINITION = """
-fragment VaultSecret on VaultSecret_v1 {
-    path
-    field
-    version
-    format
-}
-
-query SaasFilesForAutoPromotion {
-  saas_files: saas_files_v2 {
-    path
-    name
-    authentication {
-      code {
-        ... VaultSecret
-      }
-    }
-    resourceTemplates {
-      name
-      url
-      targets {
-        ref
-        path
-        namespace {
-          path
-        }
-        promotion {
-          auto
-          publish
-          subscribe
-          promotion_data {
-            channel
-            data {
-              type
-              ... on ParentSaasPromotion_v1 {
-                parent_saas
-                target_config_hash
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-"""
-
-
-class ConfiguredBaseModel(BaseModel):
-    class Config:
-        smart_union = True
-        extra = Extra.forbid
-
-
-class SaasFileAuthenticationV1(ConfiguredBaseModel):
-    code: Optional[VaultSecret] = Field(..., alias="code")
-
-
-class NamespaceV1(ConfiguredBaseModel):
-    path: str = Field(..., alias="path")
-
-
-class PromotionChannelDataV1(ConfiguredBaseModel):
-    q_type: str = Field(..., alias="type")
-
-
-class ParentSaasPromotionV1(PromotionChannelDataV1):
-    parent_saas: Optional[str] = Field(..., alias="parent_saas")
-    target_config_hash: Optional[str] = Field(..., alias="target_config_hash")
-
-
-class PromotionDataV1(ConfiguredBaseModel):
-    channel: Optional[str] = Field(..., alias="channel")
-    data: Optional[list[Union[ParentSaasPromotionV1, PromotionChannelDataV1]]] = Field(
-        ..., alias="data"
-    )
-
-
-class SaasResourceTemplateTargetPromotionV1(ConfiguredBaseModel):
-    auto: Optional[bool] = Field(..., alias="auto")
-    publish: Optional[list[str]] = Field(..., alias="publish")
-    subscribe: Optional[list[str]] = Field(..., alias="subscribe")
-    promotion_data: Optional[list[PromotionDataV1]] = Field(..., alias="promotion_data")
-
-
-class SaasResourceTemplateTargetV2(ConfiguredBaseModel):
-    ref: str = Field(..., alias="ref")
-    path: Optional[str] = Field(..., alias="path")
-    namespace: Optional[NamespaceV1] = Field(..., alias="namespace")
-    promotion: Optional[SaasResourceTemplateTargetPromotionV1] = Field(
-        ..., alias="promotion"
-    )
-
-
-class SaasResourceTemplateV2(ConfiguredBaseModel):
-    name: str = Field(..., alias="name")
-    url: str = Field(..., alias="url")
-    targets: list[SaasResourceTemplateTargetV2] = Field(..., alias="targets")
-
-
-class SaasFileV2(ConfiguredBaseModel):
-    path: str = Field(..., alias="path")
-    name: str = Field(..., alias="name")
-    authentication: Optional[SaasFileAuthenticationV1] = Field(
-        ..., alias="authentication"
-    )
-    resource_templates: list[SaasResourceTemplateV2] = Field(
-        ..., alias="resourceTemplates"
-    )
-
-
-class SaasFilesForAutoPromotionQueryData(ConfiguredBaseModel):
-    saas_files: Optional[list[SaasFileV2]] = Field(..., alias="saas_files")
-
-
-def query(query_func: Callable, **kwargs: Any) -> SaasFilesForAutoPromotionQueryData:
-    """
-    This is a convenience function which queries and parses the data into
-    concrete types. It should be compatible with most GQL clients.
-    You do not have to use it to consume the generated data classes.
-    Alternatively, you can also mime and alternate the behavior
-    of this function in the caller.
-
-    Parameters:
-        query_func (Callable): Function which queries your GQL Server
-        kwargs: optional arguments that will be passed to the query function
-
-    Returns:
-        SaasFilesForAutoPromotionQueryData: queried data parsed into generated classes
-    """
-    raw_data: dict[Any, Any] = query_func(DEFINITION, **kwargs)
-    return SaasFilesForAutoPromotionQueryData(**raw_data)

reconcile/typed_queries/saas_files_for_auto_promotions.py

@@ -1,19 +0,0 @@
-from collections.abc import Callable
-from typing import Optional
-
-from reconcile.gql_definitions.saas_auto_promotions_manager.saas_files_for_auto_promotion import (
-    SaasFileV2,
-)
-from reconcile.gql_definitions.saas_auto_promotions_manager.saas_files_for_auto_promotion import (
-    query as query_saas_files_for_auto_promotions,
-)
-from reconcile.utils import gql
-
-
-def get_saas_files_for_auto_promotions(
-    query_func: Optional[Callable] = None,
-) -> list[SaasFileV2]:
-    if not query_func:
-        query_func = gql.get_api().query
-    data = query_saas_files_for_auto_promotions(query_func=query_func)
-    return list(data.saas_files or [])