Skip to content

Fix NPE when using deprecated Azure settings #28769

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.

Sign up for GitHub

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

Merged
dadoonet merged 2 commits into from
Feb 26, 2018
Merged

Fix NPE when using deprecated Azure settings #28769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2441e42
Fix NPE when using deprecated Azure settings
dadoonet Feb 21, 2018
138c19f
Fix test method name to `testGenerateOperationContext`
dadoonet Feb 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...ry-azure/src/main/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,13 @@ CloudBlobClient getSelectedClient(String account, LocationMode mode) {
return client;
}

private OperationContext generateOperationContext(String clientName) {
// Package private for testing in 6.x only: not needed anymore after
OperationContext generateOperationContext(String clientName) {
OperationContext context = new OperationContext();
AzureStorageSettings azureStorageSettings = this.storageSettings.get(clientName);
if (azureStorageSettings == null) {
azureStorageSettings = deprecatedStorageSettings.get(clientName);
}

if (azureStorageSettings.getProxy() != null) {
context.setProxy(azureStorageSettings.getProxy());
Expand Down
7 changes: 4 additions & 3 deletions ...y-azure/src/test/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,10 +390,11 @@ public void testGetDefaultClientWithPrimaryAndSecondaries() {
}

@Deprecated
public void testGetSelectedClientDefault() {
public void testGenerateOperationContext() {
AzureStorageServiceImpl azureStorageService = new AzureStorageServiceMock(deprecatedSettings);
CloudBlobClient client = azureStorageService.getSelectedClient("default", LocationMode.PRIMARY_ONLY);
assertThat(client.getEndpoint(), is(URI.create("https://azure1")));
// This was producing a NPE when calling any operation with deprecated settings.
// See https://github.com/elastic/elasticsearch/issues/28299
azureStorageService.generateOperationContext("default");
assertDeprecatedWarnings();
}

Expand Down