Update settings filter

Update settings filter to match elastic/elasticsearch#9748 Closes elastic#71.
dadoonet · Mar 28, 2015 · 63d85ec · 63d85ec
1 parent b7c4408
commit 63d85ec
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 67 deletions.
diff --git a/src/main/java/org/elasticsearch/cloud/azure/AzureSettingsFilter.java b/src/main/java/org/elasticsearch/cloud/azure/AzureSettingsFilter.java
diff --git a/src/main/java/org/elasticsearch/cloud/azure/management/AzureComputeServiceImpl.java b/src/main/java/org/elasticsearch/cloud/azure/management/AzureComputeServiceImpl.java
@@ -28,7 +28,6 @@
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.cloud.azure.AzureServiceDisableException;
 import org.elasticsearch.cloud.azure.AzureServiceRemoteException;
-import org.elasticsearch.cloud.azure.AzureSettingsFilter;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
@@ -54,7 +53,22 @@ static final class Azure {
     @Inject
     public AzureComputeServiceImpl(Settings settings, SettingsFilter settingsFilter) {
         super(settings);
-        settingsFilter.addFilter(new AzureSettingsFilter());
+        // Cloud global settings
+        settingsFilter.addFilter("cloud.azure." + AzureComputeService.Fields.REFRESH);
+
+        // Cloud management API settings
+        settingsFilter.addFilter("cloud.azure.management." + AzureComputeService.Fields.KEYSTORE_PATH);
+        settingsFilter.addFilter("cloud.azure.management." + AzureComputeService.Fields.KEYSTORE_PASSWORD);
+        settingsFilter.addFilter("cloud.azure.management." + AzureComputeService.Fields.KEYSTORE_TYPE);
+        settingsFilter.addFilter("cloud.azure.management." + AzureComputeService.Fields.SUBSCRIPTION_ID);
+        settingsFilter.addFilter("cloud.azure.management." + AzureComputeService.Fields.SERVICE_NAME);
+
+        // Deprecated Cloud management API settings
+        // TODO Remove in 3.0.0
+        settingsFilter.addFilter("cloud.azure." + AzureComputeService.Fields.KEYSTORE_DEPRECATED);
+        settingsFilter.addFilter("cloud.azure." + AzureComputeService.Fields.PASSWORD_DEPRECATED);
+        settingsFilter.addFilter("cloud.azure." + AzureComputeService.Fields.SUBSCRIPTION_ID_DEPRECATED);
+        settingsFilter.addFilter("cloud.azure." + AzureComputeService.Fields.SERVICE_NAME_DEPRECATED);
 
         String subscriptionId = componentSettings.get(Fields.SUBSCRIPTION_ID, settings.get("cloud.azure." + Fields.SUBSCRIPTION_ID_DEPRECATED));
 

diff --git a/src/main/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceImpl.java b/src/main/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceImpl.java
@@ -23,7 +23,7 @@
 import com.microsoft.azure.storage.StorageException;
 import com.microsoft.azure.storage.blob.*;
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.cloud.azure.AzureSettingsFilter;
+import org.elasticsearch.cloud.azure.management.AzureComputeService;
 import org.elasticsearch.common.blobstore.BlobMetaData;
 import org.elasticsearch.common.blobstore.support.PlainBlobMetaData;
 import org.elasticsearch.common.collect.ImmutableMap;
@@ -53,7 +53,17 @@ public class AzureStorageServiceImpl extends AbstractLifecycleComponent<AzureSto
     @Inject
     public AzureStorageServiceImpl(Settings settings, SettingsFilter settingsFilter) {
         super(settings);
-        settingsFilter.addFilter(new AzureSettingsFilter());
+        // Cloud global settings
+        settingsFilter.addFilter("cloud.azure." + AzureComputeService.Fields.REFRESH);
+
+        // Cloud storage API settings
+        settingsFilter.addFilter("cloud.azure.storage." + AzureStorageService.Fields.ACCOUNT);
+        settingsFilter.addFilter("cloud.azure.storage." + AzureStorageService.Fields.KEY);
+
+        // Deprecated Cloud storage API settings
+        // TODO Remove in 3.0.0
+        settingsFilter.addFilter("cloud.azure." + AzureStorageService.Fields.ACCOUNT_DEPRECATED);
+        settingsFilter.addFilter("cloud.azure." + AzureStorageService.Fields.KEY_DEPRECATED);
 
         // We try to load storage API settings from `repositories.azure.`
         account = componentSettings.get(Fields.ACCOUNT, settings.get("cloud.azure." + Fields.ACCOUNT_DEPRECATED));

diff --git a/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreITest.java b/src/test/java/org/elasticsearch/repositories/azure/AzureSnapshotRestoreITest.java
@@ -27,7 +27,6 @@
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.ClusterAdminClient;
 import org.elasticsearch.cloud.azure.AbstractAzureTest;
-import org.elasticsearch.cloud.azure.AzureSettingsFilter;
 import org.elasticsearch.cloud.azure.storage.AzureStorageService;
 import org.elasticsearch.cloud.azure.storage.AzureStorageServiceImpl;
 import org.elasticsearch.cluster.ClusterState;
@@ -471,8 +470,6 @@ public static void wipeRepositories(String... repositories) {
     public static void cleanRepositoryFiles(String... containers) throws StorageException, URISyntaxException {
         Settings settings = readSettingsFromFile();
         SettingsFilter settingsFilter = new SettingsFilter(settings);
-        settingsFilter.addFilter(new AzureSettingsFilter());
-
         AzureStorageService client = new AzureStorageServiceImpl(settings, settingsFilter);
         for (String container : containers) {
             client.removeContainer(container);