Remove direct reference to Job-Scheduler Lock Index in SAP repo (#1577)

* Remove direct reference to Job-Scheduler Lock Index in SAP repo

Signed-off-by: Craig Perkins <[email protected]>

* Exclude error_prone_annotations from locally checked in shadow jar for commons

Signed-off-by: Craig Perkins <[email protected]>

* Include apache httpcomponents

Signed-off-by: Craig Perkins <[email protected]>

---------

Signed-off-by: Craig Perkins <[email protected]>

Author: cwperks

security-analytics-commons-1.0.0.jar

@@ -724,19 +724,12 @@ private void deleteAllIocsAndSourceConfig(ActionListener<DeleteResponse> listene
                                             saTifSourceConfigService.deleteAllIocIndices(concreteIndices, false, ActionListener.wrap(
                                                     r -> {
                                                         log.debug("Successfully deleted all ioc indices");
-                                                        saTifSourceConfigService.deleteJobSchedulerLockIfJobDisabled(updateSaTifSourceConfigResponse, ActionListener.wrap(
-                                                                deleteLockResponse -> {
-                                                                    saTifSourceConfigService.deleteTIFSourceConfig(updateSaTifSourceConfigResponse, ActionListener.wrap(
-                                                                            deleteResponse -> {
-                                                                                log.debug("Successfully deleted threat intel source config [{}]", updateSaTifSourceConfigResponse.getId());
-                                                                                listener.onResponse(deleteResponse);
-                                                                            }, e -> {
-                                                                                log.error("Failed to delete threat intel source config [{}]", saTifSourceConfig.getId());
-                                                                                listener.onFailure(e);
-                                                                            }
-                                                                    ));
+                                                        saTifSourceConfigService.deleteTIFSourceConfig(updateSaTifSourceConfigResponse, ActionListener.wrap(
+                                                                deleteResponse -> {
+                                                                    log.debug("Successfully deleted threat intel source config [{}]", updateSaTifSourceConfigResponse.getId());
+                                                                    listener.onResponse(deleteResponse);
                                                                 }, e -> {
-                                                                    log.error("Failed to delete threat intel job scheduler lock [{}]", saTifSourceConfig.getId());
+                                                                    log.error("Failed to delete threat intel source config [{}]", saTifSourceConfig.getId());
                                                                     listener.onFailure(e);
                                                                 }
                                                         ));

src/main/java/org/opensearch/securityanalytics/threatIntel/service/SATIFSourceConfigManagementService.java

@@ -71,7 +71,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static org.opensearch.jobscheduler.spi.utils.LockService.LOCK_INDEX_NAME;
 import static org.opensearch.securityanalytics.settings.SecurityAnalyticsSettings.INDEX_TIMEOUT;
 import static org.opensearch.securityanalytics.threatIntel.common.TIFJobState.AVAILABLE;
 import static org.opensearch.securityanalytics.threatIntel.common.TIFJobState.REFRESHING;
@@ -419,45 +418,6 @@ public void deleteTIFSourceConfig(
         ));
     }
 
-    // Manually delete threat intel job scheduler lock if job is disabled
-    public void deleteJobSchedulerLockIfJobDisabled(
-            SATIFSourceConfig saTifSourceConfig,
-            final ActionListener<DeleteResponse> actionListener
-    ) {
-        if (saTifSourceConfig.isEnabled()) {
-            actionListener.onResponse(null);
-            return;
-        }
-
-        // check to make sure the job scheduler lock index exists
-        if (clusterService.state().metadata().hasIndex(LOCK_INDEX_NAME) == false) {
-            actionListener.onResponse(null);
-            return;
-        }
-
-        String id = SecurityAnalyticsPlugin.JOB_INDEX_NAME + "-" + saTifSourceConfig.getId();
-        DeleteRequest request = new DeleteRequest(LOCK_INDEX_NAME, id)
-                .setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
-                .timeout(clusterSettings.get(INDEX_TIMEOUT));
-
-        client.delete(request, ActionListener.wrap(
-                deleteResponse -> {
-                    if (deleteResponse.status().equals(RestStatus.OK)) {
-                        log.info("Deleted threat intel job scheduler lock [{}] successfully", id);
-                        actionListener.onResponse(deleteResponse);
-                    } else if (deleteResponse.status().equals(RestStatus.NOT_FOUND)) {
-                        log.info("Threat intel job scheduler lock with id [{}] not found", id);
-                        actionListener.onResponse(deleteResponse);
-                    } else {
-                        actionListener.onFailure(SecurityAnalyticsException.wrap(new OpenSearchStatusException(String.format(Locale.ROOT, "Failed to delete threat intel job scheduler lock with id [{%s}]", id), deleteResponse.status())));
-                    }
-                }, e -> {
-                    log.error("Failed to delete threat intel job scheduler lock with id [{}]", id);
-                    actionListener.onFailure(e);
-                }
-        ));
-    }
-
     public void deleteAllIocIndices(Set<String> indicesToDelete, Boolean backgroundJob, ActionListener<AcknowledgedResponse> listener) {
         if (indicesToDelete.isEmpty() == false) {
             DeleteIndexRequest deleteIndexRequest = new DeleteIndexRequest(indicesToDelete.toArray(new String[0]));

src/main/java/org/opensearch/securityanalytics/threatIntel/service/SATIFSourceConfigService.java

@@ -42,7 +42,6 @@
 import java.util.Locale;
 import java.util.Map;
 
-import static org.opensearch.jobscheduler.spi.utils.LockService.LOCK_INDEX_NAME;
 import static org.opensearch.securityanalytics.SecurityAnalyticsPlugin.JOB_INDEX_NAME;
 import static org.opensearch.securityanalytics.TestHelpers.oldThreatIntelJobMapping;
 import static org.opensearch.securityanalytics.services.STIX2IOCFeedStore.IOC_ALL_INDEX_PATTERN;
@@ -732,10 +731,6 @@ public void testDeleteIocUploadSourceConfigAndAllIocs() throws IOException {
         // ensure all iocs are deleted
         hits = executeSearch(IOC_ALL_INDEX_PATTERN, request);
         Assert.assertEquals(0, hits.size());
-
-        // ensure that lock is deleted
-        hits = executeSearch(LOCK_INDEX_NAME,request);
-        Assert.assertEquals(0, hits.size());
     }
 
     public void testRefreshIocUploadSourceConfigFailure() throws IOException {