From 7f6ee55d5314a8876bea366480b4beeec2649eed Mon Sep 17 00:00:00 2001
From: Markus Braunbeck <32308695+mr-ks@users.noreply.github.com>
Date: Wed, 15 May 2024 21:06:33 +0200
Subject: [PATCH] chore: replace custom merge logic

---
 .../plugins/azuredevops_go/api/connection_api.go   | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/backend/plugins/azuredevops_go/api/connection_api.go b/backend/plugins/azuredevops_go/api/connection_api.go
index 1ff2bec3ac5..7da66cd1fe5 100644
--- a/backend/plugins/azuredevops_go/api/connection_api.go
+++ b/backend/plugins/azuredevops_go/api/connection_api.go
@@ -69,22 +69,10 @@ func TestConnection(input *plugin.ApiResourceInput) (*plugin.ApiResourceOutput,
 // @Failure 500  {string} errcode.Error "Internal Error"
 // @Router /plugins/azuredevops/connections/{connectionId}/test [POST]
 func TestExistingConnection(input *plugin.ApiResourceInput) (*plugin.ApiResourceOutput, errors.Error) {
-	connection, err := dsHelper.ConnApi.FindByPk(input)
+	connection, err := dsHelper.ConnApi.GetMergedConnection(input)
 	if err != nil {
 		return nil, errors.BadInput.Wrap(err, "can't read connection from database")
 	}
-	var updatedConn models.AzuredevopsConn
-	if err := api.Decode(input.Body, &updatedConn, nil); err != nil {
-		return nil, err
-	}
-
-	if updatedConn.Token != "" {
-		connection.Token = updatedConn.Token
-	}
-
-	if updatedConn.Organization != "" {
-		connection.Organization = updatedConn.Organization
-	}
 
 	body, err := testConnection(context.TODO(), *connection)
 	if err != nil {