Update settings filter

Update settings filter to match elastic/elasticsearch#9748
imotov · Feb 24, 2015 · 20a9991 · 20a9991
1 parent 3a4e472
commit 20a9991
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 43 deletions.
diff --git a/src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java b/src/main/java/org/elasticsearch/cloud/aws/AwsEc2Service.java
@@ -48,7 +48,10 @@ public class AwsEc2Service extends AbstractLifecycleComponent<AwsEc2Service> {
     @Inject
     public AwsEc2Service(Settings settings, SettingsFilter settingsFilter, NetworkService networkService, DiscoveryNodeService discoveryNodeService) {
         super(settings);
-        settingsFilter.addFilter(new AwsSettingsFilter());
+        settingsFilter.addFilter("cloud.key");
+        settingsFilter.addFilter("cloud.account");
+        settingsFilter.addFilter("cloud.aws.access_key");
+        settingsFilter.addFilter("cloud.aws.secret_key");
         // add specific ec2 name resolver
         networkService.addCustomNameResolver(new Ec2NameResolver(settings));
         discoveryNodeService.addCustomAttributeProvider(new Ec2CustomNodeAttributes(settings));

diff --git a/src/main/java/org/elasticsearch/cloud/aws/AwsSettingsFilter.java b/src/main/java/org/elasticsearch/cloud/aws/AwsSettingsFilter.java
diff --git a/src/main/java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java b/src/main/java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java
@@ -48,10 +48,8 @@ public class InternalAwsS3Service extends AbstractLifecycleComponent<AwsS3Servic
     private Map<Tuple<String, String>, AmazonS3Client> clients = new HashMap<Tuple<String,String>, AmazonS3Client>();
 
     @Inject
-    public InternalAwsS3Service(Settings settings, SettingsFilter settingsFilter) {
+    public InternalAwsS3Service(Settings settings) {
         super(settings);
-
-        settingsFilter.addFilter(new AwsSettingsFilter());
     }
 
     @Override

diff --git a/src/test/java/org/elasticsearch/cloud/aws/TestAwsS3Service.java b/src/test/java/org/elasticsearch/cloud/aws/TestAwsS3Service.java
@@ -34,8 +34,8 @@ public class TestAwsS3Service extends InternalAwsS3Service {
     IdentityHashMap<AmazonS3, TestAmazonS3> clients = new IdentityHashMap<AmazonS3, TestAmazonS3>();
 
     @Inject
-    public TestAwsS3Service(Settings settings, SettingsFilter settingsFilter) {
-        super(settings, settingsFilter);
+    public TestAwsS3Service(Settings settings) {
+        super(settings);
     }