Skip to content

Commit d55813e

Browse files
nice-redbullreta
andauthored
Fixing error: adding a new/forgotten parameter to the configuration for checking the config on startup in plugins/repository-s3 (opensearch-project#7924)
* Update S3RepositoryPlugin.java Fixing error: adding a new parameter to the configuration for checking the config on startup. Signed-off-by: Konstantin Gerasimenko <[email protected]> * Update CHANGELOG.md Signed-off-by: Konstantin Gerasimenko <[email protected]> * Add proxy settings type to test case settings to make sure it is accepted Signed-off-by: Andriy Redko <[email protected]> --------- Signed-off-by: Konstantin Gerasimenko <[email protected]> Signed-off-by: Andriy Redko <[email protected]> Co-authored-by: Andriy Redko <[email protected]>
1 parent 6fdeae9 commit d55813e

File tree

3 files changed

+3
-0
lines changed

3 files changed

+3
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
101101
### Removed
102102

103103
### Fixed
104+
- Fixing error: adding a new/forgotten parameter to the configuration for checking the config on startup in plugins/repository-s3 #7924
104105

105106
### Security
106107

plugins/repository-s3/src/internalClusterTest/java/org/opensearch/repositories/s3/S3BlobStoreRepositoryTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ protected Settings nodeSettings(int nodeOrdinal) {
140140
.put(S3ClientSettings.DISABLE_CHUNKED_ENCODING.getConcreteSettingForNamespace("test").getKey(), true)
141141
// Disable request throttling because some random values in tests might generate too many failures for the S3 client
142142
.put(S3ClientSettings.USE_THROTTLE_RETRIES_SETTING.getConcreteSettingForNamespace("test").getKey(), false)
143+
.put(S3ClientSettings.PROXY_TYPE_SETTING.getConcreteSettingForNamespace("test").getKey(), ProxySettings.ProxyType.DIRECT)
143144
.put(super.nodeSettings(nodeOrdinal))
144145
.setSecureSettings(secureSettings);
145146

plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3RepositoryPlugin.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ public List<Setting<?>> getSettings() {
104104
S3ClientSettings.SESSION_TOKEN_SETTING,
105105
S3ClientSettings.ENDPOINT_SETTING,
106106
S3ClientSettings.PROTOCOL_SETTING,
107+
S3ClientSettings.PROXY_TYPE_SETTING,
107108
S3ClientSettings.PROXY_HOST_SETTING,
108109
S3ClientSettings.PROXY_PORT_SETTING,
109110
S3ClientSettings.PROXY_USERNAME_SETTING,

0 commit comments

Comments
 (0)