Skip to content
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

Add setFactory permission to GceDiscoveryPlugin #16860

Merged
merged 2 commits into from
Mar 1, 2016

Conversation

s1monw
Copy link
Contributor

@s1monw s1monw commented Feb 29, 2016

This commit adds a missing permission and a simple test that
ensures we discover other nodes via a mock http endpoint.

Closes #16485

@rjernst I had to make this integ test a ordinary testcase since it runs against an internal cluster. I didn't explore the test fixture path yet since it also requires a test plugin etc. I wonder if we can make this one test run against the internal cluster while others runs against external clusters? I am not super happy with the test but it's a major step forward since it really tests the integration of this plugins while everything else isn't really testing it. It also would have caught the security issue though

@@ -30,6 +30,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.function.Function;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this import?

This commit adds a missing permission and a simple test that
ensures we discover other nodes via a mock http endpoint.

Closes elastic#16485
@dadoonet
Copy link
Member

Interesting. I like the idea of using an HTTP server to serve the mock responses.
Thanks @s1monw for fixing this issue.

LGTM

@rjernst
Copy link
Member

rjernst commented Feb 29, 2016

This looks ok to me. It is good to have some kind of test for GCE. I'm apprehensive about checking in the keyfile, but I guess it is just for a test...

At another time, I am happy to look at moving this to a fixture, as well as generating the keyfile, but this PR at least gets us into a better state than we are now.

@rmuir
Copy link
Contributor

rmuir commented Feb 29, 2016

+1

@jasontedor
Copy link
Member

I have the same apprehension as @rjernst but given

At another time, I am happy to look at moving this to a fixture, as well as generating the keyhole

I'm good with the change too. Thanks for picking this up @s1monw.

@s1monw
Copy link
Contributor Author

s1monw commented Feb 29, 2016

@rjernst @jasontedor I pushed a new commit generating the keystore from gradle

@rjernst
Copy link
Member

rjernst commented Feb 29, 2016

Looks good, thanks!

@jasontedor
Copy link
Member

LGTM.

s1monw added a commit that referenced this pull request Mar 1, 2016
Add setFactory permission to GceDiscoveryPlugin

This commit adds a missing permission and a simple test that
ensures we discover other nodes via a mock http endpoint.

Closes #16485
@s1monw s1monw merged commit 80e5c0a into elastic:master Mar 1, 2016
@s1monw s1monw deleted the issues/16485 branch March 1, 2016 07:55
s1monw added a commit to s1monw/elasticsearch that referenced this pull request Mar 1, 2016
This commit adds a missing permission and a simple test that
ensures we discover other nodes via a mock http endpoint.

Backport of elastic#16860
Relates to elastic#16485
s1monw added a commit that referenced this pull request Mar 1, 2016
This commit adds the missing permission to `cloud-gce`. Since this is
a bugfix branch the commit doesn't contain the testcase added to 2.x and
master to keep the footprint of this change as low as possible.

Backport of #16860
Relates to #16485
s1monw added a commit that referenced this pull request Mar 1, 2016
Backport add setFactory permission to GceDiscoveryPlugin

This commit adds a missing permission and a simple test that
ensures we discover other nodes via a mock http endpoint.

Backport of #16860
Relates to #16485
@clintongormley clintongormley added :Distributed Coordination/Discovery-Plugins Anything related to our integration plugins with EC2, GCP and Azure and removed :Plugin Discovery GCE labels Feb 13, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>bug :Distributed Coordination/Discovery-Plugins Anything related to our integration plugins with EC2, GCP and Azure v2.2.1 v2.3.0 v5.0.0-alpha1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Plugin does not work with ES 2.2.0
6 participants