Merge pull request #304 from drone/CODE-1870

karansaraswat19 · web-flow · commit 0a0caf128644 · 2024-05-06T23:17:37.000+05:30
fix: [CODE-1870]: adding cloneUrl to the convertRepository method for…
diff --git 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
@@ -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"
 }
diff --git 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"
     }
 ]

Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,7 @@ func convertRepository(from repository) scm.Repository {`
`279`	`279`	`Name: from.Name,`
`280`	`280`	`Link: from.URL,`
`281`	`281`	`Branch: scm.TrimRef(from.DefaultBranch),`
	`282`	`+ Clone: from.RemoteURL,`
`282`	`283`	`}`
`283`	`284`	`}`
`284`	`285`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,6 @@`
`2`	`2`	`"ID": "91f0d4cb-4c36-49a5-b28d-2d72da089c4d",`
`3`	`3`	`"Name": "test_project",`
`4`	`4`	`"Branch": "main",`
`5`		`- "Link": "https://dev.azure.com/tphoney/d350c9c0-7749-4ff8-a78f-f9c1f0e56729/_apis/git/repositories/91f0d4cb-4c36-49a5-b28d-2d72da089c4d"`
	`5`	`+ "Link": "https://dev.azure.com/tphoney/d350c9c0-7749-4ff8-a78f-f9c1f0e56729/_apis/git/repositories/91f0d4cb-4c36-49a5-b28d-2d72da089c4d",`
	`6`	`+ "Clone": "https://[email protected]/tphoney/test_project/_git/test_project"`
`6`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,14 @@`
`3`	`3`	`"ID": "91f0d4cb-4c36-49a5-b28d-2d72da089c4d",`
`4`	`4`	`"Name": "test_project",`
`5`	`5`	`"Branch": "main",`
`6`		`- "Link": "https://dev.azure.com/tphoney/d350c9c0-7749-4ff8-a78f-f9c1f0e56729/_apis/git/repositories/91f0d4cb-4c36-49a5-b28d-2d72da089c4d"`
	`6`	`+ "Link": "https://dev.azure.com/tphoney/d350c9c0-7749-4ff8-a78f-f9c1f0e56729/_apis/git/repositories/91f0d4cb-4c36-49a5-b28d-2d72da089c4d",`
	`7`	`+ "Clone": "https://[email protected]/tphoney/test_project/_git/test_project"`
`7`	`8`	`},`
`8`	`9`	`{`
`9`	`10`	`"ID": "fde2d21f-13b9-4864-a995-83329045289a",`
`10`	`11`	`"Name": "test_repo2",`
`11`	`12`	`"Branch": "main",`
`12`		`- "Link": "https://dev.azure.com/tphoney/d350c9c0-7749-4ff8-a78f-f9c1f0e56729/_apis/git/repositories/fde2d21f-13b9-4864-a995-83329045289a"`
	`13`	`+ "Link": "https://dev.azure.com/tphoney/d350c9c0-7749-4ff8-a78f-f9c1f0e56729/_apis/git/repositories/fde2d21f-13b9-4864-a995-83329045289a",`
	`14`	`+ "Clone": "https://[email protected]/tphoney/test_project/_git/test_repo2"`
`13`	`15`	`}`
`14`	`16`	`]`