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

Author: euanh

Sources/ContainerRegistry/Blobs.swift

@@ -76,28 +76,6 @@ public extension RegistryClient {
         .data
     }
 
-    /// Fetches a blob and tries to decode it as a JSON object.
-    ///
-    /// - Parameters:
-    ///   - repository: Name of the repository containing the blob.
-    ///   - digest: Digest of the blob.
-    /// - Returns: The decoded object.
-    /// - Throws: If the blob download fails or the blob cannot be decoded.
-    ///
-    /// Some JSON objects, such as ImageConfiguration, are stored
-    /// in the registry as plain blobs with MIME type "application/octet-stream".
-    /// This function attempts to decode the received data without reference
-    /// to the MIME type.
-    func getBlob<Response: Decodable>(repository: ImageReference.Repository, digest: ImageReference.Digest) async throws
-        -> Response
-    {
-        let (data, _) = try await executeRequestThrowing(
-            .get(repository, path: "blobs/\(digest)", accepting: ["application/octet-stream"]),
-            decodingErrors: [.notFound]
-        )
-        return try decoder.decode(Response.self, from: data)
-    }
-
     /// Uploads a blob to the registry.
     ///
     /// This function uploads a blob of unstructured data to the registry.

Sources/ContainerRegistry/RegistryClient+ImageConfiguration.swift

@@ -21,10 +21,12 @@ extension RegistryClient {
     /// - Throws: If the blob cannot be decoded as an `ImageConfiguration`.
     ///
     /// Image configuration records are stored as blobs in the registry.  This function retrieves the requested blob and tries to decode it as a configuration record.
-    public func getImageConfiguration(forImage image: ImageReference, digest: ImageReference.Digest) async throws
-        -> ImageConfiguration
-    {
-        try await getBlob(repository: image.repository, digest: digest)
+    public func getImageConfiguration(
+        forImage image: ImageReference,
+        digest: ImageReference.Digest
+    ) async throws -> ImageConfiguration {
+        let data = try await getBlob(repository: image.repository, digest: digest)
+        return try decoder.decode(ImageConfiguration.self, from: data)
     }
 
     /// Upload an image configuration record to the registry.
@@ -35,9 +37,10 @@ extension RegistryClient {
     /// - Throws: If the blob upload fails.
     ///
     /// Image configuration records are stored as blobs in the registry.  This function encodes the provided configuration record and stores it as a blob in the registry.
-    public func putImageConfiguration(forImage image: ImageReference, configuration: ImageConfiguration) async throws
-        -> ContentDescriptor
-    {
+    public func putImageConfiguration(
+        forImage image: ImageReference,
+        configuration: ImageConfiguration
+    ) async throws -> ContentDescriptor {
         try await putBlob(
             repository: image.repository,
             mediaType: "application/vnd.oci.image.config.v1+json",