Apply suggestions from code review

logstash-plugins · Nov 28, 2023 · f0f454c · f0f454c
1 parent 967734c
commit f0f454c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/org/logstash/plugins/inputs/http/util/SslSimpleBuilder.java b/src/main/java/org/logstash/plugins/inputs/http/util/SslSimpleBuilder.java
@@ -189,7 +189,7 @@ public SslSimpleBuilder setTrustStore(String trustStoreType, String trustStoreFi
         );
 
         if (!hasTrustStoreEntry(this.trustStore)) {
-            logger.warn("The provided Trust Store file does not contains any trusted certificate entry: {}. Please confirm this is the correct certificate and the password is correct", trustStoreFile);
+            throw new IllegalArgumentException(String.format("The provided Trust Store file does not contains any trusted certificate entry: %s", trustStoreFile));
         }
 
         return this;

diff --git a/src/test/java/org/logstash/plugins/inputs/http/util/SslSimpleBuilderTest.java b/src/test/java/org/logstash/plugins/inputs/http/util/SslSimpleBuilderTest.java
@@ -211,6 +211,15 @@ void testSetTrustStoreWithNullTrustStoreType() throws Exception {
         assertEquals(TRUSTSTORE_TYPE, sslSimpleBuilder.getTrustStore().getType());
     }
 
+    @Test
+    void testSetTrustStoreWithNoTrustedCertificate() {
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> createPemSslSimpleBuilder().setTrustStore(KEYSTORE_TYPE, KEYSTORE, KEYSTORE_PASSWORD),
+                String.format("The provided Trust Store file does not contains any trusted certificate entry: %s", KEYSTORE)
+        );
+    }
+
     @Test
     void testDefaultVerifyModeIsNone() {
         final SslSimpleBuilder sslSimpleBuilder = createPemSslSimpleBuilder();