Fix NPE in s3 scan partition supplier (#3317) (#3323)

Fix potential NPE in s3 scan partition supplier Signed-off-by: Taylor Gray <[email protected]> (cherry picked from commit f61338a) Co-authored-by: Taylor Gray <[email protected]>
opensearch-project · Sep 14, 2023 · 3cf8f40 · 3cf8f40
1 parent ad15f71
commit 3cf8f40
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.../main/java/org/opensearch/dataprepper/plugins/source/S3ScanPartitionCreationSupplier.java b/.../main/java/org/opensearch/dataprepper/plugins/source/S3ScanPartitionCreationSupplier.java
@@ -101,7 +101,7 @@ private List<PartitionIdentifier> listFilteredS3ObjectsForBucket(final List<Stri
                                                                      final LocalDateTime endDateTime,
                                                                      final Map<String, Object> globalStateMap) {
 
-        Instant mostRecentLastModifiedTimestamp = globalStateMap.containsKey(bucket) ? Instant.parse((String) globalStateMap.get(bucket)) : null;
+        Instant mostRecentLastModifiedTimestamp = globalStateMap.get(bucket) != null ? Instant.parse((String) globalStateMap.get(bucket)) : null;
         final List<PartitionIdentifier> allPartitionIdentifiers = new ArrayList<>();
         ListObjectsV2Response listObjectsV2Response = null;
         do {

diff --git a/...t/java/org/opensearch/dataprepper/plugins/source/S3ScanPartitionCreationSupplierTest.java b/...t/java/org/opensearch/dataprepper/plugins/source/S3ScanPartitionCreationSupplierTest.java
@@ -147,6 +147,8 @@ void getNextPartition_supplier_without_scheduling_options_returns_expected_Parti
         assertThat(globalStateMap.containsKey(SCAN_COUNT), equalTo(true));
         assertThat(globalStateMap.get(SCAN_COUNT), equalTo(1));
 
+        globalStateMap.put(secondBucket, null);
+
         assertThat(partitionCreationSupplier.apply(globalStateMap), equalTo(Collections.emptyList()));
 
         assertThat(resultingPartitions, notNullValue());