-
Notifications
You must be signed in to change notification settings - Fork 37
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Excluded integTest from build script to handle the security plugin dependency #418
Conversation
Signed-off-by: Owais Kazi <[email protected]>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #418 +/- ##
=========================================
Coverage 71.85% 71.85%
Complexity 614 614
=========================================
Files 79 79
Lines 3084 3084
Branches 237 237
=========================================
Hits 2216 2216
Misses 763 763
Partials 105 105 ☔ View full report in Codecov by Sentry. |
Signed-off-by: owaiskazi19 <[email protected]>
Signed-off-by: owaiskazi19 <[email protected]>
8458076
to
52999c9
Compare
Signed-off-by: owaiskazi19 <[email protected]>
52999c9
to
cb91013
Compare
…pendency (#418) * Excluded integTest from build script Signed-off-by: Owais Kazi <[email protected]> * Handled zipArhcive failure for secuirty plugin Signed-off-by: owaiskazi19 <[email protected]> * Removed security plugin check Signed-off-by: owaiskazi19 <[email protected]> --------- Signed-off-by: Owais Kazi <[email protected]> Signed-off-by: owaiskazi19 <[email protected]> (cherry picked from commit ab5ac39) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
…urity plugin dependency (#424) Excluded integTest from build script to handle the security plugin dependency (#418) * Excluded integTest from build script * Handled zipArhcive failure for secuirty plugin * Removed security plugin check --------- (cherry picked from commit ab5ac39) Signed-off-by: Owais Kazi <[email protected]> Signed-off-by: owaiskazi19 <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@@ -347,7 +348,6 @@ testClusters.integTest { | |||
|
|||
// Installs all registered zipArchive dependencies on integTest cluster nodes except security | |||
configurations.zipArchive.asFileTree.each { | |||
if(!it.name.contains("opensearch-security")) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey @owaiskazi19 instead of new secureIntegTestPluginArchive
configuration, I assume just changing the if
statement to if(it.name.contains("opensearch-security"))
should work. Can you please check?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@prudhvigodithi here we have to install all the plugins except security plugin. zipArchive
would have security plugin in it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, +1 to @owaiskazi19 . Initially we kept it how @prudhvigodithi you mentioned above. But the problem, here we just need security plugin to run integ tests, therefore zip archive tries to find it at the compile time also. Therefore, we need to change the tag to securePluginTestArchive
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @vibrantvarun and @owaiskazi19 I'm afraid introducing new configuration secureIntegTestPluginArchive
might never be called. Also I noticed the logic is called in ext
(extra properties) where as I see similar code in integTest
, If not needed we can completely remove the in ext
.
testClusters.integTest {
testDistribution = "ARCHIVE"
// Optionally install security
if (System.getProperty("security.enabled") != null && System.getProperty("security.enabled") == "true") {
configureSecurityPlugin(testClusters.integTest)
}
// Installs all registered zipArchive dependencies on integTest cluster nodes except security
configurations.zipArchive.asFileTree.each {
plugin(provider(new Callable<RegularFile>(){
@Override
RegularFile call() throws Exception {
return new RegularFile() {
@Override
File getAsFile() {
return it
}
}
}
})
)
}
Description
Excluded integTest from build script to handle the security plugin dependency.
Refer opensearch-project/neural-search#543 for more details.
Issues Resolved
Fixes #410
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.