mirror of
https://github.com/apple/container.git
synced 2026-07-16 06:27:07 +00:00
356c8d2f88
- Closes #461. - Extract core types into ContainerResources target. - Extract ContainerNetworkServiceClient from ContainerNetworkService. - Relocate sandbox client from ContainerClient to ContainerSandboxServiceClient. - Relocate ContainerClient to ContainerAPIServiceClient. - Common structure from services and clients under Source/Services. Updated project hierarchy: ``` Sources/CAuditToken - audit token access wrapper Sources/CLI - CLI executable Sources/ContainerBuild - builder Sources/ContainerCommands - CLI command implementations Sources/ContainerLog - logging helpers Sources/ContainerPersistence - persistent data and system property helpers Sources/ContainerPlugin - plugin system Sources/ContainerResource - resource (container, image, volume, network) types Sources/ContainerVersion - version helpers Sources/ContainerXPC - XPC helpers Sources/CVersion - injected project version Sources/DNSServer - container DNS resolver Sources/Helpers - service executables Sources/Services/*/Client - service clients Sources/Services/*/Server - service implementations Sources/SocketForwarder - port forwarding Sources/TerminalProgress - progress bar ``` ## Type of Change - [ ] Bug fix - [ ] New feature - [x] Breaking change - [ ] Documentation update ## Motivation and Context The ContainerClient library was a bit of a grab bag. This refactor applies a more sensible project and library structure for resource data types, services, and clients. ## Testing - [x] Tested locally - [x] Added/updated tests - [ ] Added/updated docs
93 lines
2.9 KiB
Swift
93 lines
2.9 KiB
Swift
//===----------------------------------------------------------------------===//
|
|
// Copyright © 2025-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 ContainerResource
|
|
import ContainerizationExtras
|
|
import Foundation
|
|
|
|
extension Application.VolumeCommand {
|
|
public struct VolumeList: AsyncParsableCommand {
|
|
public static let configuration = CommandConfiguration(
|
|
commandName: "list",
|
|
abstract: "List volumes",
|
|
aliases: ["ls"]
|
|
)
|
|
|
|
@Option(name: .long, help: "Format of the output")
|
|
var format: Application.ListFormat = .table
|
|
|
|
@Flag(name: .shortAndLong, help: "Only output the volume name")
|
|
var quiet: Bool = false
|
|
|
|
@OptionGroup
|
|
var global: Flags.Global
|
|
|
|
public init() {}
|
|
|
|
public func run() async throws {
|
|
let volumes = try await ClientVolume.list()
|
|
try printVolumes(volumes: volumes, format: format)
|
|
}
|
|
|
|
private func createHeader() -> [[String]] {
|
|
[["NAME", "TYPE", "DRIVER", "OPTIONS"]]
|
|
}
|
|
|
|
func printVolumes(volumes: [Volume], format: Application.ListFormat) throws {
|
|
if format == .json {
|
|
let data = try JSONEncoder().encode(volumes)
|
|
print(String(data: data, encoding: .utf8)!)
|
|
return
|
|
}
|
|
|
|
if quiet {
|
|
volumes.forEach {
|
|
print($0.name)
|
|
}
|
|
return
|
|
}
|
|
|
|
// Sort volumes by creation time (newest first)
|
|
let sortedVolumes = volumes.sorted { v1, v2 in
|
|
v1.createdAt > v2.createdAt
|
|
}
|
|
|
|
var rows = createHeader()
|
|
for volume in sortedVolumes {
|
|
rows.append(volume.asRow)
|
|
}
|
|
|
|
let formatter = TableOutput(rows: rows)
|
|
print(formatter.format())
|
|
}
|
|
}
|
|
}
|
|
|
|
extension Volume {
|
|
var asRow: [String] {
|
|
let volumeType = self.isAnonymous ? "anonymous" : "named"
|
|
let optionsString = options.isEmpty ? "" : options.map { "\($0.key)=\($0.value)" }.joined(separator: ",")
|
|
return [
|
|
self.name,
|
|
volumeType,
|
|
self.driver,
|
|
optionsString,
|
|
]
|
|
}
|
|
}
|