Add support for OPENSEARCH_JAVA_HOME #1603
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
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
|
@dblock whenever you have time please |
dblock
approved these changes
Feb 10, 2022
| "%JAVA_HOME%\bin\java" -cp "%SCRIPT_DIR%\..\..\opendistro_security_ssl\*;%SCRIPT_DIR%\..\deps\*;%SCRIPT_DIR%\..\*;%SCRIPT_DIR%\..\..\..\lib\*" org.opensearch.security.tools.AuditConfigMigrater %* | ||
|
|
||
| rem comparing to empty string makes this equivalent to bash -v check on env var | ||
| if not "%OPENSEARCH_JAVA_HOME%" == "" ( |
There was a problem hiding this comment.
I ported it from opensearch-env.bat, just to keep the detection of the JVM to use uniform
Codecov Report
@@ Coverage Diff @@
## main #1603 +/- ##
============================================
- Coverage 64.68% 64.66% -0.03%
Complexity 3219 3219
============================================
Files 247 247
Lines 17351 17351
Branches 3082 3082
============================================
- Hits 11224 11220 -4
- Misses 4577 4581 +4
Partials 1550 1550
Continue to review full report at Codecov.
|
peternied
approved these changes
Feb 10, 2022
wuychn
pushed a commit
to ochprince/security
that referenced
this pull request
Mar 16, 2023
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
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.
Signed-off-by: Andriy Redko andriy.redko@aiven.io
Description
Add support for OPENSEARCH_JAVA_HOME
Issues Resolved
Closes #1600
Testing
The scripts have been tested under Windows / Linux
Check List
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.