Skip to content

Commit 1215d04

Browse files
committed
Update AddPolicy
Signed-off-by: Craig Perkins <[email protected]>
1 parent 20e1ac6 commit 1215d04

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/addpolicy/TransportAddPolicyAction.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ import org.opensearch.indexmanagement.opensearchapi.withClosableContext
5858
import org.opensearch.indexmanagement.settings.IndexManagementSettings
5959
import org.opensearch.indexmanagement.spi.indexstatemanagement.model.ISMIndexMetadata
6060
import org.opensearch.indexmanagement.util.IndexUtils
61-
import org.opensearch.indexmanagement.util.PluginClient
6261
import org.opensearch.indexmanagement.util.SecurityUtils.Companion.buildUser
6362
import org.opensearch.indexmanagement.util.SecurityUtils.Companion.userHasPermissionForResource
6463
import org.opensearch.indexmanagement.util.SecurityUtils.Companion.validateUserConfiguration
6564
import org.opensearch.tasks.Task
6665
import org.opensearch.transport.TransportService
6766
import org.opensearch.transport.client.Client
67+
import org.opensearch.transport.client.node.NodeClient
6868
import java.time.Duration
6969
import java.time.Instant
7070

@@ -74,7 +74,7 @@ private val log = LogManager.getLogger(TransportAddPolicyAction::class.java)
7474
class TransportAddPolicyAction
7575
@Inject
7676
constructor(
77-
val client: PluginClient,
77+
val client: NodeClient,
7878
transportService: TransportService,
7979
actionFilters: ActionFilters,
8080
val settings: Settings,

src/main/kotlin/org/opensearch/indexmanagement/indexstatemanagement/transport/action/explain/TransportExplainAction.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,12 +388,11 @@ constructor(
388388
if (user == null || indexNames.isEmpty()) {
389389
sendResponse(indexNames, indexMetadatas, indexPolicyIDs, enabledState, totalManagedIndices, appliedPolicies, validationResults)
390390
} else {
391-
filterAndSendResponse(threadContext)
391+
filterAndSendResponse()
392392
}
393393
}
394394

395-
private fun filterAndSendResponse(threadContext: ThreadContext.StoredContext) {
396-
threadContext.restore()
395+
private fun filterAndSendResponse() {
397396
val filteredIndices = mutableListOf<String>()
398397
val filteredMetadata = mutableListOf<ManagedIndexMetaData?>()
399398
val filteredValidationResult = mutableListOf<ValidationResult?>()

src/main/resources/plugin-additional-permissions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ index_permissions:
99
allowed_actions:
1010
- "indices:data/read/search*"
1111
- "indices:admin/settings/update"
12-
- "indices:admin/opensearch/ism/managedindex"
12+
# - "indices:admin/opensearch/ism/managedindex"
1313
# - "indices:admin/delete"

0 commit comments

Comments
 (0)