Improve file filter for insecure repo tests #51121
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
Tests in BuildPluginIT copy the workspace but exclude the build directories based on whether the directory string representation includes `/build/` or not. This check is problematic if the directory of the project has a parent directory also named `build`. The change in this commit checks to see if the path relative to the project directory has any path parts equal to `build`.
jaymode
added
>enhancement
:Delivery/Build
|
Pinging @elastic/es-core-infra (:Core/Infra/Build) |
mark-vieira
approved these changes
Jan 16, 2020
| final Path projectDirPath = projectDir.toPath(); | ||
| FileUtils.copyDirectory(projectDir, tmpDir.getRoot(), file -> { | ||
| final Path relativePath = projectDirPath.relativize(file.toPath()); | ||
| for (int i = 0; i < relativePath.getNameCount(); i++) { |
There was a problem hiding this comment.
Path is itself an Iterable so it might be easier to grok this if we replace it with for (Path segment : relativePath) { }.
There was a problem hiding this comment.
Nice, that is a new one to me.
jaymode
added a commit
to jaymode/elasticsearch
that referenced
this pull request
Jan 17, 2020
Tests in BuildPluginIT copy the workspace but exclude the build directories based on whether the directory string representation includes `/build/` or not. This check is problematic if the directory of the project has a parent directory also named `build`. The change in this commit checks to see if the path relative to the project directory has any path parts equal to `build`.
jaymode
added a commit
to jaymode/elasticsearch
that referenced
this pull request
Jan 17, 2020
Tests in BuildPluginIT copy the workspace but exclude the build directories based on whether the directory string representation includes `/build/` or not. This check is problematic if the directory of the project has a parent directory also named `build`. The change in this commit checks to see if the path relative to the project directory has any path parts equal to `build`.
jaymode
added a commit
that referenced
this pull request
Jan 17, 2020
Tests in BuildPluginIT copy the workspace but exclude the build directories based on whether the directory string representation includes `/build/` or not. This check is problematic if the directory of the project has a parent directory also named `build`. The change in this commit checks to see if the path relative to the project directory has any path parts equal to `build`.
jaymode
added a commit
that referenced
this pull request
Jan 17, 2020
Tests in BuildPluginIT copy the workspace but exclude the build directories based on whether the directory string representation includes `/build/` or not. This check is problematic if the directory of the project has a parent directory also named `build`. The change in this commit checks to see if the path relative to the project directory has any path parts equal to `build`.
SivagurunathanV
pushed a commit
to SivagurunathanV/elasticsearch
that referenced
this pull request
Jan 23, 2020
Tests in BuildPluginIT copy the workspace but exclude the build directories based on whether the directory string representation includes `/build/` or not. This check is problematic if the directory of the project has a parent directory also named `build`. The change in this commit checks to see if the path relative to the project directory has any path parts equal to `build`.
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.
Tests in BuildPluginIT copy the workspace but exclude the build
directories based on whether the directory string representation
includes
/build/or not. This check is problematic if the directoryof the project has a parent directory also named
build. The change inthis commit checks to see if the path relative to the project directory
has any path parts equal to
build.