From 5094f04e90d2e617694430a390183dcb7e6ba82e Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Mon, 14 Aug 2023 14:09:16 -0400 Subject: [PATCH 1/2] Merge pull request #748 from derek-ho/insights fix from upstream import changes (cherry picked from commit c254aad4260c180dad2a8862359df8e2de1ae7f5) Signed-off-by: Derek Ho --- .../reportsscheduler/ReportsSchedulerPlugin.kt | 7 ++++++- .../reportsscheduler/action/PluginBaseAction.kt | 9 +++++++-- .../opensearch/reportsscheduler/model/BaseResponse.kt | 9 +++++++++ .../reportsscheduler/util/SecureIndexClient.kt | 6 +++--- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/org/opensearch/reportsscheduler/ReportsSchedulerPlugin.kt b/src/main/kotlin/org/opensearch/reportsscheduler/ReportsSchedulerPlugin.kt index e1d68fba..e6ce40d7 100644 --- a/src/main/kotlin/org/opensearch/reportsscheduler/ReportsSchedulerPlugin.kt +++ b/src/main/kotlin/org/opensearch/reportsscheduler/ReportsSchedulerPlugin.kt @@ -6,7 +6,6 @@ package org.opensearch.reportsscheduler import org.opensearch.action.ActionRequest -import org.opensearch.action.ActionResponse import org.opensearch.client.Client import org.opensearch.cluster.metadata.IndexNameExpressionResolver import org.opensearch.cluster.node.DiscoveryNodes @@ -17,7 +16,13 @@ import org.opensearch.common.settings.IndexScopedSettings import org.opensearch.common.settings.Setting import org.opensearch.common.settings.Settings import org.opensearch.common.settings.SettingsFilter +<<<<<<< HEAD import org.opensearch.common.xcontent.NamedXContentRegistry +======= +import org.opensearch.core.action.ActionResponse +import org.opensearch.core.common.io.stream.NamedWriteableRegistry +import org.opensearch.core.xcontent.NamedXContentRegistry +>>>>>>> c254aad (Merge pull request #748 from derek-ho/insights) import org.opensearch.env.Environment import org.opensearch.env.NodeEnvironment import org.opensearch.jobscheduler.spi.JobSchedulerExtension diff --git a/src/main/kotlin/org/opensearch/reportsscheduler/action/PluginBaseAction.kt b/src/main/kotlin/org/opensearch/reportsscheduler/action/PluginBaseAction.kt index 1b56c97a..0e423b81 100644 --- a/src/main/kotlin/org/opensearch/reportsscheduler/action/PluginBaseAction.kt +++ b/src/main/kotlin/org/opensearch/reportsscheduler/action/PluginBaseAction.kt @@ -10,9 +10,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import org.opensearch.OpenSearchSecurityException import org.opensearch.OpenSearchStatusException -import org.opensearch.action.ActionListener import org.opensearch.action.ActionRequest -import org.opensearch.action.ActionResponse import org.opensearch.action.support.ActionFilters import org.opensearch.action.support.HandledTransportAction import org.opensearch.client.Client @@ -20,6 +18,13 @@ import org.opensearch.common.io.stream.Writeable import org.opensearch.common.util.concurrent.ThreadContext import org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT import org.opensearch.commons.authuser.User +<<<<<<< HEAD +======= +import org.opensearch.core.action.ActionListener +import org.opensearch.core.action.ActionResponse +import org.opensearch.core.common.io.stream.Writeable +import org.opensearch.core.rest.RestStatus +>>>>>>> c254aad (Merge pull request #748 from derek-ho/insights) import org.opensearch.index.IndexNotFoundException import org.opensearch.index.engine.VersionConflictEngineException import org.opensearch.indices.InvalidIndexNameException diff --git a/src/main/kotlin/org/opensearch/reportsscheduler/model/BaseResponse.kt b/src/main/kotlin/org/opensearch/reportsscheduler/model/BaseResponse.kt index 90e9c3ae..3fbf2f53 100644 --- a/src/main/kotlin/org/opensearch/reportsscheduler/model/BaseResponse.kt +++ b/src/main/kotlin/org/opensearch/reportsscheduler/model/BaseResponse.kt @@ -5,12 +5,21 @@ package org.opensearch.reportsscheduler.model +<<<<<<< HEAD import org.opensearch.action.ActionResponse import org.opensearch.common.xcontent.ToXContent import org.opensearch.common.xcontent.ToXContentObject import org.opensearch.common.xcontent.XContentBuilder import org.opensearch.common.xcontent.XContentFactory import org.opensearch.rest.RestStatus +======= +import org.opensearch.common.xcontent.XContentFactory +import org.opensearch.core.action.ActionResponse +import org.opensearch.core.rest.RestStatus +import org.opensearch.core.xcontent.ToXContent +import org.opensearch.core.xcontent.ToXContentObject +import org.opensearch.core.xcontent.XContentBuilder +>>>>>>> c254aad (Merge pull request #748 from derek-ho/insights) /** * Base response which give REST status. diff --git a/src/main/kotlin/org/opensearch/reportsscheduler/util/SecureIndexClient.kt b/src/main/kotlin/org/opensearch/reportsscheduler/util/SecureIndexClient.kt index f44e261a..daa100d3 100644 --- a/src/main/kotlin/org/opensearch/reportsscheduler/util/SecureIndexClient.kt +++ b/src/main/kotlin/org/opensearch/reportsscheduler/util/SecureIndexClient.kt @@ -5,10 +5,7 @@ package org.opensearch.reportsscheduler.util -import org.opensearch.action.ActionFuture -import org.opensearch.action.ActionListener import org.opensearch.action.ActionRequest -import org.opensearch.action.ActionResponse import org.opensearch.action.ActionType import org.opensearch.action.bulk.BulkRequest import org.opensearch.action.bulk.BulkResponse @@ -38,7 +35,10 @@ import org.opensearch.action.termvectors.TermVectorsResponse import org.opensearch.action.update.UpdateRequest import org.opensearch.action.update.UpdateResponse import org.opensearch.client.Client +import org.opensearch.common.action.ActionFuture import org.opensearch.common.util.concurrent.ThreadContext +import org.opensearch.core.action.ActionListener +import org.opensearch.core.action.ActionResponse /** * Wrapper class on [Client] with security context removed. From 0ecd23adcf8e748892bbee3de7437c60b74822cc Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 15 Aug 2023 14:46:53 -0400 Subject: [PATCH 2/2] Update PluginBaseAction.kt Remove duplicate import Signed-off-by: Derek Ho --- .../org/opensearch/reportsscheduler/action/PluginBaseAction.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/kotlin/org/opensearch/reportsscheduler/action/PluginBaseAction.kt b/src/main/kotlin/org/opensearch/reportsscheduler/action/PluginBaseAction.kt index 080fc4fe..a6486cbe 100644 --- a/src/main/kotlin/org/opensearch/reportsscheduler/action/PluginBaseAction.kt +++ b/src/main/kotlin/org/opensearch/reportsscheduler/action/PluginBaseAction.kt @@ -20,7 +20,6 @@ import org.opensearch.commons.authuser.User import org.opensearch.core.action.ActionListener import org.opensearch.core.action.ActionResponse import org.opensearch.core.common.io.stream.Writeable -import org.opensearch.core.common.io.stream.Writeable import org.opensearch.core.rest.RestStatus import org.opensearch.index.IndexNotFoundException import org.opensearch.index.engine.VersionConflictEngineException