Making change on code based on comments. Refactor tken avalidation logic, rename test classes, and move test into a new package 'testcustomauth'

Author: Siqi Ding

Diff for: data-prepper-plugins/armeria-common/src/main/java/org/opensearch/dataprepper/CustomAuthenticationExceptionHandler.java

@@ -21,8 +21,9 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.opensearch.dataprepper.armeria.authentication.CustomAuthenticationConfig;
+import org.opensearch.dataprepper.plugins.testcustomauth.TestCustomAuthenticationConfig;
 import org.opensearch.dataprepper.armeria.authentication.GrpcAuthenticationProvider;
+import org.opensearch.dataprepper.plugins.testcustomauth.TestCustomGrpcAuthenticationProvider;
 
 import java.nio.charset.Charset;
 import java.util.Collections;
@@ -36,16 +37,18 @@
 
 public class CustomBasicAuthenticationProviderTest {
     private static final String TOKEN = UUID.randomUUID().toString();
+    private static final String HEADER_NAME = "x-" + UUID.randomUUID();
     private static GrpcAuthenticationProvider grpcAuthenticationProvider;
 
     @RegisterExtension
     static ServerExtension server = new ServerExtension() {
         @Override
         protected void configure(ServerBuilder sb) {
-            CustomAuthenticationConfig config = mock(CustomAuthenticationConfig.class);
+            TestCustomAuthenticationConfig config = mock(TestCustomAuthenticationConfig.class);
             when(config.customToken()).thenReturn(TOKEN);
+            when(config.header()).thenReturn(HEADER_NAME);
 
-            grpcAuthenticationProvider = new CustomGrpcAuthenticationProvider(config);
+            grpcAuthenticationProvider = new TestCustomGrpcAuthenticationProvider(config);
 
             GrpcServiceBuilder grpcServiceBuilder = GrpcService.builder()
                     .enableUnframedRequests(true)
@@ -68,16 +71,16 @@ public void check(HealthCheckRequest request, StreamObserver<HealthCheckResponse
 
     @Nested
     class ConstructorTests {
-        CustomAuthenticationConfig config;
+        TestCustomAuthenticationConfig config;
 
         @BeforeEach
         void setUp() {
-            config = mock(CustomAuthenticationConfig.class);
+            config = mock(TestCustomAuthenticationConfig.class);
         }
 
         @Test
         void constructor_with_null_config_throws() {
-            assertThrows(NullPointerException.class, () -> new CustomGrpcAuthenticationProvider(null));
+            assertThrows(NullPointerException.class, () -> new TestCustomGrpcAuthenticationProvider(null));
         }
     }
 
@@ -100,7 +103,7 @@ void request_without_token_responds_Unauthorized() {
         @Test
         void request_with_invalid_token_responds_Unauthorized() {
             WebClient client = WebClient.builder(server.httpUri())
-                    .addHeader("authentication", "invalid-token")
+                    .addHeader(HEADER_NAME, "invalid-token")
                     .build();
 
             HttpRequest request = HttpRequest.of(RequestHeaders.builder()
@@ -117,7 +120,7 @@ void request_with_invalid_token_responds_Unauthorized() {
         @Test
         void request_with_valid_token_responds_OK() {
             WebClient client = WebClient.builder(server.httpUri())
-                    .addHeader("authentication", TOKEN)
+                    .addHeader(HEADER_NAME, TOKEN)
                     .build();
 
             HttpRequest request = HttpRequest.of(RequestHeaders.builder()

Diff for: data-prepper-plugins/armeria-common/src/main/java/org/opensearch/dataprepper/armeria/authentication/CustomAuthenticationConfig.java

@@ -0,0 +1,45 @@
+package org.opensearch.dataprepper.plugins;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.opensearch.dataprepper.plugins.testcustomauth.TestCustomAuthenticationConfig;
+import org.opensearch.dataprepper.plugins.testcustomauth.TestCustomGrpcAuthenticationProvider;
+
+import static org.mockito.Mockito.when;
+
+@ExtendWith(MockitoExtension.class)
+public class TestCustomAuthenticationProviderTest {
+
+    private static final String TOKEN = "test-token";
+    private static final String HEADER = "authentication";
+
+    @Mock
+    private TestCustomAuthenticationConfig config;
+
+    private TestCustomGrpcAuthenticationProvider provider;
+
+    @BeforeEach
+    void setUp() {
+        when(config.customToken()).thenReturn(TOKEN);
+        when(config.header()).thenReturn(HEADER);
+
+        provider = new TestCustomGrpcAuthenticationProvider(config);
+    }
+
+    @Test
+    void testGetHttpAuthenticationService_shouldReturnValidOptional() {
+        var optionalService = provider.getHttpAuthenticationService();
+        Assertions.assertTrue(optionalService.isPresent());
+    }
+
+    @Test
+    void testGetAuthenticationInterceptor_shouldReturnNonNull() {
+        var interceptor = provider.getAuthenticationInterceptor();
+        Assertions.assertNotNull(interceptor);
+    }
+}
+