ContainerRegistry: Define ImageSource protocol

Author: euanh

Sources/ContainerRegistry/ImageSource.swift

@@ -0,0 +1,38 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the SwiftContainerPlugin open source project
+//
+// Copyright (c) 2025 Apple Inc. and the SwiftContainerPlugin project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of SwiftContainerPlugin project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+import Foundation
+
+public protocol ImageSource {
+    var decoder: JSONDecoder { get }
+
+    /// Fetches an unstructured blob of data from the registry.
+    ///
+    /// - Parameters:
+    ///   - repository: Name of the repository containing the blob.
+    ///   - digest: Digest of the blob.
+    /// - Returns: The downloaded data.
+    /// - Throws: If the blob download fails.
+    func getBlob(repository: ImageReference.Repository, digest: ImageReference.Digest) async throws -> Data
+
+    func getManifest(
+        repository: ImageReference.Repository,
+        reference: any ImageReference.Reference
+    ) async throws -> (ImageManifest, ContentDescriptor)
+
+    func getIndex(
+        repository: ImageReference.Repository,
+        reference: any ImageReference.Reference
+    ) async throws -> ImageIndex
+}

Sources/ContainerRegistry/RegistryClient+ImageConfiguration.swift

@@ -12,7 +12,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-extension RegistryClient {
+import class Foundation.JSONDecoder
+
+extension ImageSource {
     /// Get an image configuration record from the registry.
     /// - Parameters:
     ///   - image: Reference to the image containing the record.

Sources/ContainerRegistry/RegistryClient.swift

@@ -59,7 +59,7 @@ public struct RegistryClient {
     var authChallenge: AuthChallenge
 
     var encoder: JSONEncoder
-    var decoder: JSONDecoder
+    public var decoder: JSONDecoder
 
     /// Creates a new RegistryClient
     /// - Parameters:
@@ -375,5 +375,5 @@ extension RegistryClient {
 /// Make decoded registry errors throwable
 extension DistributionErrors: Error {}
 
-/// Images can be uploaded to a registry using a RegistryClient instance
-extension RegistryClient: ImageDestination {}
+/// RegistryClient can both fetch and upload images
+extension RegistryClient: ImageSource, ImageDestination {}

Sources/containertool/Extensions/RegistryClient+CopyBlobs.swift

@@ -14,7 +14,7 @@
 
 import ContainerRegistry
 
-extension RegistryClient {
+extension ImageSource {
     /// Copies a blob from another registry to this one.
     /// - Parameters:
     ///   - digest: The digest of the blob to copy.

Sources/containertool/Extensions/RegistryClient+Layers.swift

@@ -15,10 +15,11 @@
 import struct Foundation.Data
 import ContainerRegistry
 
-extension RegistryClient {
-    func getImageManifest(forImage image: ImageReference, architecture: String) async throws -> (
-        ImageManifest, ContentDescriptor
-    ) {
+extension ImageSource {
+    public func getImageManifest(
+        forImage image: ImageReference,
+        architecture: String
+    ) async throws -> (ImageManifest, ContentDescriptor) {
         do {
             // Try to retrieve a manifest.   If the object with this reference is actually an index, the content-type will not match and
             // an error will be thrown.

Sources/containertool/containertool.swift

@@ -233,10 +233,10 @@ enum AllowHTTP: String, ExpressibleByArgument, CaseIterable { case source, desti
     }
 }
 
-func publishContainerImage<Destination: ImageDestination>(
+func publishContainerImage<Source: ImageSource, Destination: ImageDestination>(
     baseImage: ImageReference,
     destinationImage: ImageReference,
-    source: RegistryClient?,
+    source: Source?,
     destination: Destination,
     architecture: String,
     os: String,