mirror of
https://github.com/apple/container.git
synced 2026-07-13 21:17:05 +00:00
Raj
3366916e80
## Motivation and Context This PR consolidates duplicated list-output formatting across the CLI into shared rendering infrastructure. Currently, each list command has its own copy of the same json/quiet/table branching. This PR pulls that into shared rendering infrastructure in `ContainerCommands`: - `ListDisplayable` protocol for table + quiet output - `renderJSON`, `renderTable`, `renderList` as pure functions that return strings - `emit()` as the single stdout boundary (no-ops on empty strings to avoid blank-line regressions) - `JSONOptions` so all JSON encoding goes through one path, including volume inspect's pretty + ISO 8601 case JSON encoding remains separate from display formatting: each command still chooses its own JSON model, while `ListDisplayable` is used only for table and quiet output. `ImageList` remains the intentional exception for quiet mode so it can avoid unnecessary async work. This change also replaces inline `JSONEncoder` usage with `renderJSON`, removes the old `Codable+JSON.swift` helper, and moves `TableOutput` and `ListFormat` into `ContainerCommands`. It also adds unit tests for the shared rendering helpers and expands integration coverage for image, network, and registry list formatting. ## Testing - [x] Tested locally - [x] Added/updated tests - [ ] Added/updated docs
85 lines
2.9 KiB
Swift
85 lines
2.9 KiB
Swift
//===----------------------------------------------------------------------===//
|
|
// Copyright © 2026 Apple Inc. and the container project authors.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
import ArgumentParser
|
|
import ContainerAPIClient
|
|
import ContainerVersion
|
|
import Foundation
|
|
|
|
extension Application {
|
|
public struct SystemVersion: AsyncLoggableCommand {
|
|
public static let configuration = CommandConfiguration(
|
|
commandName: "version",
|
|
abstract: "Show version information"
|
|
)
|
|
|
|
@Option(name: .long, help: "Format of the output")
|
|
var format: ListFormat = .table
|
|
|
|
@OptionGroup
|
|
public var logOptions: Flags.Logging
|
|
|
|
public init() {}
|
|
|
|
public func run() async throws {
|
|
let cliInfo = VersionInfo(
|
|
version: ReleaseVersion.version(),
|
|
buildType: ReleaseVersion.buildType(),
|
|
commit: ReleaseVersion.gitCommit() ?? "unspecified",
|
|
appName: "container"
|
|
)
|
|
|
|
// Try to get API server version info
|
|
let serverInfo: VersionInfo?
|
|
do {
|
|
let health = try await ClientHealthCheck.ping(timeout: .seconds(2))
|
|
serverInfo = VersionInfo(
|
|
version: health.apiServerVersion,
|
|
buildType: health.apiServerBuild,
|
|
commit: health.apiServerCommit,
|
|
appName: health.apiServerAppName
|
|
)
|
|
} catch {
|
|
serverInfo = nil
|
|
}
|
|
|
|
let versions = [cliInfo, serverInfo].compactMap { $0 }
|
|
|
|
switch format {
|
|
case .table:
|
|
printVersionTable(versions: versions)
|
|
case .json:
|
|
try Output.emit(Output.renderJSON(versions))
|
|
}
|
|
}
|
|
|
|
private func printVersionTable(versions: [VersionInfo]) {
|
|
let header = ["COMPONENT", "VERSION", "BUILD", "COMMIT"]
|
|
let rows = [header] + versions.map { [$0.appName, $0.version, $0.buildType, $0.commit] }
|
|
|
|
let table = TableOutput(rows: rows)
|
|
print(table.format())
|
|
}
|
|
}
|
|
|
|
public struct VersionInfo: Codable {
|
|
let version: String
|
|
let buildType: String
|
|
let commit: String
|
|
let appName: String
|
|
}
|
|
}
|