From 5290bb60ad6f940fe2fe29772dee1c21e9d94526 Mon Sep 17 00:00:00 2001 From: opensearch-ci-bot Date: Thu, 14 Aug 2025 00:10:27 +0000 Subject: [PATCH 1/3] Increment version to 3.3.0-SNAPSHOT Signed-off-by: opensearch-ci-bot --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b49b6ef7..8d3984d4 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ import org.opensearch.gradle.test.RestIntegTestTask buildscript { ext { isSnapshot = "true" == System.getProperty("build.snapshot", "true") - opensearch_version = System.getProperty("opensearch.version", "3.2.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "3.3.0-SNAPSHOT") buildVersionQualifier = System.getProperty("build.version_qualifier", "") // e.g. 2.0.0-rc1-SNAPSHOT -> 2.0.0.0-rc1-SNAPSHOT version_tokens = opensearch_version.tokenize('-') From 19fbb026b80dcac387fb9c8a21698ddbbfa67036 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 15 Aug 2025 13:52:44 -0400 Subject: [PATCH 2/3] Set testclustersDir Signed-off-by: Craig Perkins --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 8d3984d4..359e50f3 100644 --- a/build.gradle +++ b/build.gradle @@ -465,6 +465,7 @@ int endJmxPort = startJmxPort integTest { useCluster testClusters.leaderCluster useCluster testClusters.followCluster + systemProperty 'testclusters.dir', project.layout.buildDirectory.get().file("testclusters").asFile.absolutePath systemProperty "password", "admin" // setting it to `admin` explicitly since its a custom security setup if(knnEnabled){ From ae6d6f34e78f320888425e9fafec1d7b3feb2de3 Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 15 Aug 2025 21:41:42 -0400 Subject: [PATCH 3/3] Use proper constructor Signed-off-by: Craig Perkins --- src/main/kotlin/org/opensearch/replication/util/Extensions.kt | 2 +- .../kotlin/org/opensearch/replication/util/SecurityContext.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/org/opensearch/replication/util/Extensions.kt b/src/main/kotlin/org/opensearch/replication/util/Extensions.kt index df8986df..8fc060d4 100644 --- a/src/main/kotlin/org/opensearch/replication/util/Extensions.kt +++ b/src/main/kotlin/org/opensearch/replication/util/Extensions.kt @@ -207,7 +207,7 @@ fun User.overrideFgacRole(fgacRole: String?): User? { roles = listOf(fgacRole) } return User(this.name, this.backendRoles, roles, - this.customAttNames, this.requestedTenant) + mapOf(), this.requestedTenant) } fun User.toInjectedUser(): String? { diff --git a/src/main/kotlin/org/opensearch/replication/util/SecurityContext.kt b/src/main/kotlin/org/opensearch/replication/util/SecurityContext.kt index 4eb607fc..f43a121c 100644 --- a/src/main/kotlin/org/opensearch/replication/util/SecurityContext.kt +++ b/src/main/kotlin/org/opensearch/replication/util/SecurityContext.kt @@ -42,7 +42,7 @@ class SecurityContext { const val OPENDISTRO_SECURITY_INJECTED_ROLES_VALIDATION = "opendistro_security_injected_roles_validation" const val REPLICATION_PLUGIN_USER = "ccr_user" - val ADMIN_USER = User(REPLICATION_PLUGIN_USER, null, listOf("all_access"), null) + val ADMIN_USER = User(REPLICATION_PLUGIN_USER, null, listOf("all_access"), mapOf()) val ALL_TRANSIENTS = listOf(ConfigConstants.OPENSEARCH_SECURITY_INJECTED_ROLES, ConfigConstants.INJECTED_USER, OPENDISTRO_SECURITY_USER)