From f922b06760ac66532ea61266cb486376c461f6ac Mon Sep 17 00:00:00 2001
From: etaques <etaques@daitan.com>
Date: Wed, 4 Oct 2023 10:54:40 -0300
Subject: [PATCH] fix (maestro): reset error message when sink update

---
 maestro/deployment/service.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/maestro/deployment/service.go b/maestro/deployment/service.go
index cab9de5b6..6ff3f04fb 100644
--- a/maestro/deployment/service.go
+++ b/maestro/deployment/service.go
@@ -147,11 +147,12 @@ func (d *deploymentService) UpdateDeployment(ctx context.Context, deployment *De
 	if err != nil {
 		d.logger.Warn("could not stop running collector, will try to update anyway", zap.Error(err))
 	}
-	err = deployment.Merge(*got)
+	err = got.Merge(*deployment)
 	if err != nil {
 		d.logger.Error("error during merge of deployments", zap.Error(err))
 		return err
 	}
+	deployment = got
 	deployment.LastCollectorStopTime = &now
 	codedConfig, err := d.encodeConfig(deployment)
 	if err != nil {