fix: preserve update behavior in dAuth staging

Author: aledefra

extensions/business/deeploy/deeploy_manager_api.py

@@ -871,15 +871,6 @@ def _process_pipeline_request(
         inputs.target_nodes = deployment_targets
         inputs[DEEPLOY_KEYS.TARGET_NODES_COUNT] = len(deployment_targets)
         inputs.target_nodes_count = len(deployment_targets)
-        # Ensure plugin IDs are preserved for existing instances before any destructive action.
-        self._ensure_plugin_instance_ids(
-          inputs,
-          discovered_plugin_instances=discovered_plugin_instances,
-          owner=auth_result[DEEPLOY_KEYS.ESCROW_OWNER],
-          app_id=app_id,
-          job_id=job_id,
-        )
-
         if deeploy_specs_for_update is not None and not isinstance(deeploy_specs_for_update, dict):
           msg = (
             f"{DEEPLOY_ERRORS.REQUEST3}. Unexpected 'deeploy_specs' payload type "

extensions/business/deeploy/tests/test_update_requests.py

@@ -91,7 +91,14 @@ def chainstore_hset(hkey, key, value):
 
     plugin.chainstore_hset = chainstore_hset
 
-    called = {"delete": 0, "deploy": 0, "deploy_kwargs": None, "queued": 0, "bc_update": 0}
+    called = {
+      "delete": 0,
+      "deploy": 0,
+      "deploy_kwargs": None,
+      "queued": 0,
+      "bc_update": 0,
+      "stage": 0,
+    }
     plugin.bc = types.SimpleNamespace(
       node_addr_to_eth_addr=lambda node: node,
       submit_node_update=lambda **kwargs: called.__setitem__("bc_update", called["bc_update"] + 1),
@@ -116,11 +123,15 @@ def build_pipeline_config(**kwargs):
 
     plugin.cmdapi_build_pipeline_config = build_pipeline_config
     plugin._load_dauth_job_secret_bundle = lambda job_id: None
-    plugin.stage_job_pipeline_and_secrets = lambda pipeline, job_id, secret_bundle: {
-      "job_id": str(job_id),
-      "pipeline": copy.deepcopy(pipeline),
-      "secret_bundle": copy.deepcopy(secret_bundle),
-    }
+    def stage_job_pipeline_and_secrets(pipeline, job_id, secret_bundle):
+      called["stage"] += 1
+      return {
+        "job_id": str(job_id),
+        "pipeline": copy.deepcopy(pipeline),
+        "secret_bundle": copy.deepcopy(secret_bundle),
+      }
+
+    plugin.stage_job_pipeline_and_secrets = stage_job_pipeline_and_secrets
     plugin.commit_staged_job_pipeline_and_secrets = lambda state: True
     plugin.rollback_staged_job_pipeline_and_secrets = lambda state: True
     plugin.delete_pipeline_from_nodes = lambda **kwargs: called.__setitem__("delete", called["delete"] + 1)
@@ -1709,7 +1720,8 @@ def test_process_update_uses_persisted_pipeline_when_all_old_nodes_are_offline(s
     self.assertEqual(response[DEEPLOY_KEYS.STATUS], DEEPLOY_STATUS.COMMAND_DELIVERED)
     self.assertEqual(called["delete"], 0)
     self.assertEqual(called["deploy"], 1)
-    self.assertEqual(called["queued"], 1)
+    self.assertEqual(called["stage"], 1)
+    self.assertEqual(called["queued"], 0)
     self.assertEqual(called["bc_update"], 1)
     self.assertEqual(called["deploy_kwargs"]["new_nodes"], ["new-node-1"])
     redeploy_plugins = called["deploy_kwargs"]["inputs"][DEEPLOY_KEYS.PLUGINS]