Add Tests for covergae.

Signed-off-by: Pranit Kumar <[email protected]>

Author: pranikum

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

@@ -620,7 +620,8 @@ private void validateRepositoryMetadata(RepositoryMetadata newRepositoryMetadata
         validateHttpClientType(S3_ASYNC_HTTP_CLIENT_TYPE.get(settings));
     }
 
-    private void validateHttpClientType(String httpClientType) {
+    // package access for tests
+    void validateHttpClientType(String httpClientType) {
         if (!(httpClientType.equalsIgnoreCase(NETTY_ASYNC_HTTP_CLIENT_TYPE)
             || httpClientType.equalsIgnoreCase(CRT_ASYNC_HTTP_CLIENT_TYPE))) {
             throw new BlobStoreException("Invalid http client type. `" + httpClientType + "`");

plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3AsyncServiceTests.java

@@ -104,8 +104,24 @@ public void testCachedClientsWithCredentialsAreReleased() {
     }
 
     public void testBuildHttpClientWithNetty() {
+        final int port = randomIntBetween(10, 1080);
+        final String userName = randomAlphaOfLength(10);
+        final String password = randomAlphaOfLength(10);
+        final String proxyType = randomFrom("http", "https", "socks");
         final S3AsyncService s3AsyncService = new S3AsyncService(configPath());
-        final Settings settings = Settings.builder().put("endpoint", "http://first").put("region", "us-east-2").build();
+
+        final MockSecureSettings secureSettings = new MockSecureSettings();
+        secureSettings.setString("s3.client.default.proxy.username", userName);
+        secureSettings.setString("s3.client.default.proxy.password", password);
+
+        final Settings settings = Settings.builder()
+            .put("endpoint", "http://first")
+            .put("region", "us-east-2")
+            .put("s3.client.default.proxy.type", proxyType)
+            .put("s3.client.default.proxy.host", randomFrom("127.0.0.10"))
+            .put("s3.client.default.proxy.port", randomFrom(port))
+            .setSecureSettings(secureSettings)
+            .build();
         final RepositoryMetadata metadata1 = new RepositoryMetadata("first", "s3", settings);
         final S3ClientSettings clientSettings = s3AsyncService.settings(metadata1);
 
@@ -123,8 +139,25 @@ public void testBuildHttpClientWithNetty() {
     }
 
     public void testBuildHttpClientWithCRT() {
+        final int port = randomIntBetween(10, 1080);
+        final String userName = randomAlphaOfLength(10);
+        final String password = randomAlphaOfLength(10);
+        final String proxyType = randomFrom("http", "https", "socks");
         final S3AsyncService s3AsyncService = new S3AsyncService(configPath());
-        final Settings settings = Settings.builder().put("endpoint", "http://first").put("region", "us-east-2").build();
+
+        final MockSecureSettings secureSettings = new MockSecureSettings();
+        secureSettings.setString("s3.client.default.proxy.username", userName);
+        secureSettings.setString("s3.client.default.proxy.password", password);
+
+        final Settings settings = Settings.builder()
+            .put("endpoint", "http://first")
+            .put("region", "us-east-2")
+            .put("s3.client.default.proxy.type", proxyType)
+            .put("s3.client.default.proxy.host", randomFrom("127.0.0.10"))
+            .put("s3.client.default.proxy.port", randomFrom(port))
+            .setSecureSettings(secureSettings)
+            .build();
+
         final RepositoryMetadata metadata1 = new RepositoryMetadata("first", "s3", settings);
         final S3ClientSettings clientSettings = s3AsyncService.settings(metadata1);
 

plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3RepositoryTests.java

@@ -35,6 +35,7 @@
 import software.amazon.awssdk.services.s3.S3Client;
 
 import org.opensearch.cluster.metadata.RepositoryMetadata;
+import org.opensearch.common.blobstore.BlobStoreException;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Setting;
 import org.opensearch.common.settings.Settings;
@@ -157,6 +158,23 @@ public void testRestrictedSettingsDefault() {
         }
     }
 
+    public void testValidateHttpLClientType_Valid_Values() {
+        final RepositoryMetadata metadata = new RepositoryMetadata("dummy-repo", "mock", Settings.EMPTY);
+        try (S3Repository s3Repo = createS3Repo(metadata)) {
+            // Don't expect any Exception
+            s3Repo.validateHttpClientType(S3Repository.CRT_ASYNC_HTTP_CLIENT_TYPE);
+            s3Repo.validateHttpClientType(S3Repository.NETTY_ASYNC_HTTP_CLIENT_TYPE);
+        }
+    }
+
+    public void testValidateHttpLClientType_Invalid_Values() {
+        final RepositoryMetadata metadata = new RepositoryMetadata("dummy-repo", "mock", Settings.EMPTY);
+        try (S3Repository s3Repo = createS3Repo(metadata)) {
+            // Don't expect any Exception
+            assertThrows(BlobStoreException.class, () -> s3Repo.validateHttpClientType(randomAlphaOfLength(4)));
+        }
+    }
+
     private S3Repository createS3Repo(RepositoryMetadata metadata) {
         return new S3Repository(
             metadata,