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

Update master branch with latest changes #74

Merged
merged 1 commit into from
Apr 16, 2015

Conversation

dadoonet
Copy link
Member

@imotov We got some changes in elasticsearch master with componentSettings removal.
I refactored the full changes with 2 new commits and would love if you could check them.

Going to send the same PR for 1.x and 1.4 branches.

Thanks!

@dadoonet dadoonet added the 3.0.0 label Feb 27, 2015
@dadoonet dadoonet added this to the 3.0.0 milestone Feb 27, 2015
@dadoonet dadoonet self-assigned this Feb 27, 2015
// TODO Remove in 3.0.0
settingsFilter.addFilter(KEYSTORE_DEPRECATED);
settingsFilter.addFilter(PASSWORD_DEPRECATED);
settingsFilter.addFilter(SUBSCRIPTION_ID_DEPRECATED);
Copy link

Choose a reason for hiding this comment

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

Does this mean that if somebody temporary disables the service all settings will become exposed?

Copy link
Member Author

Choose a reason for hiding this comment

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

Agreed. That's bad.

@imotov
Copy link

imotov commented Mar 21, 2015

I think it might be prudent to move settings setup in some component that is always instantiated. Just as precaution. Otherwise the settings changes look good to me.

@dadoonet dadoonet closed this Mar 28, 2015
@dadoonet dadoonet deleted the pr/rm-component-settings branch March 28, 2015 10:50
@dadoonet dadoonet restored the pr/rm-component-settings branch March 28, 2015 10:57
@dadoonet
Copy link
Member Author

Closed by mistake

@dadoonet
Copy link
Member Author

@imotov I updated the PR. I don't know if it's the best way to achieve it.
Actually, as I don't have any "default" Azure Component running, I created a AzureXYZSettingsFilter Component which does that job. XYZ for Storage and Compute.

Let me know what you think.

import static org.elasticsearch.cloud.azure.management.AzureComputeService.Management.*;

public class AzureComputeSettingsFilter extends AbstractLifecycleComponent<AzureSettingsFilter>
implements AzureSettingsFilter {
Copy link

Choose a reason for hiding this comment

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

I think the AzureSettingsFilter interface is not needed - you can just bind concrete implementations. There is also no need for this to be a lifecycle component since lifecycle events are not used anyway.

@imotov
Copy link

imotov commented Apr 14, 2015

Sorry for the delay. Left one comment. Otherwise LGTM.

…ponent

Update settings filter to match elastic/elasticsearch#9748
Remove component settings from AbstractComponent as seen in elastic/elasticsearch#9919

Closes elastic#71.
Closes elastic#72.
@dadoonet dadoonet merged commit cd7b8d4 into elastic:master Apr 16, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants