Skip to content

Commit 2ee8715

Browse files
committed
solution to fix integ tests
1 parent bcaa4e3 commit 2ee8715

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

alerting/src/main/kotlin/org/opensearch/alerting/resthandler/RestGetFindingsAction.kt

+1-5
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ class RestGetFindingsAction : BaseRestHandler() {
4545
val size = request.paramAsInt("size", 20)
4646
val startIndex = request.paramAsInt("startIndex", 0)
4747
val searchString = request.param("searchString", "")
48-
val severity: String? = request.param("severity", "ALL")
49-
val detectionType: String? = request.param("detectionType", "rules")
5048

5149
val table = Table(
5250
sortOrder,
@@ -59,9 +57,7 @@ class RestGetFindingsAction : BaseRestHandler() {
5957

6058
val getFindingsSearchRequest = GetFindingsRequest(
6159
findingID,
62-
table,
63-
severity,
64-
detectionType
60+
table
6561
)
6662
return RestChannelConsumer {
6763
channel ->

alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportGetFindingsAction.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ class TransportGetFindingsSearchAction @Inject constructor(
8282
val getFindingsRequest = request as? GetFindingsRequest
8383
?: recreateObject(request) { GetFindingsRequest(it) }
8484
val tableProp = getFindingsRequest.table
85-
val severity = getFindingsRequest.severity
86-
val detectionType = getFindingsRequest.detectionType
8785
val searchString = tableProp.searchString
8886

8987
val sortBuilder = SortBuilders
@@ -125,7 +123,8 @@ class TransportGetFindingsSearchAction @Inject constructor(
125123
queryBuilder.filter(timeRangeQuery)
126124
}
127125

128-
if (!detectionType.isNullOrBlank()) {
126+
if (!getFindingsRequest.detectionType.isNullOrBlank()) {
127+
val detectionType = getFindingsRequest.detectionType
129128
val nestedQueryBuilder = QueryBuilders.nestedQuery(
130129
"queries",
131130
when {
@@ -161,7 +160,8 @@ class TransportGetFindingsSearchAction @Inject constructor(
161160
.minimumShouldMatch(1)
162161
}
163162

164-
if (!severity.isNullOrBlank()) {
163+
if (!getFindingsRequest.severity.isNullOrBlank()) {
164+
val severity = getFindingsRequest.severity
165165
queryBuilder
166166
.must(
167167
QueryBuilders.nestedQuery(

0 commit comments

Comments
 (0)