Pass plugin-params also for modules #1640
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
In elastic#1624 we've ensured that plugins that have turned into modules are now skipped from the mandatory plugin check. However, we've also not passed any plugin parameters to the provisioner and this made post installation hooks fail, if they expected parameters to be passed on the command line via `--plugin-params` (e.g. `repository-gcs`). With this commit we make sure that `--plugin-params` is still honored even in these cases. Relates elastic#1624
danielmitterdorfer
added
bug
b-deam
approved these changes
Dec 19, 2022
There was a problem hiding this comment.
Thank you for catching this.
Funny that I missed this, given I extensively tested the PR in conjunction with esbench use-cases. It turns out we leverage CSP specific magic to handle snapshot repo auth on both AWS and GCP, so much magic that we actually don't even pass in any --plugin-params at all!
Thank you for including a test case too.
NB: Tested with..
Master:
$ esrally install --revision "@2022-02-04" --elasticsearch-plugins repository-s3,repository-gcs,repository-azure --plugin-params="s3_client_name:mys3client,s3_access_key:XXXXX,s3_secret_key:YYYYY,s3_session_token:ZZZZZ"
$ esrally start --installation-id f6bd6223-029c-45e6-812f-8d6e1f680589 --race-id testing
$ ./elasticsearch-keystore list
warning: ignoring JAVA_HOME=/Library/Java/JavaVirtualMachines/temurin-18.jdk/Contents/Home; using bundled JDK
keystore.seed
PR/1640:
$ esrally install --revision "@2022-02-04" --elasticsearch-plugins repository-s3,repository-gcs,repository-azure --plugin-params="s3_client_name:mys3client,s3_access_key:XXXXX,s3_secret_key:YYYYY,s3_session_token:ZZZZZ"
$ esrally start --installation-id 54117e74-c42a-43c3-bd83-e30b0cac9c54 --race-id testing
$ ./elasticsearch-keystore list
warning: ignoring JAVA_HOME=/Library/Java/JavaVirtualMachines/temurin-18.jdk/Contents/Home; using bundled JDK
keystore.seed
s3.client.mys3client.access_key
s3.client.mys3client.secret_key
s3.client.mys3client.session_token
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.
In #1624 we've ensured that plugins that have turned into modules are now skipped from the mandatory plugin check. However, we've also not passed any plugin parameters to the provisioner and this made post installation hooks fail, if they expected parameters to be passed on the command line via
--plugin-params(e.g.repository-gcs). With this commit we make sure that--plugin-paramsis still honored even in these cases.Relates #1624