TEMP: include raw HTTP response in invalidResponse error

mattt · mattt · commit c758966b77e6 · 2021-09-09T15:23:42.000-07:00
diff --git a/Sources/PackageRegistry/RegistryManager.swift b/Sources/PackageRegistry/RegistryManager.swift
@@ -22,10 +22,11 @@ import struct Foundation.URLQueryItem
 import Dispatch
 
 public enum RegistryError: Error {
+    case unknown
     case registryNotConfigured(scope: PackageIdentity.Scope)
     case invalidPackage(PackageReference)
     case invalidOperation
-    case invalidResponse
+    case invalidResponse(HTTPClientResponse)
     case invalidURL
     case invalidChecksum(expected: String, actual: String)
 }
@@ -99,7 +100,7 @@ public final class RegistryManager {
                         .sorted(by: >)
                     return versions
                 } else {
-                    throw RegistryError.invalidResponse
+                    throw RegistryError.invalidResponse(response)
                 }
             })
         }
@@ -179,7 +180,7 @@ public final class RegistryManager {
                         completion: completion
                     )
                 } else {
-                    throw RegistryError.invalidResponse
+                    throw RegistryError.unknown
                 }
             } catch {
                 queue.async {
@@ -262,7 +263,7 @@ public final class RegistryManager {
                         completion(.failure(error))
                     }
                 } else {
-                    completion(.failure(RegistryError.invalidResponse))
+                    completion(.failure(RegistryError.invalidResponse(response)))
                 }
             case .failure(let error):
                 completion(.failure(error))

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,11 @@ import struct Foundation.URLQueryItem`
`22`	`22`	`import Dispatch`
`23`	`23`
`24`	`24`	`public enum RegistryError: Error {`
	`25`	`+ case unknown`
`25`	`26`	`case registryNotConfigured(scope: PackageIdentity.Scope)`
`26`	`27`	`case invalidPackage(PackageReference)`
`27`	`28`	`case invalidOperation`
`28`		`- case invalidResponse`
	`29`	`+ case invalidResponse(HTTPClientResponse)`
`29`	`30`	`case invalidURL`
`30`	`31`	`case invalidChecksum(expected: String, actual: String)`
`31`	`32`	`}`
`@@ -99,7 +100,7 @@ public final class RegistryManager {`
`99`	`100`	`.sorted(by: >)`
`100`	`101`	`return versions`
`101`	`102`	`} else {`
`102`		`- throw RegistryError.invalidResponse`
	`103`	`+ throw RegistryError.invalidResponse(response)`
`103`	`104`	`}`
`104`	`105`	`})`
`105`	`106`	`}`
`@@ -179,7 +180,7 @@ public final class RegistryManager {`
`179`	`180`	`completion: completion`
`180`	`181`	`)`
`181`	`182`	`} else {`
`182`		`- throw RegistryError.invalidResponse`
	`183`	`+ throw RegistryError.unknown`
`183`	`184`	`}`
`184`	`185`	`} catch {`
`185`	`186`	`queue.async {`
`@@ -262,7 +263,7 @@ public final class RegistryManager {`
`262`	`263`	`completion(.failure(error))`
`263`	`264`	`}`
`264`	`265`	`} else {`
`265`		`- completion(.failure(RegistryError.invalidResponse))`
	`266`	`+ completion(.failure(RegistryError.invalidResponse(response)))`
`266`	`267`	`}`
`267`	`268`	`case .failure(let error):`
`268`	`269`	`completion(.failure(error))`