use copyFileToContainer where possible #829
Merged
Conversation
This file contains 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
klara-l
reviewed
Aug 12, 2018
| @@ -448,6 +460,14 @@ ExecResult execInContainer(Charset outputCharset, String... command) | |||
| */ | |||
| void copyFileFromContainer(String containerPath, String destinationPath) throws IOException, InterruptedException; | |||
|
|
|||
| /** | |||
| * Copies a file which resides inside the container to user defined directory | |||
There was a problem hiding this comment.
Nice catch, thanks! Fixed.
klara-l
reviewed
Aug 12, 2018
| @@ -1018,34 +1024,95 @@ public ExecResult execInContainer(String... command) | |||
| * {@inheritDoc} | |||
| */ | |||
| @Override | |||
| public void copyFileToContainer(MountableFile mountableLocalFile, String containerPath) { | |||
| @SneakyThrows(IOException.class) | |||
| public void copyFileToContainer(MountableFile mountableFile, String containerPath) { | |||
There was a problem hiding this comment.
both functions do almost exactly the same. Can those two be merged? (Can't you just call the othercopyFileToContainerfunction? MountableFile implements Transferable0
…tableFile`-based one, fix `CopyFileToContainerTest`
kiview
requested changes
Aug 13, 2018
Also rename variables in copyFileToContainer() for better readability.
kiview
approved these changes
Sep 3, 2018
|
We have this out in a Release Candidate build (1.9.0-rc1) for anyone who is keen to try it! |
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.
Since volume mappings work only with local-ish Docker environment, there is a low hanging fruit to replace configs and small file operations with copyToContainer which uses TarInputStream instead.
It makes it possible to run the tests against remote envs with some file operations.
P.S. it seems that copyToContainer was incorrectly implemented before (containerPath was used as a target directory when file is mounted), this PR deprecates that behaviour (with a warning)