Use FilePath for CLI image/container path-arg parsing#24
Open
chrisgeo wants to merge 1 commit into
Open
Conversation
- Closes CHAOS-1457. - Adds shared FilePath.absolute(_:relativeTo:) helper. - Sibling of apple#1480 (HostDNSResolver) and apple#1518 (PacketFilter), same pattern.
chrisgeo
force-pushed
the
feat/chaos-1457-cli-image-filepath
branch
from
b0712f4 to
fe910bb
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
FilePath.absolute(_:relativeTo:)helper inSources/ContainerCommands/FilePath+Absolute.swiftfor resolving CLI path arguments against the current working directory and lexically normalizing the result.URL(fileURLWithPath:relativeTo:.currentDirectory()).absoluteURL.path(percentEncoded:)boilerplate at three CLI commands:ImageLoad,ImageSave,ContainerExport.FileManager.moveItem(at:to:)tomoveItem(atPath:toPath:)inContainerExportso both arguments come fromFilePath.string.Closes CHAOS-1457. Sibling of apple#1480 (HostDNSResolver) and apple#1518 (PacketFilter), same migration pattern.
Test plan
swift buildsucceeds.swift test --filter FilePathAbsoluteTests— 9/9 tests pass (absolute / relative /../..-past-cwd-root / empty string / root// trailing slash / single filename).container image load --input ./archive.tarresolves to absolute path.container image save --output /tmp/foo.tar <id>preserves absolute path.container container export --output /tmp/x.tar <id>writes to expected location.