Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added workflow execution logic #850

Merged
merged 8 commits into from
Apr 19, 2023
Merged

Added workflow execution logic #850

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
03ab36f
Added workflow execution logic
stevanbz Apr 4, 2023
a38ff87
Adjusted code according to comments
stevanbz Apr 7, 2023
b79e002
Updated version of the findings json
stevanbz Apr 10, 2023
35742fc
Updating the workflow metadata in the case of updating flag set to fa…
stevanbz Apr 10, 2023
e8d447a
Added logging for workflow metadata update
stevanbz Apr 10, 2023
9467ef2
Added Rest Execute Workflow action
stevanbz Apr 11, 2023
e418851
Extended workflow context with workflowMetadataId. Adjusted the doc l…
stevanbz Apr 12, 2023
b303435
Updated conditions for unstashing the context when indexing and delet…
stevanbz Apr 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportDeleteWorkflowAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,7 @@ class TransportDeleteWorkflowAction @Inject constructor(

val deleteResponse = deleteWorkflow(workflow)
if (deleteDelegateMonitors == true) {
if (user == null) {
deleteMonitors(delegateMonitorIds, RefreshPolicy.IMMEDIATE)
} else {
if (user != null && filterByEnabled) {
// Un-stash the context
withClosableContext(
InjectorContextElement(
Expand All @@ -167,6 +165,8 @@ class TransportDeleteWorkflowAction @Inject constructor(
) {
deleteMonitors(delegateMonitorIds, RefreshPolicy.IMMEDIATE)
}
} else {
deleteMonitors(delegateMonitorIds, RefreshPolicy.IMMEDIATE)
}
}
actionListener.onResponse(DeleteWorkflowResponse(deleteResponse.id, deleteResponse.version))
Expand Down
8 changes: 4 additions & 4 deletions alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportIndexWorkflowAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ class TransportIndexWorkflowAction @Inject constructor(
val searchSource = SearchSourceBuilder().query(query)
val searchRequest = SearchRequest(SCHEDULED_JOBS_INDEX).source(searchSource)

if (user != null && !isAdmin(user) && filterByEnabled) {
if (user != null && filterByEnabled) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we removing the !isAdmin(user) piece? Admin users bypass the filter by check.

addFilter(user, searchRequest.source(), "monitor.user.backend_roles.keyword")
}

Expand Down Expand Up @@ -647,9 +647,7 @@ class TransportIndexWorkflowAction @Inject constructor(
val indicesSearchRequest = SearchRequest().indices(*indices.toTypedArray())
.source(SearchSourceBuilder.searchSource().size(1).query(QueryBuilders.matchAllQuery()))

if (user == null) {
checkIndicesAccess(client, indicesSearchRequest, indices, actionListener)
} else {
if (user != null && filterByEnabled) {
// Unstash the context and check if user with specified roles has indices access
withClosableContext(
InjectorContextElement(
Expand All @@ -662,6 +660,8 @@ class TransportIndexWorkflowAction @Inject constructor(
) {
checkIndicesAccess(client, indicesSearchRequest, indices, actionListener)
}
} else {
checkIndicesAccess(client, indicesSearchRequest, indices, actionListener)
}
}

Expand Down