Don't require .git suffix in repo URL (#3089)

Motivation:
Git URLs don't always include `.git` suffix, but the logic for constructing GitHub API URL incorrectly requires it.

Modification:
Update regex to make `.git` suffix optional.

Result:
Git URLs with or without `.git` suffix are accepted.

Author: yim-lee

Sources/PackageCollections/Providers/GitHubPackageMetadataProvider.swift

@@ -39,7 +39,7 @@ struct GitHubPackageMetadataProvider: PackageMetadataProvider {
             return callback(.failure(Errors.invalidReferenceType(reference)))
         }
         guard let baseURL = self.apiURL(reference.path) else {
-            return callback(.failure(Errors.invalidGitUrl(reference.path)))
+            return callback(.failure(Errors.invalidGitURL(reference.path)))
         }
 
         let metadataURL = baseURL
@@ -147,7 +147,7 @@ struct GitHubPackageMetadataProvider: PackageMetadataProvider {
 
     internal func apiURL(_ url: String) -> Foundation.URL? {
         do {
-            let regex = try NSRegularExpression(pattern: #"([^/@]+)[:/]([^:/]+)/([^/]+)\.git$"#, options: .caseInsensitive)
+            let regex = try NSRegularExpression(pattern: #"([^/@]+)[:/]([^:/]+)/([^/.]+)(\.git)?$"#, options: .caseInsensitive)
             if let match = regex.firstMatch(in: url, options: [], range: NSRange(location: 0, length: url.count)) {
                 if let hostRange = Range(match.range(at: 1), in: url),
                     let ownerRange = Range(match.range(at: 2), in: url),
@@ -202,7 +202,7 @@ struct GitHubPackageMetadataProvider: PackageMetadataProvider {
 
     enum Errors: Error, Equatable {
         case invalidReferenceType(PackageReference)
-        case invalidGitUrl(String)
+        case invalidGitURL(String)
         case invalidResponse(URL, String)
         case permissionDenied(URL)
         case invalidAuthToken(URL)

Tests/PackageCollectionsTests/GitHubPackageMetadataProviderTests.swift

@@ -20,15 +20,24 @@ import TSCBasic
 import TSCUtility
 
 class GitHubPackageMetadataProviderTests: XCTestCase {
-    func testBaseRL() throws {
+    func testBaseURL() throws {
         let apiURL = URL(string: "https://api.github.com/repos/octocat/Hello-World")
-
         let provider = GitHubPackageMetadataProvider()
-        let sshURLRetVal = provider.apiURL("[email protected]:octocat/Hello-World.git")
-        XCTAssertEqual(apiURL, sshURLRetVal)
+        
+        do {
+            let sshURLRetVal = provider.apiURL("[email protected]:octocat/Hello-World.git")
+            XCTAssertEqual(apiURL, sshURLRetVal)
+        }
 
-        let httpsURLRetVal = provider.apiURL("https://github.com/octocat/Hello-World.git")
-        XCTAssertEqual(apiURL, httpsURLRetVal)
+        do {
+            let httpsURLRetVal = provider.apiURL("https://github.com/octocat/Hello-World.git")
+            XCTAssertEqual(apiURL, httpsURLRetVal)
+        }
+        
+        do {
+            let httpsURLRetVal = provider.apiURL("https://github.com/octocat/Hello-World")
+            XCTAssertEqual(apiURL, httpsURLRetVal)
+        }
 
         XCTAssertNil(provider.apiURL("bad/Hello-World.git"))
     }
@@ -228,7 +237,7 @@ class GitHubPackageMetadataProviderTests: XCTestCase {
             let provider = GitHubPackageMetadataProvider()
             let reference = PackageReference(repository: RepositorySpecifier(url: UUID().uuidString))
             XCTAssertThrowsError(try tsc_await { callback in provider.get(reference, callback: callback) }, "should throw error") { error in
-                XCTAssertEqual(error as? GitHubPackageMetadataProvider.Errors, .invalidGitUrl(reference.path))
+                XCTAssertEqual(error as? GitHubPackageMetadataProvider.Errors, .invalidGitURL(reference.path))
             }
         }
     }