From 8c157b68b13f8407992feab669fdfbb839d0557a Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Mon, 14 Aug 2023 13:22:44 -0400 Subject: [PATCH 1/2] fix from upstream Signed-off-by: Derek Ho --- .../org/opensearch/observability/ObservabilityPlugin.kt | 2 +- .../org/opensearch/observability/action/PluginBaseAction.kt | 4 ++-- .../org/opensearch/observability/model/BaseResponse.kt | 2 +- .../org/opensearch/observability/util/SecureIndexClient.kt | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/org/opensearch/observability/ObservabilityPlugin.kt b/src/main/kotlin/org/opensearch/observability/ObservabilityPlugin.kt index bd82b5ee9..c6a30c81e 100644 --- a/src/main/kotlin/org/opensearch/observability/ObservabilityPlugin.kt +++ b/src/main/kotlin/org/opensearch/observability/ObservabilityPlugin.kt @@ -5,7 +5,6 @@ package org.opensearch.observability 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 @@ -15,6 +14,7 @@ import org.opensearch.common.settings.IndexScopedSettings import org.opensearch.common.settings.Setting import org.opensearch.common.settings.Settings import org.opensearch.common.settings.SettingsFilter +import org.opensearch.core.action.ActionResponse import org.opensearch.core.common.io.stream.NamedWriteableRegistry import org.opensearch.core.xcontent.NamedXContentRegistry import org.opensearch.env.Environment diff --git a/src/main/kotlin/org/opensearch/observability/action/PluginBaseAction.kt b/src/main/kotlin/org/opensearch/observability/action/PluginBaseAction.kt index b7694c174..68e39ab2a 100644 --- a/src/main/kotlin/org/opensearch/observability/action/PluginBaseAction.kt +++ b/src/main/kotlin/org/opensearch/observability/action/PluginBaseAction.kt @@ -10,14 +10,14 @@ 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 import org.opensearch.commons.ConfigConstants.OPENSEARCH_SECURITY_USER_INFO_THREAD_CONTEXT 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.rest.RestStatus import org.opensearch.index.IndexNotFoundException diff --git a/src/main/kotlin/org/opensearch/observability/model/BaseResponse.kt b/src/main/kotlin/org/opensearch/observability/model/BaseResponse.kt index af0ccc8d6..7087c8791 100644 --- a/src/main/kotlin/org/opensearch/observability/model/BaseResponse.kt +++ b/src/main/kotlin/org/opensearch/observability/model/BaseResponse.kt @@ -5,8 +5,8 @@ package org.opensearch.observability.model -import org.opensearch.action.ActionResponse import org.opensearch.common.xcontent.XContentFactory +import org.opensearch.core.action.ActionResponse import org.opensearch.core.common.io.stream.StreamInput import org.opensearch.core.rest.RestStatus import org.opensearch.core.xcontent.ToXContent diff --git a/src/main/kotlin/org/opensearch/observability/util/SecureIndexClient.kt b/src/main/kotlin/org/opensearch/observability/util/SecureIndexClient.kt index bfd7f1f8b..78d308520 100644 --- a/src/main/kotlin/org/opensearch/observability/util/SecureIndexClient.kt +++ b/src/main/kotlin/org/opensearch/observability/util/SecureIndexClient.kt @@ -5,10 +5,7 @@ package org.opensearch.observability.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 02f3a886a9ebfd38aad1d00617399a8a0ce9d130 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 15 Aug 2023 11:28:58 -0400 Subject: [PATCH 2/2] pull latest snaphost Signed-off-by: Derek Ho --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 23101a36b..cabe84e1d 100644 --- a/build.gradle +++ b/build.gradle @@ -313,12 +313,13 @@ String bwcObservabilityPlugin = "opensearch-observability-" + bwcVersion + ".zip String bwcJobSchedulerPlugin = "opensearch-job-scheduler-" + bwcVersion + ".zip" String remoteFileURL = "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-observability&v=$bwcVersion-SNAPSHOT&p=zip" String bwcJobSchedulerURL = "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=$bwcVersion-SNAPSHOT&p=zip" +String bwcSnapshotVersion = baseVersion + "-SNAPSHOT" 2.times {i -> testClusters { "${baseName}$i" { testDistribution = "ARCHIVE" - versions = [baseVersion,opensearch_version] + versions = [bwcSnapshotVersion,opensearch_version] numberOfNodes = 3 plugin(provider(new Callable(){ @Override