From 2a40ebe94c2d4c2ab7988d84c5feee6ea46a0f05 Mon Sep 17 00:00:00 2001 From: Konstantin Gerasimenko Date: Tue, 6 Jun 2023 15:06:42 +0200 Subject: [PATCH 1/3] Update S3RepositoryPlugin.java Fixing error: adding a new parameter to the configuration for checking the config on startup. Signed-off-by: Konstantin Gerasimenko --- .../java/org/opensearch/repositories/s3/S3RepositoryPlugin.java | 1 + 1 file changed, 1 insertion(+) 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 index 077c60a83f513..828bf85fd7889 100644 --- 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> 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, From 2afc0a9884439d5d5f811c3670cbb8c32ae49485 Mon Sep 17 00:00:00 2001 From: Konstantin Gerasimenko Date: Tue, 6 Jun 2023 15:50:49 +0200 Subject: [PATCH 2/3] Update CHANGELOG.md Signed-off-by: Konstantin Gerasimenko --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64274e86a4f74..ba1d24d992e7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 From eedf4e7ea07e061578517b6cbb809ac841e6da3a Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Tue, 6 Jun 2023 10:18:04 -0400 Subject: [PATCH 3/3] Add proxy settings type to test case settings to make sure it is accepted Signed-off-by: Andriy Redko --- .../opensearch/repositories/s3/S3BlobStoreRepositoryTests.java | 1 + 1 file changed, 1 insertion(+) 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 index dd19320ae1255..1bbc973dd712f 100644 --- 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 @@ -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);