qontract-reconcile 0.10.1rc720__py3-none-any.whl → 0.10.1rc722__py3-none-any.whl

{qontract_reconcile-0.10.1rc720.dist-info → qontract_reconcile-0.10.1rc722.dist-info}/METADATA

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

@@ -61,7 +61,7 @@ reconcile/ocm_groups.py,sha256=CluPyvmwE5JOZS2HQSReC1sD8L1ChhnJlAg8lcwdtxc,3395
 reconcile/ocm_machine_pools.py,sha256=oY4oLPm5Y_ajBV8KFg2LuBQvsZl-CxTjSxEyxg4b2OI,16634
 reconcile/ocm_update_recommended_version.py,sha256=IYkfLXIprOW1jguZeELcGP1iBPuj-b53R-FTqKulMl8,4204
 reconcile/ocm_upgrade_scheduler_org_updater.py,sha256=49Ss6sp9_n5F9914gXb-uEap4Vm2t-KPTJRFFViJMIo,4184
-reconcile/openshift_base.py,sha256=Tq3gCYcEMkGd9ryJrwq_W_qyO30ENIZapU1bv0xa6wU,49695
+reconcile/openshift_base.py,sha256=AYTXEfQaU91PRpNJKunf0PILL_zAJMq6jySYfGHzcNg,49702
 reconcile/openshift_cluster_bots.py,sha256=eRPYZqWMKFNxLlSN0QG97V5t1iIESQ0BbGaiaQP5VB0,10940
 reconcile/openshift_clusterrolebindings.py,sha256=QfSy1Ik8eEY5XObc1Q4xyhqyErZenJmbPv_u9wcDNNo,5864
 reconcile/openshift_groups.py,sha256=fqBQ6ITDOArkC_zOjskmMigdCUDq3wntLZ0NcppXaFc,9414
@@ -386,8 +386,8 @@ reconcile/rhidp/sso_client/integration.py,sha256=kA8g7c38ZBSdrRtyfEqy_WgSreD1Pbw
 reconcile/rhidp/sso_client/metrics.py,sha256=Tq7tSOsqL3XdcPUdozxqzSPIodUeOV87UCTqpuuqqhw,1013
 reconcile/saas_auto_promotions_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/saas_auto_promotions_manager/integration.py,sha256=h1RS-rE8_UaVoLV4c9NyfNfjzvHLQcEVwVN_2UxT7T8,6843
-reconcile/saas_auto_promotions_manager/publisher.py,sha256=N4VSKLkMtN9Bx1yxAETC-JZf-vgZZLRYzgercFkpBto,2507
-reconcile/saas_auto_promotions_manager/s3_exporter.py,sha256=gSqfJPBT-Cq5f5B5AweA5yBFywMvOp2rFCIFvHZ-ma4,2533
+reconcile/saas_auto_promotions_manager/publisher.py,sha256=psrthZGgCQDUO3rwQjKSBMlwcTgfij6sxdebGuxkNv4,2739
+reconcile/saas_auto_promotions_manager/s3_exporter.py,sha256=IKlVWZmiPnvl7sKeF6JgAlhXZe5CovKTxQc0SNkNSx4,2583
 reconcile/saas_auto_promotions_manager/subscriber.py,sha256=cLhPlkT71J2LIice3SLmH1WpsqzV46gd0peMxrnqyRw,7452
 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=BeAJWLow7b4HQyZ9zz398sQkPeIz8chpMkCts2NU27c,1282
@@ -397,7 +397,7 @@ reconcile/saas_auto_promotions_manager/merge_request_manager/mr_parser.py,sha256
 reconcile/saas_auto_promotions_manager/merge_request_manager/reconciler.py,sha256=nst5ZynEQs9Hy9Z2DAjN8_ALIS_5XnrbJh7KG4YVRrE,7789
 reconcile/saas_auto_promotions_manager/merge_request_manager/renderer.py,sha256=Z2G4wMQB3DLTuMlH_MGURGR4uLyh-6RnksQJzdym5VQ,6960
 reconcile/saas_auto_promotions_manager/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py,sha256=E2bKumh4oAIOitUKGWfxhZAuLg4KCbRAlz2IT3nr6Jg,7321
+reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py,sha256=ZNxwqp9kdUSoxb3kTdM4KrtPyd3V5O4jMfjrVT2IJfs,7605
 reconcile/skupper_network/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 reconcile/skupper_network/integration.py,sha256=178Q9RSYuZ9NmrCK4jRMLMekrewUaaRdclccI6zBsQ8,10786
 reconcile/skupper_network/models.py,sha256=DNTI7HZv-rqY42GIIxyRuvroHLvdH6rJerjIq9lj3RU,6663
@@ -523,7 +523,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_target.py,sha256=6g4s2c--W4l_PMTcCA_8aNM85YejwDZttQOz5Iowido,1908
 reconcile/test/saas_auto_promotions_manager/merge_request_manager/renderer/test_json_path_selector.py,sha256=k_jA4x_9fRGGAT1T0aeAFiZwZ7zlDZpPPgqMDeuR7y8,2189
 reconcile/test/saas_auto_promotions_manager/subscriber/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-reconcile/test/saas_auto_promotions_manager/subscriber/conftest.py,sha256=95aN4wCAYqTRd8ch-UA1yaon36B4T1wr8G7QtU8kMHg,2984
+reconcile/test/saas_auto_promotions_manager/subscriber/conftest.py,sha256=5hMe91UEp_GQm49OeTee4ALv_xq2KhWwF6NfzzQwpnc,3101
 reconcile/test/saas_auto_promotions_manager/subscriber/data_keys.py,sha256=2j4Ue-njmK53Xm4vJScT2MJJeKV7wk9xf_95pmNfLWE,402
 reconcile/test/saas_auto_promotions_manager/subscriber/test_content_hash.py,sha256=viw-p42vDOC2telE5lelssRBL7V35aNJ1qUg6D-QGWw,4546
 reconcile/test/saas_auto_promotions_manager/subscriber/test_diff.py,sha256=BkxCoWBlUahY5Vq36FX_t_UyIdzIc64CumzAd3imUAQ,4529
@@ -533,10 +533,10 @@ reconcile/test/saas_auto_promotions_manager/subscriber/test_multiple_publishers_
 reconcile/test/saas_auto_promotions_manager/subscriber/test_single_channel_with_single_publisher.py,sha256=YDXCzrclRyKRW7qRBg9GB2HinJP_HPqzTcWMGD1rbFI,9452
 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=61dZUvWN_d8kiQpf1p6TM_u3vKYvZylDb9eDTm-JjDY,2108
-reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_saas_files_use_target_config_hash.py,sha256=2xTgQyfYrgBsZcaAj0ypQlNojiFeM_djD6BUL3g1yQ4,1889
-reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_saas_files_with_auto_promote.py,sha256=Wfwxu8duYlvHS6DwCQ5SySIM96Ryv5LbAikl4Tkoylw,2486
-reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_saas_files_without_auto_promote.py,sha256=H3qQVfdu8huBXWooVjhXb7GyNTH6OyZcrJGW1_Smwnk,1981
+reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_multiple_publishers_for_single_channel.py,sha256=jX8ade2615gRYiJ_Bui4F2kvv3rUyod5sdiMFhzcnsw,2168
+reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_saas_files_use_target_config_hash.py,sha256=TThr7UeF8k7lNBeknknEcE4H9z-_K4jKdzNA_SqFKoY,1948
+reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_saas_files_with_auto_promote.py,sha256=OSSdVEQ72npDRrbkx5JHhXus-0ku699wG7ecsco4axM,2545
+reconcile/test/saas_auto_promotions_manager/utils/saas_files_inventory/test_saas_files_without_auto_promote.py,sha256=6GoZ6ogpXBVYlRwag2wu9Z-1ES9LzyPxMqZkcX7oTA0,2040
 reconcile/typed_queries/__init__.py,sha256=rRk4CyslLsBr4vAh1pIPgt6s3P4R1M9NSEPLnyQgBpk,61
 reconcile/typed_queries/alerting_services_settings.py,sha256=sX6s8GY-BB0UHogMC1ICeREVab-IYrNm1c-hqMGEdYQ,864
 reconcile/typed_queries/app_interface_custom_messages.py,sha256=5HWr68_kb4bEL8pDCIH0ez6GOrdwdbGF6w88xV0_Ccs,718
@@ -764,8 +764,8 @@ tools/test/test_app_interface_metrics_exporter.py,sha256=SX7qL3D1SIRKFo95FoQztvf
 tools/test/test_qontract_cli.py,sha256=UEwAW7PA_GIrbqzaLxpkCxbuVjEFLNvnVG-6VyoCGIc,4147
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc720.dist-info/METADATA,sha256=37xORtZZIGEYo1VV4nfXuJQPGs88vCTYA0QSlRJ1WCY,2382
-qontract_reconcile-0.10.1rc720.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-qontract_reconcile-0.10.1rc720.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
-qontract_reconcile-0.10.1rc720.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc720.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc722.dist-info/METADATA,sha256=D6uS6jwPWUkVI1yrzGcBQE91CIF3igTnWPn_b5dRJ-4,2382
+qontract_reconcile-0.10.1rc722.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+qontract_reconcile-0.10.1rc722.dist-info/entry_points.txt,sha256=rIxI5zWtHNlfpDeq1a7pZXAPoqf7HG32KMTN3MeWK_8,429
+qontract_reconcile-0.10.1rc722.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc722.dist-info/RECORD,,

reconcile/openshift_base.py

@@ -416,7 +416,7 @@ def apply(
         except FieldIsImmutableError:
             # Add more resources types to the list when you're
             # sure they're safe.
-            if resource_type not in {"Route", "Service", "Secret"}:
+            if resource_type not in {"Route", "Service", "Secret", "Job"}:
                 raise
             oc.delete(namespace=namespace, kind=resource_type, name=resource.name)
             oc.apply(namespace=namespace, resource=annotated)

reconcile/saas_auto_promotions_manager/publisher.py

@@ -32,11 +32,14 @@ class Publisher:
         uid: str,
         saas_name: str,
         saas_file_path: str,
+        app_name: str,
         namespace_name: str,
         resource_template_name: str,
         target_name: Optional[str],
         cluster_name: str,
         auth_code: Optional[HasSecret],
+        publish_job_logs: Optional[bool],
+        has_subscriber: bool = True,
     ):
         self._ref = ref
         self._repo_url = repo_url
@@ -47,10 +50,13 @@ class Publisher:
         self.uid = uid
         self.saas_name = saas_name
         self.saas_file_path = saas_file_path
+        self.app_name = app_name
         self.namespace_name = namespace_name
         self.resource_template_name = resource_template_name
-        self.target_name = target_name if target_name else "default"
+        self.target_name = target_name if target_name else "None"
         self.cluster_name = cluster_name
+        self.publish_job_logs = bool(publish_job_logs)
+        self.has_subscriber = has_subscriber
 
     def fetch_commit_shas_and_deployment_info(
         self, vcs: VCS, deployment_state: PromotionState

reconcile/saas_auto_promotions_manager/s3_exporter.py

@@ -62,7 +62,7 @@ class S3Exporter:
         data: dict[str, dict] = {}
         for publisher in publishers:
             publisher_data = PublisherData.from_publisher(publisher)
-            key = f"{publisher.saas_name}/{publisher.resource_template_name}/{publisher.target_name}/{publisher.cluster_name}/{publisher.namespace_name}"
+            key = f"{publisher.app_name}/{publisher.saas_name}/{publisher.resource_template_name}/{publisher.target_name}/{publisher.cluster_name}/{publisher.namespace_name}/{publisher.publish_job_logs}"
             data[key] = {
                 "commit_sha": publisher_data.commit_sha,
                 "deployment_state": publisher_data.deployment_state.value,

reconcile/saas_auto_promotions_manager/utils/saas_files_inventory.py

@@ -34,6 +34,10 @@ class SaasFilesInventory:
         self._assemble_publishers()
         self._remove_unsupported()
 
+    @property
+    def publishers_with_subscribers(self) -> list[Publisher]:
+        return [p for p in self.publishers if p.has_subscriber]
+
     def _assemble_publishers(self) -> None:
         for saas_file in self._saas_files:
             for resource_template in saas_file.resource_templates:
@@ -54,12 +58,15 @@ class SaasFilesInventory:
                         repo_url=resource_template.url,
                         saas_file_path=saas_file.path,
                         saas_name=saas_file.name,
+                        app_name=saas_file.app.name,
                         namespace_name=target.namespace.name,
                         cluster_name=target.namespace.cluster.name,
                         resource_template_name=resource_template.name,
                         target_name=target.name,
+                        publish_job_logs=saas_file.publish_job_logs,
                         auth_code=auth_code,
                     )
+
                     has_subscriber = False
                     for publish_channel in target.promotion.publish or []:
                         if publish_channel not in self._channels_by_name:
@@ -71,8 +78,9 @@ class SaasFilesInventory:
                         self._channels_by_name[publish_channel].publishers.append(
                             publisher
                         )
-                    if has_subscriber:
-                        self.publishers.append(publisher)
+
+                    publisher.has_subscriber = has_subscriber
+                    self.publishers.append(publisher)
 
     def _assemble_subscribers_with_auto_promotions(self) -> None:
         for saas_file in self._saas_files:

reconcile/test/saas_auto_promotions_manager/subscriber/conftest.py

@@ -52,8 +52,11 @@ def subscriber_builder(
                     namespace_name="",
                     saas_name="",
                     saas_file_path="",
+                    app_name="",
                     resource_template_name="",
                     target_name=None,
+                    publish_job_logs=True,
+                    has_subscriber=True,
                     auth_code=None,
                 )
                 publisher.commit_sha = publisher_data[REAL_WORLD_SHA]

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

@@ -62,5 +62,7 @@ def test_multiple_publishers_for_single_channel(
         },
     ])
     inventory = SaasFilesInventory(saas_files=saas_files)
-    assert len(inventory.publishers) == 2
+
+    assert len(inventory.publishers) == 3
+    assert len(inventory.publishers_with_subscribers) == 2
     assert len(inventory.subscribers) == 1

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

@@ -56,6 +56,7 @@ def test_use_target_config_hash(
         },
     ])
     inventory = SaasFilesInventory(saas_files=saas_files)
-    assert len(inventory.publishers) == 1
+    assert len(inventory.publishers) == 2
+    assert len(inventory.publishers_with_subscribers) == 1
     assert len(inventory.subscribers) == 1
     assert inventory.subscribers[0]._use_target_config_hash

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

@@ -67,6 +67,7 @@ def test_single_channel(
         },
     ])
     inventory = SaasFilesInventory(saas_files=saas_files)
-    assert len(inventory.publishers) == 1
+    assert len(inventory.publishers) == 2
+    assert len(inventory.publishers_with_subscribers) == 1
     assert len(inventory.subscribers) == 1
     assert not inventory.subscribers[0]._use_target_config_hash

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

@@ -59,5 +59,6 @@ def test_saas_files_without_auto_promote(
         },
     ])
     inventory = SaasFilesInventory(saas_files=saas_files)
-    assert len(inventory.publishers) == 0
+    assert len(inventory.publishers) == 2
+    assert len(inventory.publishers_with_subscribers) == 0
     assert len(inventory.subscribers) == 0