Merge branch 'opensearch-project:main' into lockManager

Author: harishbhakuni

CHANGELOG.md

@@ -42,6 +42,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `org.apache.commons:commons-compress` from 1.22 to 1.23.0
 - Bump `com.diffplug.spotless` from 6.17.0 to 6.18.0
 - Bump `io.opencensus:opencensus-api` from 0.18.0 to 0.31.1 ([#7291](https://github.com/opensearch-project/OpenSearch/pull/7291))
+- Bump `com.azure:azure-core` from 1.34.0 to 1.39.0
 
 ### Changed
 - [CCR] Add getHistoryOperationsFromTranslog method to fetch the history snapshot from translogs ([#3948](https://github.com/opensearch-project/OpenSearch/pull/3948))
@@ -99,6 +100,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `commons-io:commons-io` from 2.7 to 2.11.0
 - Bump `org.apache.shiro:shiro-core` from 1.9.1 to 1.11.0 ([#7397](https://github.com/opensearch-project/OpenSearch/pull/7397))
 - Bump `jetty-server` in hdfs-fixture from 9.4.49.v20220914 to 9.4.51.v20230217 ([#7405](https://github.com/opensearch-project/OpenSearch/pull/7405))
+- Bump `com.networknt:json-schema-validator` from 1.0.78 to 1.0.81 (#7460)
+- Bump `org.apache.commons:commons-compress` from 1.22 to 1.23.0 (#7462)
 
 ### Changed
 - Enable `./gradlew build` on MacOS by disabling bcw tests ([#7303](https://github.com/opensearch-project/OpenSearch/pull/7303))
@@ -115,4 +118,4 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Security
 
 [Unreleased 3.0]: https://github.com/opensearch-project/OpenSearch/compare/2.x...HEAD
-[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.7...2.x
+[Unreleased 2.x]: https://github.com/opensearch-project/OpenSearch/compare/2.7...2.x

buildSrc/build.gradle

@@ -118,7 +118,7 @@ dependencies {
   api 'com.avast.gradle:gradle-docker-compose-plugin:0.16.12'
   api "org.yaml:snakeyaml:${props.getProperty('snakeyaml')}"
   api 'org.apache.maven:maven-model:3.9.1'
-  api 'com.networknt:json-schema-validator:1.0.78'
+  api 'com.networknt:json-schema-validator:1.0.81'
   api "com.fasterxml.jackson.core:jackson-databind:${props.getProperty('jackson_databind')}"
 
   testFixturesApi "junit:junit:${props.getProperty('junit')}"

modules/mapper-extras/src/main/java/org/opensearch/index/mapper/SearchAsYouTypeFieldMapper.java

@@ -618,7 +618,7 @@ public SpanQuery spanPrefixQuery(String value, SpanMultiTermQueryWrapper.SpanRew
     private final PrefixFieldMapper prefixField;
     private final ShingleFieldMapper[] shingleFields;
 
-    private final Builder builder;
+    private final IndexAnalyzers indexAnalyzers;
 
     public SearchAsYouTypeFieldMapper(
         String simpleName,
@@ -636,7 +636,7 @@ public SearchAsYouTypeFieldMapper(
         this.store = builder.store.getValue();
         this.indexOptions = builder.indexOptions.getValue();
         this.termVectors = builder.termVectors.getValue();
-        this.builder = builder;
+        this.indexAnalyzers = builder.analyzers.indexAnalyzers;
     }
 
     @Override
@@ -663,7 +663,7 @@ protected String contentType() {
 
     @Override
     public ParametrizedFieldMapper.Builder getMergeBuilder() {
-        return new Builder(simpleName(), builder.analyzers.indexAnalyzers).init(this);
+        return new Builder(simpleName(), this.indexAnalyzers).init(this);
     }
 
     public static String getShingleFieldName(String parentField, int shingleSize) {

plugins/repository-azure/build.gradle

@@ -44,7 +44,8 @@ opensearchplugin {
 }
 
 dependencies {
-  api 'com.azure:azure-core:1.34.0'
+  api 'com.azure:azure-core:1.39.0'
+  api 'com.azure:azure-json:1.0.1'
   api 'com.azure:azure-storage-common:12.20.0'
   api 'com.azure:azure-core-http-netty:1.12.8'
   api "io.netty:netty-codec-dns:${versions.netty}"

plugins/repository-azure/licenses/azure-core-1.34.0.jar.sha1

@@ -0,0 +1 @@
+39765fb88a90174628b31ddf6ff9f8d63462e080

plugins/repository-azure/licenses/azure-core-1.39.0.jar.sha1

@@ -0,0 +1 @@
+abdfdb0c49eebe75ed8532d047dea0c9f13c30ac

plugins/repository-azure/licenses/azure-json-1.0.1.jar.sha1

@@ -250,7 +250,7 @@ private BlobServiceClientBuilder applyLocationMode(final BlobServiceClientBuilde
 
     private static BlobServiceClientBuilder createClientBuilder(AzureStorageSettings settings) throws InvalidKeyException,
         URISyntaxException {
-        return new BlobServiceClientBuilder().connectionString(settings.getConnectString());
+        return SocketAccess.doPrivilegedException(() -> new BlobServiceClientBuilder().connectionString(settings.getConnectString()));
     }
 
     /**

plugins/repository-azure/src/main/java/org/opensearch/repositories/azure/AzureStorageService.java

@@ -119,6 +119,10 @@ public class AzureBlobContainerRetriesTests extends OpenSearchTestCase {
     public void setUp() throws Exception {
         threadPool = new TestThreadPool(getTestClass().getName(), AzureRepositoryPlugin.executorBuilder());
         httpServer = HttpServer.create(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0);
+        httpServer.createContext("/", (exchange) -> {
+            exchange.sendResponseHeaders(404, 0L);
+            exchange.close();
+        });
         httpServer.start();
         super.setUp();
     }

plugins/repository-azure/src/test/java/org/opensearch/repositories/azure/AzureBlobContainerRetriesTests.java

@@ -42,10 +42,11 @@ dependencies {
     exclude module: 'jettison'
     exclude module: 'netty'
     exclude module: 'guava'
+    exclude module: 'protobuf-java'
     exclude group: 'org.codehaus.jackson'
   }
   api "org.codehaus.jettison:jettison:${versions.jettison}"
-  api "org.apache.commons:commons-compress:1.22"
+  api "org.apache.commons:commons-compress:1.23.0"
   api "commons-codec:commons-codec:${versions.commonscodec}"
   api "org.apache.logging.log4j:log4j-core:${versions.log4j}"
   api "io.netty:netty-all:${versions.netty}"
@@ -56,7 +57,7 @@ dependencies {
   api "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}"
   api 'net.minidev:json-smart:2.4.10'
   api "org.mockito:mockito-core:${versions.mockito}"
-  api "com.google.protobuf:protobuf-java:3.22.2"
+  api "com.google.protobuf:protobuf-java:${versions.protobuf}"
   api "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}"
   api "org.eclipse.jetty:jetty-server:${versions.jetty}"
   api "org.eclipse.jetty.websocket:javax-websocket-server-impl:${versions.jetty}"