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

opensearch-trigger-bot[bot] · github-actions[bot] · reta · web-flow · commit a277cd01ea78 · 2023-06-06T14:06:09.000-04:00
* Update S3RepositoryPlugin.java Fixing error: adding a new parameter to the configuration for checking the config on startup. * Update CHANGELOG.md * Add proxy settings type to test case settings to make sure it is accepted --------- (cherry picked from commit d55813e) Signed-off-by: Konstantin Gerasimenko <kred@gmx.net> Signed-off-by: Andriy Redko <andriy.redko@aiven.io> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Andriy Redko <andriy.redko@aiven.io>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,6 +31,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
 
diff --git a/plugins/repository-s3/src/internalClusterTest/java/org/opensearch/repositories/s3/S3BlobStoreRepositoryTests.java b/plugins/repository-s3/src/internalClusterTest/java/org/opensearch/repositories/s3/S3BlobStoreRepositoryTests.java
@@ -154,6 +154,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);
 
diff --git a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3RepositoryPlugin.java b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3RepositoryPlugin.java
@@ -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,
