Skip to content

Commit

Permalink
renamed source config dao to service and service to management service (
Browse files Browse the repository at this point in the history
opensearch-project#1052)

Signed-off-by: Joanne Wang <jowg@amazon.com>
  • Loading branch information
jowg-amazon committed Jun 4, 2024
1 parent 4fc0d84 commit cf2c051
Show file tree
Hide file tree
Showing 7 changed files with 316 additions and 320 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@
import org.opensearch.securityanalytics.resthandler.*;
import org.opensearch.securityanalytics.threatIntel.action.SAGetTIFSourceConfigAction;
import org.opensearch.securityanalytics.threatIntel.action.SAIndexTIFSourceConfigAction;
import org.opensearch.securityanalytics.threatIntel.dao.SATIFSourceConfigDao;
import org.opensearch.securityanalytics.threatIntel.service.SATIFSourceConfigService;
import org.opensearch.securityanalytics.threatIntel.model.SATIFSourceConfig;
import org.opensearch.securityanalytics.threatIntel.resthandler.RestGetTIFSourceConfigAction;
import org.opensearch.securityanalytics.threatIntel.resthandler.RestIndexTIFSourceConfigAction;
import org.opensearch.securityanalytics.threatIntel.service.DetectorThreatIntelService;
import org.opensearch.securityanalytics.threatIntel.service.SATIFSourceConfigService;
import org.opensearch.securityanalytics.threatIntel.service.SATIFSourceConfigManagementService;
import org.opensearch.securityanalytics.threatIntel.service.ThreatIntelFeedDataService;
import org.opensearch.securityanalytics.threatIntel.action.PutTIFJobAction;
import org.opensearch.securityanalytics.threatIntel.transport.TransportGetTIFSourceConfigAction;
Expand Down Expand Up @@ -154,7 +154,7 @@ public class SecurityAnalyticsPlugin extends Plugin implements ActionPlugin, Map

private LogTypeService logTypeService;

private SATIFSourceConfigDao SaTifSourceConfigDao;
private SATIFSourceConfigService SaTifSourceConfigService;

@Override
public Collection<SystemIndexDescriptor> getSystemIndexDescriptors(Settings settings){
Expand Down Expand Up @@ -192,16 +192,16 @@ public Collection<Object> createComponents(Client client,
TIFJobParameterService tifJobParameterService = new TIFJobParameterService(client, clusterService);
TIFJobUpdateService tifJobUpdateService = new TIFJobUpdateService(clusterService, tifJobParameterService, threatIntelFeedDataService, builtInTIFMetadataLoader);
TIFLockService threatIntelLockService = new TIFLockService(clusterService, client);
SaTifSourceConfigDao = new SATIFSourceConfigDao(client, clusterService, threadPool, xContentRegistry, threatIntelLockService);
SATIFSourceConfigService SaTifSourceConfigService = new SATIFSourceConfigService(SaTifSourceConfigDao, threatIntelLockService);
SaTifSourceConfigService = new SATIFSourceConfigService(client, clusterService, threadPool, xContentRegistry, threatIntelLockService);
SATIFSourceConfigManagementService SaTifSourceConfigManagementService = new SATIFSourceConfigManagementService(SaTifSourceConfigService, threatIntelLockService);


TIFJobRunner.getJobRunnerInstance().initialize(clusterService, tifJobUpdateService, tifJobParameterService, threatIntelLockService, threadPool, detectorThreatIntelService);

return List.of(
detectorIndices, correlationIndices, correlationRuleIndices, ruleTopicIndices, customLogTypeIndices, ruleIndices,
mapperService, indexTemplateManager, builtinLogTypeLoader, builtInTIFMetadataLoader, threatIntelFeedDataService, detectorThreatIntelService,
tifJobUpdateService, tifJobParameterService, threatIntelLockService, SaTifSourceConfigDao, SaTifSourceConfigService);
tifJobUpdateService, tifJobParameterService, threatIntelLockService, SaTifSourceConfigService, SaTifSourceConfigManagementService);
}

@Override
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.opensearch.securityanalytics.threatIntel.sacommons;

import org.opensearch.core.action.ActionListener;
public abstract class TIFSourceConfigService {
public abstract class TIFSourceConfigManagementService {
IndexTIFSourceConfigResponse indexTIFConfig(IndexTIFSourceConfigRequest request, ActionListener <IndexTIFSourceConfigResponse> listener){
return null;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
package org.opensearch.securityanalytics.threatIntel.service;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.opensearch.common.inject.Inject;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.core.action.ActionListener;
import org.opensearch.jobscheduler.spi.LockModel;
import org.opensearch.securityanalytics.threatIntel.common.TIFJobState;
import org.opensearch.securityanalytics.threatIntel.common.TIFLockService;
import org.opensearch.securityanalytics.threatIntel.model.SATIFSourceConfig;
import org.opensearch.securityanalytics.threatIntel.model.SATIFSourceConfigDto;

/**
* Service class for threat intel feed source config object
*/
public class SATIFSourceConfigManagementService {
private static final Logger log = LogManager.getLogger(SATIFSourceConfigManagementService.class);
private final SATIFSourceConfigService SaTifSourceConfigService;
private final TIFLockService lockService;

/**
* Default constructor
* @param SaTifSourceConfigService the tif source config dao
* @param lockService the lock service
*/
@Inject
public SATIFSourceConfigManagementService(
final SATIFSourceConfigService SaTifSourceConfigService,
final TIFLockService lockService
) {
this.SaTifSourceConfigService = SaTifSourceConfigService;
this.lockService = lockService;
}

/**
*
* Creates the job index if it doesn't exist and indexes the tif source config object
*
* @param SaTifSourceConfigDto the tif source config dto
* @param lock the lock object
* @param indexTimeout the index time out
* @param listener listener that accepts a tif source config if successful
*/
public void createIndexAndSaveTIFSourceConfig(
final SATIFSourceConfigDto SaTifSourceConfigDto,
final LockModel lock,
final TimeValue indexTimeout,
final ActionListener<SATIFSourceConfig> listener
) {
try {
SATIFSourceConfig SaTifSourceConfig = convertToSATIFConfig(SaTifSourceConfigDto);
SaTifSourceConfig.setState(TIFJobState.AVAILABLE);
SaTifSourceConfigService.indexTIFSourceConfig(SaTifSourceConfig, indexTimeout, lock, new ActionListener<>() {
@Override
public void onResponse(SATIFSourceConfig response) {
SaTifSourceConfig.setId(response.getId());
SaTifSourceConfig.setVersion(response.getVersion());
listener.onResponse(SaTifSourceConfig);
}
@Override
public void onFailure(Exception e) {
listener.onFailure(e);
}
});
} catch (Exception e) {
listener.onFailure(e);
}
}

public void getTIFSourceConfig(
final String SaTifSourceConfigId,
final Long version,
final ActionListener<SATIFSourceConfig> listener
) {
try {
SaTifSourceConfigService.getTIFSourceConfig(SaTifSourceConfigId, version, new ActionListener<>() {
@Override
public void onResponse(SATIFSourceConfig SaTifSourceConfig) {
listener.onResponse(SaTifSourceConfig);
}
@Override
public void onFailure(Exception e) {
listener.onFailure(e);
}
});
} catch (Exception e) {
listener.onFailure(e);
}
}

/**
* Converts the DTO to entity
* @param SaTifSourceConfigDto
* @return SaTifSourceConfig
*/
public SATIFSourceConfig convertToSATIFConfig(SATIFSourceConfigDto SaTifSourceConfigDto) {
return new SATIFSourceConfig(
SaTifSourceConfigDto.getId(),
SaTifSourceConfigDto.getVersion(),
SaTifSourceConfigDto.getName(),
SaTifSourceConfigDto.getFeedFormat(),
SaTifSourceConfigDto.getFeedType(),
SaTifSourceConfigDto.getCreatedByUser(),
SaTifSourceConfigDto.getCreatedAt(),
SaTifSourceConfigDto.getEnabledTime(),
SaTifSourceConfigDto.getLastUpdateTime(),
SaTifSourceConfigDto.getSchedule(),
SaTifSourceConfigDto.getState(),
SaTifSourceConfigDto.getRefreshType(),
SaTifSourceConfigDto.getLastRefreshedTime(),
SaTifSourceConfigDto.getLastRefreshedUser(),
SaTifSourceConfigDto.isEnabled(),
SaTifSourceConfigDto.getIocMapStore(),
SaTifSourceConfigDto.getIocTypes()
);
}

}
Loading

0 comments on commit cf2c051

Please sign in to comment.