honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pr/hide-s3-repositories-credentials'

This commit is contained in:
David Pilato 2016-05-10 20:22:39 +02:00
parent a0ffe6ea89 6ef81c5dcd
commit e8ddf5de2f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3Repository.java
View File

@ -67,13 +67,13 @@ public class S3Repository extends BlobStoreRepository {
* @see CLOUD_S3#KEY_SETTING * @see CLOUD_S3#KEY_SETTING
*/ */
Setting<String> KEY_SETTING = Setting<String> KEY_SETTING =
new Setting<>("repositories.s3.access_key", CLOUD_S3.KEY_SETTING, Function.identity(), Property.NodeScope); new Setting<>("repositories.s3.access_key", CLOUD_S3.KEY_SETTING, Function.identity(), Property.NodeScope, Property.Filtered);
/** /**
* repositories.s3.secret_key: AWS Secret key specific for all S3 Repositories API calls. Defaults to cloud.aws.s3.secret_key. * repositories.s3.secret_key: AWS Secret key specific for all S3 Repositories API calls. Defaults to cloud.aws.s3.secret_key.
* @see CLOUD_S3#SECRET_SETTING * @see CLOUD_S3#SECRET_SETTING
*/ */
Setting<String> SECRET_SETTING = Setting<String> SECRET_SETTING =
new Setting<>("repositories.s3.secret_key", CLOUD_S3.SECRET_SETTING, Function.identity(), Property.NodeScope); new Setting<>("repositories.s3.secret_key", CLOUD_S3.SECRET_SETTING, Function.identity(), Property.NodeScope, Property.Filtered);
/** /**
* repositories.s3.region: Region specific for all S3 Repositories API calls. Defaults to cloud.aws.s3.region. * repositories.s3.region: Region specific for all S3 Repositories API calls. Defaults to cloud.aws.s3.region.
* @see CLOUD_S3#REGION_SETTING * @see CLOUD_S3#REGION_SETTING

2
plugins/repository-s3/src/test/resources/rest-api-spec/test/repository_s3/20_repository.yaml
View File

@ -1,6 +1,6 @@
# Integration tests for Repository S3 component # Integration tests for Repository S3 component
# #
"S3 repository can be registereed": "S3 repository can be registered":
- do: - do:
snapshot.create_repository: snapshot.create_repository:
repository: test_repo_s3_1 repository: test_repo_s3_1