copier: add AddAndCopyOptions.DirCopyContents#6816
Merged
Conversation
nalind
requested changes
May 6, 2026
Member
nalind
left a comment
There was a problem hiding this comment.
I think the copier package has test coverage for the KeepDirectoryNames, so this LGTM.
Please squash (for example, with git rebase -i) and re-push in preparation for merging.
Thanks!
Signed-off-by: Fatih Akca <fatihakca5@gmail.com>
ed2285d to
c35c0af
Compare
Member
|
@akca Thanks! |
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
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.
What type of PR is this?
/kind feature
What this PR does / why we need it:
Adds a new
AddAndCopyOptions.DirCopyContentsfield (of typetypes.OptionalBool) that controls whether copying a source directory copies just its contents (default,true) or the directory itself with its contents nested below it.This wires the existing
GetOptions.KeepDirectoryNamessetting through theAddAndCopyOptionsAPI, aligning with BuildKit'sFileAction_Copy.dirCopyContentslogic.How to verify it
Which issue(s) this PR fixes:
Fixes #6803
Special notes for your reviewer:
KeepDirectoryNamesis the opposite ofDirCopyContents:DirCopyContents == OptionalBoolFalsemaps toKeepDirectoryNames = true. BothOptionalBoolUndefinedandOptionalBoolTruepreserve existing default behavior (copy contents only). The added test covers this inversion logic only, sinceKeepDirectoryNamesalready has tests incopier/copier_test.go.Does this PR introduce a user-facing change?