Skip to content

Return nil if no local image of matching label found #2095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JaewonHur wants to merge 1 commit into
base: main
Choose a base branch
from
+1 −5
Open

Return nil if no local image of matching label found #2095

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions Sources/Services/ContainerAPIService/Client/ClientImage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ extension ClientImage {
public static func get(reference: String, containerSystemConfig: ContainerSystemConfig) async throws -> ClientImage {
let all = try await self.list()
guard let found = try self._search(reference: reference, in: all, containerSystemConfig: containerSystemConfig) else {
throw ContainerizationError(.notFound, message: "image with reference \(reference)")
throw ContainerizationError(.notFound, message: "image with reference \(reference) not found")
}
return found
}
Expand Down Expand Up @@ -226,10 +226,6 @@ extension ClientImage {
let withDefaultTag = r.description

let localImageMatches = all.filter { $0.description.nameFromAnnotation() == withDefaultTag }
guard localImageMatches.count > 1 else {
return localImageMatches.first
}
// More than one image matched. Check against the tagged reference
return localImageMatches.first { $0.reference == withDefaultTag }
}()
if let locallyBuiltImage {
Expand Down