ContainerRegistry: Remove return-type overloaded version of executeRequestThrowing()

Author: euanh

Sources/ContainerRegistry/Blobs.swift

@@ -91,11 +91,11 @@ public extension RegistryClient {
     func getBlob<Response: Decodable>(repository: ImageReference.Repository, digest: ImageReference.Digest) async throws
         -> Response
     {
-        try await executeRequestThrowing(
+        let (data, _) = try await executeRequestThrowing(
             .get(repository, path: "blobs/\(digest)", accepting: ["application/octet-stream"]),
             decodingErrors: [.notFound]
         )
-        .data
+        return try decoder.decode(Response.self, from: data)
     }
 
     /// Uploads a blob to the registry.

Sources/ContainerRegistry/Manifests.swift

@@ -17,9 +17,7 @@ public extension RegistryClient {
         repository: ImageReference.Repository,
         reference: any ImageReference.Reference,
         manifest: ImageManifest
-    ) async throws
-        -> String
-    {
+    ) async throws -> String {
         // See https://github.com/opencontainers/distribution-spec/blob/main/spec.md#pushing-manifests
         let httpResponse = try await executeRequestThrowing(
             // All blob uploads have Content-Type: application/octet-stream on the wire, even if mediatype is different
@@ -44,11 +42,12 @@ public extension RegistryClient {
             .absoluteString
     }
 
-    func getManifest(repository: ImageReference.Repository, reference: any ImageReference.Reference) async throws
-        -> ImageManifest
-    {
+    func getManifest(
+        repository: ImageReference.Repository,
+        reference: any ImageReference.Reference
+    ) async throws -> ImageManifest {
         // See https://github.com/opencontainers/distribution-spec/blob/main/spec.md#pulling-manifests
-        try await executeRequestThrowing(
+        let (data, _) = try await executeRequestThrowing(
             .get(
                 repository,
                 path: "manifests/\(reference)",
@@ -59,14 +58,15 @@ public extension RegistryClient {
             ),
             decodingErrors: [.notFound]
         )
-        .data
+        return try decoder.decode(ImageManifest.self, from: data)
     }
 
-    func getIndex(repository: ImageReference.Repository, reference: any ImageReference.Reference) async throws
-        -> ImageIndex
-    {
+    func getIndex(
+        repository: ImageReference.Repository,
+        reference: any ImageReference.Reference
+    ) async throws -> ImageIndex {
         // See https://github.com/opencontainers/distribution-spec/blob/main/spec.md#pulling-manifests
-        try await executeRequestThrowing(
+        let (data, _) = try await executeRequestThrowing(
             .get(
                 repository,
                 path: "manifests/\(reference)",
@@ -77,6 +77,6 @@ public extension RegistryClient {
             ),
             decodingErrors: [.notFound]
         )
-        .data
+        return try decoder.decode(ImageIndex.self, from: data)
     }
 }

Sources/ContainerRegistry/RegistryClient.swift

@@ -308,27 +308,6 @@ extension RegistryClient {
         }
     }
 
-    /// Execute an HTTP request with no request body, decoding the JSON response
-    /// - Parameters:
-    ///   - request: The HTTP request to execute.
-    ///   - success: The HTTP status code expected if the request is successful.
-    ///   - errors: Expected error codes for which the registry sends structured error messages.
-    /// - Returns: An asynchronously-delivered tuple that contains the raw response body as a Data instance, and a HTTPURLResponse.
-    /// - Throws: If the server response is unexpected or indicates that an error occurred.
-    func executeRequestThrowing<Response: Decodable>(
-        _ request: RegistryOperation,
-        expectingStatus success: HTTPResponse.Status = .ok,
-        decodingErrors errors: [HTTPResponse.Status]
-    ) async throws -> (data: Response, response: HTTPResponse) {
-        let (data, httpResponse) = try await executeRequestThrowing(
-            request,
-            expectingStatus: success,
-            decodingErrors: errors
-        )
-        let decoded = try decoder.decode(Response.self, from: data)
-        return (decoded, httpResponse)
-    }
-
     /// Execute an HTTP request uploading a request body.
     /// - Parameters:
     ///   - operation: The Registry operation to execute.
@@ -337,9 +316,6 @@ extension RegistryClient {
     ///   - errors: Expected error codes for which the registry sends structured error messages.
     /// - Returns: An asynchronously-delivered tuple that contains the raw response body as a Data instance, and a HTTPURLResponse.
     /// - Throws: If the server response is unexpected or indicates that an error occurred.
-    ///
-    /// A plain Data version of this function is required because Data is Encodable and encodes to base64.
-    /// Accidentally encoding data blobs will cause digests to fail and runtimes to be unable to run the images.
     func executeRequestThrowing(
         _ operation: RegistryOperation,
         uploading payload: Data,

Sources/ContainerRegistry/Tags.swift

@@ -15,6 +15,10 @@
 public extension RegistryClient {
     func getTags(repository: ImageReference.Repository) async throws -> Tags {
         // See https://github.com/opencontainers/distribution-spec/blob/main/spec.md#listing-tags
-        try await executeRequestThrowing(.get(repository, path: "tags/list"), decodingErrors: [.notFound]).data
+        let (data, _) = try await executeRequestThrowing(
+            .get(repository, path: "tags/list"),
+            decodingErrors: [.notFound]
+        )
+        return try decoder.decode(Tags.self, from: data)
     }
 }