From bf93d79cabce0da539d0b0d63009a2f42961a443 Mon Sep 17 00:00:00 2001 From: Karan Saraswat Date: Mon, 6 May 2024 14:39:27 +0530 Subject: [PATCH 1/2] fix: [CODE-1870]: adding cloneUrl to the convertRepository method for azure driver --- scm/driver/azure/repo.go | 1 + scm/driver/azure/testdata/repo.json.golden | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scm/driver/azure/repo.go b/scm/driver/azure/repo.go index edfd4d876..8c1882bd0 100644 --- a/scm/driver/azure/repo.go +++ b/scm/driver/azure/repo.go @@ -279,6 +279,7 @@ func convertRepository(from *repository) *scm.Repository { Name: from.Name, Link: from.URL, Branch: scm.TrimRef(from.DefaultBranch), + Clone: from.RemoteURL, } } diff --git a/scm/driver/azure/testdata/repo.json.golden b/scm/driver/azure/testdata/repo.json.golden index 92f3b874a..6ec2a9323 100644 --- a/scm/driver/azure/testdata/repo.json.golden +++ b/scm/driver/azure/testdata/repo.json.golden @@ -2,5 +2,6 @@ "ID": "91f0d4cb-4c36-49a5-b28d-2d72da089c4d", "Name": "test_project", "Branch": "main", - "Link": "https://dev.azure.com/tphoney/d350c9c0-7749-4ff8-a78f-f9c1f0e56729/_apis/git/repositories/91f0d4cb-4c36-49a5-b28d-2d72da089c4d" + "Link": "https://dev.azure.com/tphoney/d350c9c0-7749-4ff8-a78f-f9c1f0e56729/_apis/git/repositories/91f0d4cb-4c36-49a5-b28d-2d72da089c4d", + "Clone": "https://tphoney@dev.azure.com/tphoney/test_project/_git/test_project" } \ No newline at end of file From 9de001d92f7f9655b0e8c1e6e59e23a82d350279 Mon Sep 17 00:00:00 2001 From: Karan Saraswat Date: Mon, 6 May 2024 14:47:38 +0530 Subject: [PATCH 2/2] fixed tests --- scm/driver/azure/testdata/repos.json.golden | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scm/driver/azure/testdata/repos.json.golden b/scm/driver/azure/testdata/repos.json.golden index cbe9d840d..5be3b9ae3 100644 --- a/scm/driver/azure/testdata/repos.json.golden +++ b/scm/driver/azure/testdata/repos.json.golden @@ -3,12 +3,14 @@ "ID": "91f0d4cb-4c36-49a5-b28d-2d72da089c4d", "Name": "test_project", "Branch": "main", - "Link": "https://dev.azure.com/tphoney/d350c9c0-7749-4ff8-a78f-f9c1f0e56729/_apis/git/repositories/91f0d4cb-4c36-49a5-b28d-2d72da089c4d" + "Link": "https://dev.azure.com/tphoney/d350c9c0-7749-4ff8-a78f-f9c1f0e56729/_apis/git/repositories/91f0d4cb-4c36-49a5-b28d-2d72da089c4d", + "Clone": "https://tphoney@dev.azure.com/tphoney/test_project/_git/test_project" }, { "ID": "fde2d21f-13b9-4864-a995-83329045289a", "Name": "test_repo2", "Branch": "main", - "Link": "https://dev.azure.com/tphoney/d350c9c0-7749-4ff8-a78f-f9c1f0e56729/_apis/git/repositories/fde2d21f-13b9-4864-a995-83329045289a" + "Link": "https://dev.azure.com/tphoney/d350c9c0-7749-4ff8-a78f-f9c1f0e56729/_apis/git/repositories/fde2d21f-13b9-4864-a995-83329045289a", + "Clone": "https://tphoney@dev.azure.com/tphoney/test_project/_git/test_repo2" } ] \ No newline at end of file