Fixing merge conflicts to resolve build failures

Signed-off-by: ngsupta1 <guptaneha.e@gmail.com>

Author: nsgupta1

data-prepper-plugins/saas-source-plugins/crowdstrike-source/src/main/java/org/opensearch/dataprepper/plugins/source/crowdstrike/CrowdStrikeSourceConfig.java

@@ -13,10 +13,7 @@
  */
 @Getter
 public class CrowdStrikeSourceConfig implements CrawlerSourceConfig {
-    /**
-     * Batch size for fetching Threat Intel Feeds
-     */
-    private static final int DEFAULT_IOC_FETCH_BATCH_SIZE = 10000;
+
     private static final int DEFAULT_NUMBER_OF_WORKERS = 5;
 
     @JsonProperty("authentication")
@@ -32,9 +29,4 @@ public class CrowdStrikeSourceConfig implements CrawlerSourceConfig {
     @Valid
     private int numWorkers = DEFAULT_NUMBER_OF_WORKERS;
 
-    @Override
-    public int getBatchSize() {
-        return DEFAULT_IOC_FETCH_BATCH_SIZE;
-    }
-
 }

data-prepper-plugins/saas-source-plugins/crowdstrike-source/src/main/java/org/opensearch/dataprepper/plugins/source/crowdstrike/rest/CrowdStrikeAuthClient.java

@@ -35,6 +35,9 @@ public class CrowdStrikeAuthClient {
     RestTemplate restTemplate = new RestTemplate();
     private static final Logger log = LoggerFactory.getLogger(CrowdStrikeAuthClient.class);
     private static final String OAUTH_TOKEN_URL = "https://api.crowdstrike.com/oauth2/token";
+    private static final String ACCESS_TOKEN = "access_token";
+    private static final String EXPIRE_IN = "expires_in";
+
 
 
     public CrowdStrikeAuthClient(final CrowdStrikeSourceConfig sourceConfig) {
@@ -66,10 +69,10 @@ private void getAuthToken() {
         HttpEntity<String> request = new HttpEntity<>(headers);
         try {
             ResponseEntity<Map> response = restTemplate.postForEntity(OAUTH_TOKEN_URL, request, Map.class);
-            Map<String, Object> tokenData = response.getBody();
-            this.bearerToken = (String) tokenData.get("access_token");
-            this.expireTime = Instant.now().plusSeconds((Integer) tokenData.get("expires_in"));
-            log.info("Access token acquired successfully, expires in {} seconds", tokenData.get("expires_in"));
+            Map tokenData = response.getBody();
+            this.bearerToken = (String) tokenData.get(ACCESS_TOKEN);
+            this.expireTime = Instant.now().plusSeconds((Integer) tokenData.get(EXPIRE_IN));
+            log.info("Access token acquired successfully");
         } catch (HttpClientErrorException ex) {
             this.expireTime = Instant.ofEpochMilli(0);
             HttpStatus statusCode = ex.getStatusCode();
@@ -87,6 +90,6 @@ public boolean isTokenExpired() {
      * Refreshes the bearer token by retrieving a new one from CrowdStrike.
      */
     public void refreshToken() {
-        //getAuthenticationToken();
+
     }
 }

data-prepper-plugins/saas-source-plugins/crowdstrike-source/src/test/java/org/opensearch/dataprepper/plugins/source/crowdstrike/CrowdStrikeSourceConfigTest.java

@@ -13,7 +13,6 @@ public class CrowdStrikeSourceConfigTest {
     private static final ObjectMapper objectMapper = new ObjectMapper();
     private CrowdStrikeSourceConfig config;
 
-    private static final int DEFAULT_BATCH_SIZE = 10000;
     private static final int DEFAULT_WORKERS = 5;
 
     @BeforeEach
@@ -23,7 +22,6 @@ void setup() {
 
     @Test
     void testDefaultValues() {
-        assertEquals(DEFAULT_BATCH_SIZE, config.getBatchSize());
         assertEquals(DEFAULT_WORKERS, config.getNumWorkers());
         assertFalse(config.isAcknowledgments());
     }
@@ -44,7 +42,6 @@ void testDeserializationWithValues() throws Exception {
         assertNotNull(loadedConfig.getAuthenticationConfig());
         assertTrue(loadedConfig.isAcknowledgments());
         assertEquals(10, loadedConfig.getNumWorkers());
-        assertEquals(DEFAULT_BATCH_SIZE, loadedConfig.getBatchSize());
     }
 
 }

data-prepper-plugins/saas-source-plugins/crowdstrike-source/src/test/java/org/opensearch/dataprepper/plugins/source/crowdstrike/configuration/AuthenticationConfigTest.java

@@ -1,4 +1,49 @@
 package org.opensearch.dataprepper.plugins.source.crowdstrike.configuration;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 public class AuthenticationConfigTest {
+
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    @Test
+    void testValidConfigWithClientIdAndSecret() throws JsonProcessingException {
+        Map<String, Object> yamlConfig = new HashMap<>();
+        yamlConfig.put("client_id", "dummy-client-id");
+        yamlConfig.put("client_secret", "dummy-client-secret");
+
+        String json = objectMapper.writeValueAsString(yamlConfig);
+        AuthenticationConfig loadedConfig = objectMapper.readValue(json, AuthenticationConfig.class);
+
+        assertNotNull(loadedConfig.getClientId());
+        assertEquals("dummy-client-id", loadedConfig.getClientId());
+        assertEquals("dummy-client-secret", loadedConfig.getClientSecret());
+        assertTrue(loadedConfig.isValidConfig(), "Expected config to be valid when both clientId and clientSecret are set");
+    }
+
+    @Test
+    void testInvalidConfigWithMissingClientId() throws JsonProcessingException {
+        Map<String, Object> yamlConfig = new HashMap<>();
+        yamlConfig.put("client_id", "dummy-client-id");
+        String json = objectMapper.writeValueAsString(yamlConfig);
+        AuthenticationConfig loadedConfig = objectMapper.readValue(json, AuthenticationConfig.class);
+        assertFalse(loadedConfig.isValidConfig(), "Expected config to be invalid when clientId is missing");
+    }
+
+
+    @Test
+    void testInvalidConfigWithNoCredentials() {
+        AuthenticationConfig config = new AuthenticationConfig();
+        assertFalse(config.isValidConfig(), "Expected config to be invalid when both clientId and clientSecret are missing");
+    }
 }