Skip to content

Commit

Permalink
Fixing error: adding a new/forgotten parameter to the configuration f…
Browse files Browse the repository at this point in the history
…or checking the config on startup in plugins/repository-s3 (#7924)

* Update S3RepositoryPlugin.java

Fixing error: adding a new parameter to the configuration for checking the config on startup.

Signed-off-by: Konstantin Gerasimenko <kred@gmx.net>

* Update CHANGELOG.md

Signed-off-by: Konstantin Gerasimenko <kred@gmx.net>

* Add proxy settings type to test case settings to make sure it is accepted

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

---------

Signed-off-by: Konstantin Gerasimenko <kred@gmx.net>
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
  • Loading branch information
nice-redbull and reta authored Jun 6, 2023
1 parent 6fdeae9 commit d55813e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Removed

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

### Security

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ protected Settings nodeSettings(int nodeOrdinal) {
.put(S3ClientSettings.DISABLE_CHUNKED_ENCODING.getConcreteSettingForNamespace("test").getKey(), true)
// Disable request throttling because some random values in tests might generate too many failures for the S3 client
.put(S3ClientSettings.USE_THROTTLE_RETRIES_SETTING.getConcreteSettingForNamespace("test").getKey(), false)
.put(S3ClientSettings.PROXY_TYPE_SETTING.getConcreteSettingForNamespace("test").getKey(), ProxySettings.ProxyType.DIRECT)
.put(super.nodeSettings(nodeOrdinal))
.setSecureSettings(secureSettings);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ public List<Setting<?>> getSettings() {
S3ClientSettings.SESSION_TOKEN_SETTING,
S3ClientSettings.ENDPOINT_SETTING,
S3ClientSettings.PROTOCOL_SETTING,
S3ClientSettings.PROXY_TYPE_SETTING,
S3ClientSettings.PROXY_HOST_SETTING,
S3ClientSettings.PROXY_PORT_SETTING,
S3ClientSettings.PROXY_USERNAME_SETTING,
Expand Down

0 comments on commit d55813e

Please sign in to comment.