From 82fee9f7a714c756534fe32fcdedcae5c42cf8fd Mon Sep 17 00:00:00 2001 From: David Pilato Date: Fri, 17 Jun 2016 17:02:00 +0200 Subject: [PATCH] Revert change about registering Repository settings Will create another issue to change that. Related to this discussion: https://github.com/elastic/elasticsearch/pull/17784/files/f4cd3bd3480bf6c0a51faf408d8ea9c8a8733a6b#r67291936 --- .../plugin/repository/s3/S3RepositoryPlugin.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/plugins/repository-s3/src/main/java/org/elasticsearch/plugin/repository/s3/S3RepositoryPlugin.java b/plugins/repository-s3/src/main/java/org/elasticsearch/plugin/repository/s3/S3RepositoryPlugin.java index 7922174f40e..26ff53a6e62 100644 --- a/plugins/repository-s3/src/main/java/org/elasticsearch/plugin/repository/s3/S3RepositoryPlugin.java +++ b/plugins/repository-s3/src/main/java/org/elasticsearch/plugin/repository/s3/S3RepositoryPlugin.java @@ -129,6 +129,22 @@ public class S3RepositoryPlugin extends Plugin { settingsModule.registerSetting(S3Repository.Repositories.CANNED_ACL_SETTING); settingsModule.registerSetting(S3Repository.Repositories.BASE_PATH_SETTING); settingsModule.registerSetting(S3Repository.Repositories.USE_THROTTLE_RETRIES_SETTING); + + // Register S3 single repository settings + settingsModule.registerSetting(S3Repository.Repository.KEY_SETTING); + settingsModule.registerSetting(S3Repository.Repository.SECRET_SETTING); + settingsModule.registerSetting(S3Repository.Repository.BUCKET_SETTING); + settingsModule.registerSetting(S3Repository.Repository.ENDPOINT_SETTING); + settingsModule.registerSetting(S3Repository.Repository.PROTOCOL_SETTING); + settingsModule.registerSetting(S3Repository.Repository.REGION_SETTING); + settingsModule.registerSetting(S3Repository.Repository.SERVER_SIDE_ENCRYPTION_SETTING); + settingsModule.registerSetting(S3Repository.Repository.BUFFER_SIZE_SETTING); + settingsModule.registerSetting(S3Repository.Repository.MAX_RETRIES_SETTING); + settingsModule.registerSetting(S3Repository.Repository.CHUNK_SIZE_SETTING); + settingsModule.registerSetting(S3Repository.Repository.COMPRESS_SETTING); + settingsModule.registerSetting(S3Repository.Repository.STORAGE_CLASS_SETTING); + settingsModule.registerSetting(S3Repository.Repository.CANNED_ACL_SETTING); + settingsModule.registerSetting(S3Repository.Repository.BASE_PATH_SETTING); } /**