From bb730c1b82ded7c7b2b208d859b39754c54ae5c1 Mon Sep 17 00:00:00 2001 From: Dan Cecoi Date: Fri, 3 May 2024 16:34:48 +0100 Subject: [PATCH 1/2] fix build errors caused by filterIndices method being moved from SnapshotUtils to IndexUtils (#4312) Signed-off-by: Dan Cecoi --- .../opensearch/security/resolver/IndexResolverReplacer.java | 4 ++-- .../opensearch/security/support/SnapshotRestoreHelper.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opensearch/security/resolver/IndexResolverReplacer.java b/src/main/java/org/opensearch/security/resolver/IndexResolverReplacer.java index d7aeb776c7..4a4e714348 100644 --- a/src/main/java/org/opensearch/security/resolver/IndexResolverReplacer.java +++ b/src/main/java/org/opensearch/security/resolver/IndexResolverReplacer.java @@ -82,6 +82,7 @@ import org.opensearch.cluster.metadata.IndexAbstraction; import org.opensearch.cluster.metadata.IndexNameExpressionResolver; import org.opensearch.cluster.service.ClusterService; +import org.opensearch.common.util.IndexUtils; import org.opensearch.core.index.Index; import org.opensearch.index.IndexNotFoundException; import org.opensearch.index.reindex.ReindexRequest; @@ -91,7 +92,6 @@ import org.opensearch.security.support.SnapshotRestoreHelper; import org.opensearch.security.support.WildcardMatcher; import org.opensearch.snapshots.SnapshotInfo; -import org.opensearch.snapshots.SnapshotUtils; import org.opensearch.transport.RemoteClusterService; import org.opensearch.transport.TransportRequest; @@ -694,7 +694,7 @@ private boolean getOrReplaceAllIndices(final Object request, final IndicesProvid ); provider.provide(new String[] { "*" }, request, false); } else { - final List requestedResolvedIndices = SnapshotUtils.filterIndices( + final List requestedResolvedIndices = IndexUtils.filterIndices( snapshotInfo.indices(), restoreRequest.indices(), restoreRequest.indicesOptions() diff --git a/src/main/java/org/opensearch/security/support/SnapshotRestoreHelper.java b/src/main/java/org/opensearch/security/support/SnapshotRestoreHelper.java index 2c85177c1e..b8f5d22e7c 100644 --- a/src/main/java/org/opensearch/security/support/SnapshotRestoreHelper.java +++ b/src/main/java/org/opensearch/security/support/SnapshotRestoreHelper.java @@ -37,12 +37,12 @@ import org.opensearch.SpecialPermission; import org.opensearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequest; import org.opensearch.action.support.PlainActionFuture; +import org.opensearch.common.util.IndexUtils; import org.opensearch.repositories.RepositoriesService; import org.opensearch.repositories.Repository; import org.opensearch.security.OpenSearchSecurityPlugin; import org.opensearch.snapshots.SnapshotId; import org.opensearch.snapshots.SnapshotInfo; -import org.opensearch.snapshots.SnapshotUtils; import org.opensearch.threadpool.ThreadPool; public class SnapshotRestoreHelper { @@ -56,7 +56,7 @@ public static List resolveOriginalIndices(RestoreSnapshotRequest restore log.warn("snapshot repository '{}', snapshot '{}' not found", restoreRequest.repository(), restoreRequest.snapshot()); return null; } else { - return SnapshotUtils.filterIndices(snapshotInfo.indices(), restoreRequest.indices(), restoreRequest.indicesOptions()); + return IndexUtils.filterIndices(snapshotInfo.indices(), restoreRequest.indices(), restoreRequest.indicesOptions()); } } From ed6c0735b5921c248b0f7d89ac7919ebd312b95f Mon Sep 17 00:00:00 2001 From: opensearch-ci-bot Date: Fri, 3 May 2024 00:07:48 +0000 Subject: [PATCH 2/2] Increment version to 2.15.0-SNAPSHOT Signed-off-by: opensearch-ci-bot --- .github/workflows/plugin_install.yml | 2 +- build.gradle | 2 +- bwc-test/build.gradle | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/plugin_install.yml b/.github/workflows/plugin_install.yml index e0e8c07557..b55d4c4ac0 100644 --- a/.github/workflows/plugin_install.yml +++ b/.github/workflows/plugin_install.yml @@ -3,7 +3,7 @@ name: Plugin Install on: [push, pull_request, workflow_dispatch] env: - OPENSEARCH_VERSION: 2.14.0 + OPENSEARCH_VERSION: 2.15.0 PLUGIN_NAME: opensearch-security jobs: diff --git a/build.gradle b/build.gradle index c1020c2106..a68d3b6695 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ import groovy.json.JsonBuilder buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "2.14.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "2.15.0-SNAPSHOT") isSnapshot = "true" == System.getProperty("build.snapshot", "true") buildVersionQualifier = System.getProperty("build.version_qualifier", "") diff --git a/bwc-test/build.gradle b/bwc-test/build.gradle index 53691432c8..a47daf6770 100644 --- a/bwc-test/build.gradle +++ b/bwc-test/build.gradle @@ -44,7 +44,7 @@ ext { buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "2.14.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "2.15.0-SNAPSHOT") opensearch_group = "org.opensearch" common_utils_version = System.getProperty("common_utils.version", '2.9.0.0-SNAPSHOT') jackson_version = System.getProperty("jackson_version", "2.15.2") @@ -83,7 +83,7 @@ testingConventions.enabled = false validateNebulaPom.enabled = false String previousVersion = System.getProperty("bwc.version.previous", "2.10.0.0") -String nextVersion = System.getProperty("bwc.version.next", "2.14.0.0") +String nextVersion = System.getProperty("bwc.version.next", "2.15.0.0") String bwcVersion = previousVersion String baseName = "securityBwcCluster"