qontract-reconcile 0.10.1rc47__py3-none-any.whl → 0.10.1rc48__py3-none-any.whl

{qontract_reconcile-0.10.1rc47.dist-info → qontract_reconcile-0.10.1rc48.dist-info}/METADATA

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

@@ -266,14 +266,14 @@ reconcile/prometheus_rules_tester/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 reconcile/prometheus_rules_tester/integration.py,sha256=Sn6mjzC2lJQVcETS1J2Z3tOwm8M3DDW-1GVT-5ccNuA,8860
 reconcile/saas_auto_promotions_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/integration.py,sha256=hmRWva3_ZEO845wMkttEt4X6Izl5p8ZKs09NXWp8mkY,5609
-reconcile/saas_auto_promotions_manager/publisher.py,sha256=Oi7QMlxY56NXO2W4NnB7kSeL-7Ef3oY75mIccoLWBwg,1980
+reconcile/saas_auto_promotions_manager/publisher.py,sha256=8uh7YnR2IPkzJHSxMwvt_iFOnEn6JAHFz2UqLZ86qb8,2338
 reconcile/saas_auto_promotions_manager/subscriber.py,sha256=8w9q1ceA2XnuTntThg8v6mE3K28aG2Y2DwQSuTudkns,6942
 reconcile/saas_auto_promotions_manager/merge_request_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request.py,sha256=PNu7sE-tDUY61E03z5w0b93fdowZ8auCl0S4_vhYOKQ,1333
 reconcile/saas_auto_promotions_manager/merge_request_manager/merge_request_manager.py,sha256=SNJ9WLlaFnf_tblwC0xDBfrXi4SVadeFgV3llhTqbGM,10959
 reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=Ye3lmfWTbuHjMoCEOpGnGRK3QU0LwB_LVfnPXFdNxf4,4702
 reconcile/saas_auto_promotions_manager/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py,sha256=LEK_635Vt7VPWnhVonn54JxkfUKCehX3_6bJfD8zKbI,8597
+reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py,sha256=At9VXApH6n0R7DZoGxMUQ81JUzOQO3Ouf7csbBE14AA,6637
 reconcile/saas_auto_promotions_manager/utils/vcs.py,sha256=wIB3DUazVpmysKuKmHZZ_yG9d04givRBulXrUuZyOgw,5240
 reconcile/skupper_network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/skupper_network/integration.py,sha256=Xps2zaD80FY_e-2vl_skybhuzQmqaC8zQQOY7K1s78o,10746
@@ -295,7 +295,7 @@ reconcile/test/conftest.py,sha256=dBWwQMkcdONERlnBJg4J6Td5Fexpbvme5y-UuoI-c9M,31
 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=4EtLLN0FAJGJnFoSCRsB5hHyY2-H3GMfnn5-p7kNCTg,10340
+reconcile/test/test_auto_promoter.py,sha256=unvv6F7vwIB_V0FG-G9rGmVVxDLQ2m6bWSnypB5q7Ek,10864
 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
@@ -340,7 +340,7 @@ 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=45D8_5frYn3ax-Tw96s2eBKNxY5qmZ1KpHD_iv9Ea80,37402
+reconcile/test/test_saasherder.py,sha256=cZ5SN93furNduYOjdsEZdra-Vo9n9yfG23k2J7k_SZM,37609
 reconcile/test/test_saasherder_allowed_secret_paths.py,sha256=86ffYbbN0Xng8CTiXf3yR_3VD8qyqRpVTByJFycdXp0,4899
 reconcile/test/test_secret_reader.py,sha256=kz7nzcPjvA08cytnvcA_PMA98AEyqJWsESkYeRn5xCk,4994
 reconcile/test/test_slack_base.py,sha256=UqMjYt4hPmStJfog06qwJM_afbf-E9uzy-GX741KgTY,5058
@@ -401,8 +401,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=1QT_pdhgADtKB8VweMWMYxwXlc_aMJ0EZmA9qWC0olw,2103
-reconcile/test/saas_auto_promotions_manager/test_integration_test.py,sha256=lBKDeN7j9i-JxNUyo0hlWU_WkEUUskm4xkcHfPMJm1Y,4562
+reconcile/test/saas_auto_promotions_manager/conftest.py,sha256=DodxMN_hjE3GU7G_k5RYjAoc4Iu1vp0WiE_ISQEG9YA,2382
+reconcile/test/saas_auto_promotions_manager/test_integration_test.py,sha256=8eW0kWCgwCs1gGEkzqKoG77z0Z9HMWpALYoK0iNl5DQ,5164
 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=LGEsqcjs4O4i29LJ0I7g8-uBog1QKFRGA5-8rSfrks0,3302
@@ -416,7 +416,7 @@ reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/test_
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/test_content_single_namespace.py,sha256=w8BT3Z_M7Jz0Xn1OINWypWjmSGMBDGgjt_zY_3iOJoM,2667
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/test_content_single_target.py,sha256=cwAPrQ_v3DR_CHU7Nt2xBGutC-1XslyJ5mXM8FXW-3o,1111
 reconcile/test/saas_auto_promotions_manager/subscriber/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/test/saas_auto_promotions_manager/subscriber/conftest.py,sha256=YmuCS9fIQ6CiAM8pjjtSPe12skQrrch6mD06HTbRdIE,2531
+reconcile/test/saas_auto_promotions_manager/subscriber/conftest.py,sha256=05BZqP5tapjhlcLD0teasbNO1DzBo_xoGhZdxebbWK8,2559
 reconcile/test/saas_auto_promotions_manager/subscriber/data_keys.py,sha256=xaGGbeWtq0aYlJxC-7wJvX3yWnqDSNYMeR0h5rsYAh0,410
 reconcile/test/saas_auto_promotions_manager/subscriber/test_content_hash.py,sha256=6Nkyix3Uyf7Zd9t2C6RnYlQG_y3NsZ6v6zu3G-qF4to,5186
 reconcile/test/saas_auto_promotions_manager/subscriber/test_diff.py,sha256=naArIa1AZj8iaDjzJoYwLX5PqrSNakqsBXonOHEQ0PA,4957
@@ -425,7 +425,7 @@ reconcile/test/saas_auto_promotions_manager/subscriber/test_multiple_channels_mo
 reconcile/test/saas_auto_promotions_manager/subscriber/test_single_channel_with_single_publisher.py,sha256=zIkUg-Vx-Em0-0JY_zC1N3Of_PaB-8GRSqsW5FXLkM8,10244
 reconcile/test/saas_auto_promotions_manager/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=A2bw4U2jcwpQpTd8nab2Pe7QeF-__2CEJp8kWocVHVc,2414
+reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_multiple_publishers_for_single_channel.py,sha256=1O1F-BVWAgcrfPJ7QDpMeQcrZRB0eWa9jCzDZ_o7QS8,2309
 reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_saas_files_use_target_config_hash.py,sha256=qC_GapxJxfTEZ0o5xYuI4BA0cRcX4QLgtlW5MY691nw,2066
 reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_saas_files_with_auto_promote.py,sha256=F3ZGLzNa821yUw68YH9bA1cQEV82_hQxfPjkuJ-ELWw,2707
 reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_saas_files_without_auto_promote.py,sha256=6EYKmXDN9ckkMvdUBZlUiunCKuwQ9UmnPijKvXU8iZo,2170
@@ -445,7 +445,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=aAtAtUGP5yRWI5MxL3GmrhjKNUKOd8RhALECwRZvr3E,11443
+reconcile/typed_queries/saas_files.py,sha256=XU4nzvcD3kUT4Aw-mrupWESc6RANUAwCfBf5OVhD7Lk,12689
 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
@@ -504,7 +504,7 @@ reconcile/utils/output.py,sha256=htcMXMe0y2dNnwu8MW8x0JZ5YBaEJRy5w4tR8yLF0OU,173
 reconcile/utils/pagerduty_api.py,sha256=LgfiGSmg1iLfTsc1ZuHrFh_8qXLz52YWTXv5sF1BpN8,7468
 reconcile/utils/parse_dhms_duration.py,sha256=ZJGlB43MjhgckgO3OF_nacwTiKVRpxb5Yv7m-PnaQLk,1616
 reconcile/utils/password_validator.py,sha256=XwuWg-8CPlcuG7dl_oQ1G1h2gSVSnfMym_VkuprpWVg,2183
-reconcile/utils/promotion_state.py,sha256=xveM7-5hIVcTFpHkE9iYctXB9e-7FApUXIeWkoLFkrU,2172
+reconcile/utils/promotion_state.py,sha256=n7OucbDDkK-8OAzAnTWtHXn14amqtZ7cr-h1MJ-I8hc,3176
 reconcile/utils/promtool.py,sha256=IYNCjj5xDAEdxv6Z0pLdrIcybDfHHtWE9Z6f4LSPcG4,2791
 reconcile/utils/quay_api.py,sha256=EuOegpb-7ntEjkKLFwM2Oo4Nw7SyFtmyl3sQ9aXMtrM,8152
 reconcile/utils/raw_github_api.py,sha256=ZHC-SZuAyRe1zaMoOU7Krt1-zecDxENd9c_NzQYqK9g,2968
@@ -557,9 +557,9 @@ reconcile/utils/runtime/meta.py,sha256=hQ_jHPY0zbyA08hzpfu4FzOw25NqMg_fgCr2r9gGX
 reconcile/utils/runtime/runner.py,sha256=72cc-I6yXyPov8UCLHpyERRy1eiMLpGite2roO0yUlo,7979
 reconcile/utils/runtime/sharding.py,sha256=S43RM_ycFUDVzJD69It91xHZNML_xaAlsbVPR-me5Bk,13638
 reconcile/utils/saasherder/__init__.py,sha256=J3MBZBFa5YmhqYm08QsjBXz8mFcVOCiOCkyIcw41t7E,343
-reconcile/utils/saasherder/interfaces.py,sha256=gj0ACYSwp21hxTjoF3Ztd4EDLZ55QxBaXYJ3yhIgF94,8691
-reconcile/utils/saasherder/models.py,sha256=pmHYafLyasZHeVz_HvHraIb_9ITj4j6S9K604LRtDHg,4700
-reconcile/utils/saasherder/saasherder.py,sha256=oxUVVMIrORWplGghVRK-29tN-JYH4Boolk20EZtu8FA,80885
+reconcile/utils/saasherder/interfaces.py,sha256=MWP9gJOac0NA8mdzCqzta4RYbr680pR8orZmRftv5VU,8840
+reconcile/utils/saasherder/models.py,sha256=R_6Gx71GnK_eWBG1onBbHfHwkektecKGmMTttbKe33E,4725
+reconcile/utils/saasherder/saasherder.py,sha256=hYQOAG3O1w-znNld6mv8xdimh7XIh7WEjYQq-f3qzwk,81112
 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
@@ -583,8 +583,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.10.1rc47.dist-info/METADATA,sha256=mnJJLzn53ztlR9tPr8Xo9Yhr1YWHJ3WZ9oYCLRfdSN8,2288
-qontract_reconcile-0.10.1rc47.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.10.1rc47.dist-info/entry_points.txt,sha256=Af70EWPJxsTiCNF6gA-pWdw1A0Heqn-PZF-oBc5NmiU,302
-qontract_reconcile-0.10.1rc47.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc47.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc48.dist-info/METADATA,sha256=IPX-uDN-ybEdMeUiV7zrZzcLvm2X80poZF9Nv72FFYo,2288
+qontract_reconcile-0.10.1rc48.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.10.1rc48.dist-info/entry_points.txt,sha256=Af70EWPJxsTiCNF6gA-pWdw1A0Heqn-PZF-oBc5NmiU,302
+qontract_reconcile-0.10.1rc48.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc48.dist-info/RECORD,,

reconcile/saas_auto_promotions_manager/publisher.py

@@ -28,10 +28,19 @@ class Publisher:
     def __init__(
         self,
         ref: str,
+        uid: str,
         repo_url: str,
         auth_code: Optional[HasSecret],
     ):
+        """Init.
+
+        ref: The target git ref to fetch the commit sha from.
+        uid: The uid of the saas publisher target.
+        repo_url: The git repo url of the saas publisher target.
+        auth_code: The auth code to use to fetch the commit sha.
+        """
         self._ref = ref
+        self._uid = uid
         self._repo_url = repo_url
         self._auth_code = auth_code
         self.channels: set[str] = set()
@@ -51,6 +60,7 @@ class Publisher:
             promotion_data = deployment_state.get_promotion_data(
                 sha=self.commit_sha,
                 channel=channel,
+                saas_target_uid=self._uid,
             )
             if not (
                 promotion_data

reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py

@@ -34,25 +34,6 @@ class SaasFilesInventory:
         self._assemble_publishers()
         self._remove_unsupported()
 
-    def _assemble_channels(self) -> None:
-        for saas_file in self._saas_files:
-            for resource_template in saas_file.resource_templates:
-                for target in resource_template.targets:
-                    if not target.promotion:
-                        continue
-                    for publish_channel in target.promotion.publish or []:
-                        if publish_channel not in self._channels_by_name:
-                            self._channels_by_name[publish_channel] = Channel(
-                                name=publish_channel,
-                                publishers=[],
-                            )
-                    for subscribe_channel in target.promotion.subscribe or []:
-                        if subscribe_channel not in self._channels_by_name:
-                            self._channels_by_name[subscribe_channel] = Channel(
-                                name=subscribe_channel,
-                                publishers=[],
-                            )
-
     def _assemble_publishers(self) -> None:
         for saas_file in self._saas_files:
             for resource_template in saas_file.resource_templates:
@@ -66,6 +47,7 @@ class SaasFilesInventory:
                     )
                     publisher = Publisher(
                         ref=target.ref,
+                        uid=target.uid,
                         repo_url=resource_template.url,
                         auth_code=auth_code,
                     )
@@ -149,13 +131,6 @@ class SaasFilesInventory:
         for subscriber in self.subscribers:
             is_supported = True
             for channel in subscriber.channels:
-                if len(channel.publishers) > 1:
-                    logging.error(
-                        "[%s] We do not support multiple publishers for a single channel - blocked by https://issues.redhat.com/browse/APPSRE-7414",
-                        channel.name,
-                    )
-                    is_supported = False
-                    break
                 if not channel.publishers:
                     logging.error(
                         "[%s] There must be at least one publisher per channel.",
@@ -163,18 +138,7 @@ class SaasFilesInventory:
                     )
                     is_supported = False
                     break
-                if (
-                    len(subscriber.config_hashes_by_channel_name.get(channel.name, []))
-                    > 1
-                ):
-                    logging.error(
-                        "[%s] We do not support multiple publishers for a single channel - blocked by https://issues.redhat.com/browse/APPSRE-7414",
-                        channel.name,
-                    )
-                    is_supported = False
-                    break
+
             if is_supported:
                 supported_subscribers.append(subscriber)
         self.subscribers = supported_subscribers
-        # Ideally we also remove the publishers that are left w/o subscriber.
-        # But lets solve APPSRE-7414 - then it wont be necessary in the first place.

reconcile/test/saas_auto_promotions_manager/conftest.py

@@ -32,6 +32,11 @@ def saas_files_builder(
                 d["imagePatterns"] = []
             for rt in d.get("resourceTemplates", []):
                 for t in rt.get("targets", []):
+                    if "parent_saas_file_name" not in t:
+                        t["parent_saas_file_name"] = "saas-file-name"
+                    if "parent_resource_template_name" not in t:
+                        t["parent_resource_template_name"] = "resource-template-name"
+
                     ns = t["namespace"]
                     if "name" not in ns:
                         ns["name"] = "some_name"

reconcile/test/saas_auto_promotions_manager/subscriber/conftest.py

@@ -41,6 +41,7 @@ def subscriber_builder() -> Callable[[Mapping[str, Any]], Subscriber]:
             for publisher_name, publisher_data in channel_data.items():
                 publisher = Publisher(
                     ref="",
+                    uid="",
                     repo_url="",
                     auth_code=None,
                 )

reconcile/test/saas_auto_promotions_manager/test_integration_test.py

@@ -92,6 +92,8 @@ def test_integration_test(
                 "ls": [
                     "/promotions/channel-1/new_sha",
                     "/promotions/channel-2/new_sha",
+                    "/deployments/channel-3/target-uid/new_sha",
+                    "/deployments/channel-4/target-uid/new_sha",
                 ],
                 "get": {
                     "promotions/channel-1/new_sha": {
@@ -104,6 +106,16 @@ def test_integration_test(
                         "target_config_hash": "new_hash",
                         "saas_file": "saas_1",
                     },
+                    "/deployments/channel-3/target-uid/new_sha": {
+                        "success": True,
+                        "target_config_hash": "new_hash",
+                        "saas_file": "saas_1",
+                    },
+                    "/deployments/channel-4/target-uid/new_sha": {
+                        "success": True,
+                        "target_config_hash": "new_hash",
+                        "saas_file": "saas_1",
+                    },
                 },
             }
         )

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

@@ -65,6 +65,4 @@ def test_multiple_publishers_for_single_channel(
     )
     inventory = SaasFilesInventory(saas_files=saas_files)
     assert len(inventory.publishers) == 2
-    # As of now we do not support this, i.e., all
-    # subscribers should be removed from the inventory
-    assert len(inventory.subscribers) == 0
+    assert len(inventory.subscribers) == 1

reconcile/test/test_auto_promoter.py

@@ -15,6 +15,7 @@ class TestPromotions(TestCase):
             commit_sha="ahash",
             saas_file="saas_file",
             target_config_hash="123123123",
+            saas_target_uid="saas_target_uid",
         )
 
         expected = {
@@ -50,6 +51,7 @@ class TestPromotions(TestCase):
             publish=["test-channel"],
             commit_sha="ahash",
             target_config_hash="111111111",
+            saas_target_uid="saas_target_uid",
         )
 
         target_promotion = {
@@ -74,6 +76,7 @@ class TestPromotions(TestCase):
             commit_sha="ahash",
             saas_file="saas_file",
             target_config_hash="111111111",
+            saas_target_uid="saas_target_uid",
         )
 
         target_promotion = {
@@ -110,6 +113,7 @@ class TestPromotions(TestCase):
             commit_sha="ahash",
             saas_file="saas_file",
             target_config_hash="111111111",
+            saas_target_uid="saas_target_uid",
         )
 
         target_promotion = {
@@ -142,11 +146,12 @@ class TestPromotions(TestCase):
             commit_sha="ahash",
             saas_file="saas_file",
             target_config_hash="111111111",
+            saas_target_uid="saas_target_uid",
         )
 
         ap = AutoPromoter([promotion])
         self.assertEqual(
-            ap.title, "[auto_promoter] openshift-saas-deploy automated promotion 4af7b1"
+            ap.title, "[auto_promoter] openshift-saas-deploy automated promotion 0a3d57"
         )
 
     def test_description_property(self) -> None:
@@ -157,6 +162,7 @@ class TestPromotions(TestCase):
             commit_sha="ahash",
             saas_file="saas_file",
             target_config_hash="111111111",
+            saas_target_uid="saas_target_uid",
         )
 
         ap = AutoPromoter([promotion])
@@ -170,15 +176,13 @@ class TestPromotions(TestCase):
             commit_sha="ahash",
             saas_file="saas_file",
             target_config_hash="111111111",
+            saas_target_uid="saas_target_uid",
         )
 
         ap = AutoPromoter([promotion])
         self.assertTrue(ap.gitlab_data["source_branch"].startswith("auto_promoter-"))
         self.assertEqual(ap.gitlab_data["target_branch"], "master")
-        self.assertEqual(
-            ap.gitlab_data["title"],
-            "[auto_promoter] openshift-saas-deploy automated promotion 4af7b1",
-        )
+        self.assertEqual(ap.gitlab_data["title"], ap.title)
         self.assertEqual(
             ap.gitlab_data["description"], "openshift-saas-deploy automated promotion"
         )
@@ -193,6 +197,7 @@ class TestPromotions(TestCase):
             commit_sha="ahash",
             saas_file="saas_file",
             target_config_hash="111111111",
+            saas_target_uid="saas_target_uid",
         )
 
         ap = AutoPromoter([promotion])
@@ -210,6 +215,7 @@ class TestPromotions(TestCase):
                         "subscribe": None,
                         "promotion_data": None,
                         "saas_file_paths": ["destination-saas-file"],
+                        "saas_target_uid": "saas_target_uid",
                         "target_paths": None,
                     }
                 ],
@@ -224,6 +230,7 @@ class TestPromotions(TestCase):
             commit_sha="ahash",
             saas_file="saas_file",
             target_config_hash="111111111",
+            saas_target_uid="saas_target_uid",
             promotion_data=[
                 {
                     "channel": "test-channel",
@@ -239,7 +246,7 @@ class TestPromotions(TestCase):
         )
 
         ap = AutoPromoter([promotion])
-        sqs_json = '{"pr_type": "auto_promoter", "promotions": [{"commit_sha": "ahash", "saas_file": "saas_file", "target_config_hash": "111111111", "auto": true, "publish": ["test-channel"], "subscribe": null, "promotion_data": [{"channel": "test-channel", "data": [{"type": "parent_saas_config", "parent_saas": "saas_file", "target_config_hash": "111111111"}]}], "saas_file_paths": ["destination-saas-file"], "target_paths": null}]}'
+        sqs_json = '{"pr_type": "auto_promoter", "promotions": [{"commit_sha": "ahash", "saas_file": "saas_file", "target_config_hash": "111111111", "saas_target_uid": "saas_target_uid", "auto": true, "publish": ["test-channel"], "subscribe": null, "promotion_data": [{"channel": "test-channel", "data": [{"type": "parent_saas_config", "parent_saas": "saas_file", "target_config_hash": "111111111"}]}], "saas_file_paths": ["destination-saas-file"], "target_paths": null}]}'
         self.assertEqual(json.dumps(ap.sqs_data), sqs_json)
 
     def test_init_with_promotion_object(self) -> None:
@@ -250,6 +257,7 @@ class TestPromotions(TestCase):
             commit_sha="ahash",
             saas_file="saas_file",
             target_config_hash="111111111",
+            saas_target_uid="saas_target_uid",
             promotion_data=[
                 {
                     "channel": "test-channel",
@@ -276,6 +284,7 @@ class TestPromotions(TestCase):
             commit_sha="ahash",
             saas_file="saas_file",
             target_config_hash="111111111",
+            saas_target_uid="saas_target_uid",
             promotion_data=[
                 {
                     "channel": "test-channel",

reconcile/test/test_saasherder.py

@@ -28,10 +28,14 @@ from reconcile.gql_definitions.common.saas_files import (
     SaasResourceTemplateTargetV2_SaasSecretParametersV1,
     SaasResourceTemplateV2,
 )
+from reconcile.typed_queries.saas_files import (
+    SaasFile,
+    convert_saas_file_v2_to_saas_file,
+)
 from reconcile.utils.jjb_client import JJB
 from reconcile.utils.openshift_resource import ResourceInventory
 from reconcile.utils.saasherder import SaasHerder
-from reconcile.utils.saasherder.interfaces import SaasFile
+from reconcile.utils.saasherder.interfaces import SaasFile as SaasFileInterface
 from reconcile.utils.saasherder.models import TriggerSpecMovingCommit
 from reconcile.utils.secret_reader import SecretReaderBase
 
@@ -607,7 +611,7 @@ class TestPopulateDesiredState(TestCase):
         self.saasherder.populate_desired_state(ri)
 
         cnt = 0
-        for (cluster, namespace, resource_type, data) in ri:
+        for cluster, namespace, resource_type, data in ri:
             for _, d_item in data["desired"].items():
                 expected = yaml.safe_load(
                     self.fxts.get(
@@ -763,6 +767,7 @@ class TestConfigHashPromotionsValidation(TestCase):
         self.saas_file = self.gql_class_factory(  # type: ignore[attr-defined] # it's set in the fixture
             SaasFileV2, Fixtures("saasherder").get_anymarkup("saas.gql.yml")
         )
+        self.saas_file = convert_saas_file_v2_to_saas_file(self.saas_file)
         self.all_saas_files = [self.saas_file]
 
         self.state_patcher = patch("reconcile.utils.state.State", autospec=True)
@@ -959,7 +964,7 @@ class TestRemoveNoneAttributes(TestCase):
 
 
 def test_render_templated_parameters(
-    gql_class_factory: Callable[..., SaasFile]
+    gql_class_factory: Callable[..., SaasFileInterface]
 ) -> None:
     saas_file = gql_class_factory(
         SaasFileV2,

reconcile/typed_queries/saas_files.py

@@ -1,3 +1,4 @@
+import hashlib
 import json
 from collections.abc import Callable
 from typing import (
@@ -23,6 +24,7 @@ from reconcile.gql_definitions.common.saas_files import (
     PipelinesProviderV1,
     RoleV1,
     SaasFileAuthenticationV1,
+    SaasFileV2,
     SaasResourceTemplateTargetImageV1,
     SaasResourceTemplateTargetNamespaceSelectorV1,
     SaasResourceTemplateTargetPromotionV1,
@@ -70,11 +72,27 @@ class SaasResourceTemplateTarget(ConfiguredBaseModel):
     image: Optional[SaasResourceTemplateTargetImageV1] = Field(..., alias="image")
     disable: Optional[bool] = Field(..., alias="disable")
     delete: Optional[bool] = Field(..., alias="delete")
+    parent_saas_file_name: Optional[str] = None
+    parent_resource_template_name: Optional[str] = None
 
     class Config:
         # ignore `namespaceSelector` and 'provider' fields from the GQL schema
         extra = Extra.ignore
 
+    @property
+    def uid(self) -> str:
+        """Returns a unique identifier for a target."""
+        if not self.parent_resource_template_name:
+            raise ValueError(
+                "parent_resource_template_name must be set before calling uid()"
+            )
+        if not self.parent_saas_file_name:
+            raise ValueError("parent_saas_file_name must be set before calling uid()")
+        return hashlib.blake2s(
+            f"{self.parent_saas_file_name}:{self.parent_resource_template_name}:{self.name if self.name else 'default'}:{self.namespace.cluster.name}:{self.namespace.name}".encode(),
+            digest_size=20,
+        ).hexdigest()
+
 
 class SaasResourceTemplate(ConfiguredBaseModel):
     name: str = Field(..., alias="name")
@@ -205,6 +223,16 @@ def create_targets_for_namespace_selector(
     return targets
 
 
+def convert_saas_file_v2_to_saas_file(saas_file_gql: SaasFileV2) -> SaasFile:
+    """Convert a SaasFileV2 to a SaasFile and inject the parent objects."""
+    saas_file = SaasFile(**export_model(saas_file_gql))
+    for tmpl in saas_file.resource_templates:
+        for target in tmpl.targets:
+            target.parent_saas_file_name = saas_file.name
+            target.parent_resource_template_name = tmpl.name
+    return saas_file
+
+
 def get_saas_files(
     name: Optional[str] = None,
     env_name: Optional[str] = None,
@@ -245,7 +273,7 @@ def get_saas_files(
                     )
         # convert SaasFileV2 (with optional resource_templates.targets.namespace field)
         # to SaasFile (with required resource_templates.targets.namespace field)
-        saas_files.append(SaasFile(**export_model(saas_file_gql)))
+        saas_files.append(convert_saas_file_v2_to_saas_file(saas_file_gql))
 
     if name is None and env_name is None and app_name is None:
         return saas_files

reconcile/utils/promotion_state.py

@@ -47,28 +47,51 @@ class PromotionState:
         """
         all_keys = self._state.ls()
         for commit in all_keys:
-            # Format: /promotions/{channel}/{commit-sha}
-            if not commit.startswith("/promotions/"):
+            # for backwards compatibility - remove this after a while
+            if commit.startswith("/promotions/"):
+                # Format: /promotions/{channel}/{commit-sha}
+                _, _, channel_name, commit_sha = commit.split("/")
+                self._commits_by_channel[channel_name].add(commit_sha)
+            # / for backwards compatibility - remove this after a while
+
+            # Format: /deployments/{channel}/{saas-target-uid}/{commit-sha}
+            if not commit.startswith("/deployments/"):
                 continue
-            _, _, channel_name, commit_sha = commit.split("/")
-            self._commits_by_channel[channel_name].add(commit_sha)
+            _, _, channel_name, saas_target_uid, commit_sha = commit.split("/")
+            self._commits_by_channel[f"{channel_name}/{saas_target_uid}"].add(
+                commit_sha
+            )
 
     def get_promotion_data(
-        self, sha: str, channel: str, local_lookup: bool = True
+        self, sha: str, channel: str, saas_target_uid: str, local_lookup: bool = True
     ) -> Optional[PromotionData]:
-        if local_lookup and sha not in self._commits_by_channel[channel]:
+        if (
+            local_lookup
+            and sha not in self._commits_by_channel[channel]
+            and sha not in self._commits_by_channel[f"{channel}/{saas_target_uid}"]
+        ):
             # Lets reduce unecessary calls to S3
             return None
+
+        # for backwards compatibility - remove this after a while
         key = f"promotions/{channel}/{sha}"
         try:
             data = self._state.get(key)
+            return PromotionData(**data)
+        except KeyError:
+            pass
+        # / for backwards compatibility - remove this after a while
+
+        key = f"deployments/{channel}/{saas_target_uid}/{sha}"
+        try:
+            data = self._state.get(key)
+            return PromotionData(**data)
         except KeyError:
             return None
-        return PromotionData(**data)
 
     def publish_promotion_data(
-        self, sha: str, channel: str, data: PromotionData
+        self, sha: str, channel: str, saas_target_uid: str, data: PromotionData
     ) -> None:
-        state_key = f"promotions/{channel}/{sha}"
+        state_key = f"deployments/{channel}/{saas_target_uid}/{sha}"
         self._state.add(state_key, data.dict(), force=True)
         logging.info("Uploaded %s to %s", data, state_key)

reconcile/utils/saasherder/interfaces.py

@@ -332,7 +332,11 @@ class SaasResourceTemplateTarget(HasParameters, HasSecretParameters, Protocol):
         ...
 
     def dict(self, *, by_alias: bool = False) -> dict[str, Any]:
-        ...
+        """Return a dictionary representation of the model."""
+
+    @property
+    def uid(self) -> str:
+        """Return a unique identifier for the target."""
 
 
 class SaasResourceTemplate(HasParameters, HasSecretParameters, Protocol):

reconcile/utils/saasherder/models.py

@@ -167,6 +167,7 @@ class Promotion(BaseModel):
     commit_sha: str
     saas_file: str
     target_config_hash: str
+    saas_target_uid: str
     auto: Optional[bool] = None
     publish: Optional[list[str]] = None
     subscribe: Optional[list[str]] = None

reconcile/utils/saasherder/saasherder.py

@@ -996,6 +996,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                 commit_sha=commit_sha,
                 saas_file=saas_file_name,
                 target_config_hash=target_config_hash,
+                saas_target_uid=target.uid,
             )
         return resources, html_url, target_promotion
 
@@ -1768,7 +1769,10 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
             if promotion.subscribe:
                 for channel in promotion.subscribe:
                     info = self._promotion_state.get_promotion_data(
-                        sha=promotion.commit_sha, channel=channel, local_lookup=False
+                        sha=promotion.commit_sha,
+                        channel=channel,
+                        saas_target_uid=promotion.saas_target_uid,
+                        local_lookup=False,
                     )
                     if not (info and info.success):
                         logging.error(
@@ -1860,6 +1864,7 @@ class SaasHerder:  # pylint: disable=too-many-public-methods
                     self._promotion_state.publish_promotion_data(
                         sha=promotion.commit_sha,
                         channel=channel,
+                        saas_target_uid=promotion.saas_target_uid,
                         data=PromotionData(
                             saas_file=promotion.saas_file,
                             success=success,