mirror of
https://github.com/apple/container.git
synced 2026-07-12 04:27:05 +00:00
Raj
822b47b877
- Closes #1528. - Several commands (`builder status`, `image list`, `stats`, `system df`, `system status`) advertised `--format yaml` and `--format toml` but only handled `json`, and every other format fell through to the table. With this PR, we now route them through one shared renderer with an exhaustive switch over the format enum, so a missing format would now be a compile error, and not just fail silently. - Since TOML has no top level array, TOML output now wraps list payloads under an `items` key, because otherwise it was returning nothing for lists. - `stats` now prints one static result for machine readable formats instead of opening its live table view. - `builder status` now returns an empty list for json/yaml/toml when no builder is running, instead of the unparseable "builder is not running" text. The table view keeps the message. - with `--quiet` and no builder it now exits 0 with no output, earlier it exited non-zero.
80 lines
2.8 KiB
Swift
80 lines
2.8 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 }
|
|
|
|
try Output.render(payload: versions, format: format) {
|
|
Self.versionTable(versions)
|
|
}
|
|
}
|
|
|
|
private static func versionTable(_ versions: [VersionInfo]) -> String {
|
|
let header = ["COMPONENT", "VERSION", "BUILD", "COMMIT"]
|
|
let rows = [header] + versions.map { [$0.appName, $0.version, $0.buildType, $0.commit] }
|
|
return TableOutput(rows: rows).format()
|
|
}
|
|
}
|
|
|
|
public struct VersionInfo: Codable {
|
|
let version: String
|
|
let buildType: String
|
|
let commit: String
|
|
let appName: String
|
|
}
|
|
}
|