Merge branch 'main' into rw/search-replica-alloc-filter

vinaykpud · vinaykpud · commit 7d5ab5a41f91 · 2025-03-12T12:04:36.000-07:00
Signed-off-by: Vinay Krishna Pudyodu &lt;vinkrish.neo@gmail.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `net.minidev:json-smart` from 2.5.1 to 2.5.2 ([#17378](https://github.com/opensearch-project/OpenSearch/pull/17378))
 - Bump `com.netflix.nebula.ospackage-base` from 11.10.1 to 11.11.1 ([#17374](https://github.com/opensearch-project/OpenSearch/pull/17374))
 - Bump `software.amazon.awssdk` from 2.20.86 to 2.30.31 ([17396](https://github.com/opensearch-project/OpenSearch/pull/17396))
+- Bump `org.jruby.jcodings:jcodings` from 1.0.61 to 1.0.63 ([#17560](https://github.com/opensearch-project/OpenSearch/pull/17560))
+- Bump `com.azure:azure-storage-blob` from 12.28.1 to 12.29.1 ([#17562](https://github.com/opensearch-project/OpenSearch/pull/17562))
 
 ### Changed
 - Convert transport-reactor-netty4 to use gradle version catalog [#17233](https://github.com/opensearch-project/OpenSearch/pull/17233)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -28,6 +28,7 @@ google_auth       = "1.29.0"
 tdigest           = "3.3"
 hdrhistogram      = "2.2.2"
 grpc              = "1.68.2"
+json_smart        = "2.5.2"
 
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 jna               = "5.13.0"
diff --git a/libs/grok/build.gradle b/libs/grok/build.gradle
@@ -31,7 +31,7 @@
 dependencies {
   api 'org.jruby.joni:joni:2.2.3'
   // joni dependencies:
-  api 'org.jruby.jcodings:jcodings:1.0.61'
+  api 'org.jruby.jcodings:jcodings:1.0.63'
 
   testImplementation(project(":test:framework")) {
     exclude group: 'org.opensearch', module: 'opensearch-grok'
diff --git a/libs/grok/licenses/jcodings-1.0.61.jar.sha1 b/libs/grok/licenses/jcodings-1.0.61.jar.sha1
diff --git a/libs/grok/licenses/jcodings-1.0.63.jar.sha1 b/libs/grok/licenses/jcodings-1.0.63.jar.sha1
@@ -0,0 +1 @@
+b8c386790e72f0bad666c8f1a8af12d0528992e0
diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle
@@ -56,7 +56,7 @@ dependencies {
   api "io.netty:netty-resolver-dns:${versions.netty}"
   api "io.netty:netty-transport-native-unix-common:${versions.netty}"
   implementation project(':modules:transport-netty4')
-  api 'com.azure:azure-storage-blob:12.28.1'
+  api 'com.azure:azure-storage-blob:12.29.1'
   api 'com.azure:azure-identity:1.14.2'
   // Start of transitive dependencies for azure-identity
   api 'com.microsoft.azure:msal4j-persistence-extension:1.3.0'
@@ -67,9 +67,9 @@ dependencies {
   api 'com.nimbusds:content-type:2.3'
   api 'com.nimbusds:lang-tag:1.7'
   // Both msal4j:1.14.3 and oauth2-oidc-sdk:11.9.1 has compile dependency on different versions of json-smart,
-  // selected the higher version which is 2.5.0
-  api 'net.minidev:json-smart:2.5.1'
-  api 'net.minidev:accessors-smart:2.5.1'
+  // selected the higher version
+  api "net.minidev:json-smart:${versions.json_smart}"
+  api "net.minidev:accessors-smart:${versions.json_smart}"
   api "org.ow2.asm:asm:${versions.asm}"
   // End of transitive dependencies for azure-identity
   api "io.projectreactor.netty:reactor-netty-core:${versions.reactor_netty}"
diff --git a/plugins/repository-azure/licenses/accessors-smart-2.5.1.jar.sha1 b/plugins/repository-azure/licenses/accessors-smart-2.5.1.jar.sha1
diff --git a/plugins/repository-azure/licenses/accessors-smart-2.5.2.jar.sha1 b/plugins/repository-azure/licenses/accessors-smart-2.5.2.jar.sha1
@@ -0,0 +1 @@
+ce16fd235cfee48e67eda33e684423bba09f7d07
diff --git a/plugins/repository-azure/licenses/azure-storage-blob-12.28.1.jar.sha1 b/plugins/repository-azure/licenses/azure-storage-blob-12.28.1.jar.sha1
diff --git a/plugins/repository-azure/licenses/azure-storage-blob-12.29.1.jar.sha1 b/plugins/repository-azure/licenses/azure-storage-blob-12.29.1.jar.sha1
@@ -0,0 +1 @@
+bf6845feeee7e47da636afcfa28f3affbf1fede5
diff --git a/plugins/repository-azure/licenses/json-smart-2.5.1.jar.sha1 b/plugins/repository-azure/licenses/json-smart-2.5.1.jar.sha1
diff --git a/plugins/repository-azure/licenses/json-smart-2.5.2.jar.sha1 b/plugins/repository-azure/licenses/json-smart-2.5.2.jar.sha1
@@ -0,0 +1 @@
+95d166b18f95907be0f46cdb9e1c0695eed03387
diff --git a/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureStorageServiceTests.java b/plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureStorageServiceTests.java
@@ -33,9 +33,9 @@
 package org.opensearch.repositories.azure;
 
 import com.azure.core.http.policy.HttpPipelinePolicy;
-import com.azure.identity.CredentialUnavailableException;
 import com.azure.storage.blob.BlobServiceClient;
 import com.azure.storage.common.policy.RequestRetryPolicy;
+import com.microsoft.aad.msal4j.MsalServiceException;
 import org.opensearch.common.settings.MockSecureSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.common.settings.SettingsException;
@@ -61,6 +61,7 @@
 import reactor.netty.http.HttpResources;
 
 import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.emptyString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
@@ -202,10 +203,9 @@ public void testClientUsingManagedIdentity() throws IOException {
                 final BlobServiceClient client1 = azureStorageService.client("azure1").v1();
 
                 // Expect the client to use managed identity for authentication, and it should fail because managed identity environment is
-                // not
-                // setup in the test
-                final CredentialUnavailableException e = expectThrows(CredentialUnavailableException.class, () -> client1.getAccountInfo());
-                assertThat(e.getMessage(), is("Managed Identity authentication is not available."));
+                // not setup in the test
+                final MsalServiceException e = expectThrows(MsalServiceException.class, () -> client1.getAccountInfo());
+                assertThat(e.getMessage(), containsString("HttpStatusCode: 401"));
             }
         }
     }
diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle
@@ -81,7 +81,7 @@ dependencies {
   api 'javax.servlet:servlet-api:2.5'
   api "org.slf4j:slf4j-api:${versions.slf4j}"
   api "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
-  api 'net.minidev:json-smart:2.5.2'
+  api "net.minidev:json-smart:${versions.json_smart}"
   api "io.netty:netty-all:${versions.netty}"
   implementation "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}"
   implementation 'org.codehaus.woodstox:stax2-api:4.2.2'
diff --git a/server/src/main/java/org/opensearch/common/util/ByteArrayBackedBitset.java b/server/src/main/java/org/opensearch/common/util/ByteArrayBackedBitset.java
@@ -31,11 +31,7 @@ public ByteArrayBackedBitset(int capacity) {
      */
     public ByteArrayBackedBitset(RandomAccessInput in, long offset, int length) throws IOException {
         byteArray = new byte[length];
-        int i = 0;
-        while (i < length) {
-            byteArray[i] = in.readByte(offset + i);
-            i++;
-        }
+        in.readBytes(offset, byteArray, 0, length);
     }
 
     /**
diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle
@@ -65,7 +65,7 @@ dependencies {
   api "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:${versions.jackson}"
   api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}"
   api "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}"
-  api 'net.minidev:json-smart:2.5.2'
+  api "net.minidev:json-smart:${versions.json_smart}"
   api "org.mockito:mockito-core:${versions.mockito}"
   api "com.google.protobuf:protobuf-java:${versions.protobuf}"
   api "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}"
diff --git a/test/framework/licenses/bcutil-jdk18on-1.78.jar.sha1 b/test/framework/licenses/bcutil-jdk18on-1.78.jar.sha1
@@ -0,0 +1 @@
+81c1f5e06f206be5dad137d563609dbe66c81d31
diff --git a/test/framework/licenses/byte-buddy-1.15.10.jar.sha1 b/test/framework/licenses/byte-buddy-1.15.10.jar.sha1
@@ -0,0 +1 @@
+635c873fadd853c084f84fdc3cbd58c5dd8537f9
diff --git a/test/framework/licenses/commons-codec-1.16.1.jar.sha1 b/test/framework/licenses/commons-codec-1.16.1.jar.sha1
@@ -0,0 +1 @@
+47bd4d333fba53406f6c6c51884ddbca435c8862
diff --git a/test/framework/licenses/commons-logging-1.2.jar.sha1 b/test/framework/licenses/commons-logging-1.2.jar.sha1
@@ -0,0 +1 @@
+4bfc12adfe4842bf07b657f0369c4cb522955686
diff --git a/test/framework/licenses/hamcrest-2.1.jar.sha1 b/test/framework/licenses/hamcrest-2.1.jar.sha1
@@ -0,0 +1 @@
+9420ba32c29217b54eebd26ff7f9234d31c3fbb2
diff --git a/test/framework/licenses/junit-4.13.2.jar.sha1 b/test/framework/licenses/junit-4.13.2.jar.sha1
@@ -0,0 +1 @@
+8ac9e16d933b6fb43bc7f576336b8f4d7eb5ba12
diff --git a/test/framework/licenses/lucene-codecs-10.1.0.jar.sha1 b/test/framework/licenses/lucene-codecs-10.1.0.jar.sha1
@@ -0,0 +1 @@
+c8c5a67a9718b24fc2e0fe958db3404254af628e
diff --git a/test/framework/licenses/lucene-test-framework-10.1.0.jar.sha1 b/test/framework/licenses/lucene-test-framework-10.1.0.jar.sha1
@@ -0,0 +1 @@
+1985bbbb74c358d2e2477eb467b867fc5a8d0e25
diff --git a/test/framework/licenses/mockito-core-5.14.2.jar.sha1 b/test/framework/licenses/mockito-core-5.14.2.jar.sha1
@@ -0,0 +1 @@
+f7bf936008d7664e2002c3faf0c02071c8d10e7c
diff --git a/test/framework/licenses/objenesis-3.3.jar.sha1 b/test/framework/licenses/objenesis-3.3.jar.sha1
@@ -0,0 +1 @@
+1049c09f1de4331e8193e579448d0916d75b7631
diff --git a/test/framework/licenses/randomizedtesting-runner-2.7.1.jar.sha1 b/test/framework/licenses/randomizedtesting-runner-2.7.1.jar.sha1
@@ -0,0 +1 @@
+e917f4983144c3b969eb7d3648338ecde5e3ba89

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+b8c386790e72f0bad666c8f1a8af12d0528992e0`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+ce16fd235cfee48e67eda33e684423bba09f7d07`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+bf6845feeee7e47da636afcfa28f3affbf1fede5`