Merge branch 'main' into snapshot_rate_dynamic3

Signed-off-by: kkewwei <[email protected]>

Author: kkewwei

.github/workflows/trigger-manifest-generation.yml

@@ -0,0 +1,17 @@
+name: Trigger manifest generation workflow
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - buildSrc/version.properties
+
+jobs:
+  trigger-manifest-workflow:
+    if: github.repository == 'opensearch-project/OpenSearch'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger manifest-update workflow
+        run: |
+            echo "Triggering manifest-update workflow at https://build.ci.opensearch.org/job/manifest-update/"
+            curl -f -X POST https://build.ci.opensearch.org/job/manifest-update/build --user ${{ secrets.JENKINS_GITHUB_USER}}:${{ secrets.JENKINS_GITHUB_USER_TOKEN}}

CHANGELOG.md

@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Changed
 - Update Subject interface to use CheckedRunnable ([#18570](https://github.com/opensearch-project/OpenSearch/issues/18570))
+- Update SecureAuxTransportSettingsProvider to distinguish between aux transport types ([#18616](https://github.com/opensearch-project/OpenSearch/pull/18616))
 - Making multi rate limiters in repository dynamic [#18069](https://github.com/opensearch-project/OpenSearch/pull/18069)
 
 ### Dependencies
@@ -26,6 +27,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `org.apache.logging.log4j:log4j-core` from 2.24.3 to 2.25.0 ([#18589](https://github.com/opensearch-project/OpenSearch/pull/18589))
 - Bump `com.google.code.gson:gson` from 2.13.0 to 2.13.1 ([#18585](https://github.com/opensearch-project/OpenSearch/pull/18585))
 - Bump `com.azure:azure-core-http-netty` from 1.15.11 to 1.15.12 ([#18586](https://github.com/opensearch-project/OpenSearch/pull/18586))
+- Bump `com.squareup.okio:okio` from 3.13.0 to 3.14.0 ([#18645](https://github.com/opensearch-project/OpenSearch/pull/18645))
 
 ### Deprecated
 
@@ -34,11 +36,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Fixed
 - Add task cancellation checks in aggregators ([#18426](https://github.com/opensearch-project/OpenSearch/pull/18426))
 - Fix concurrent timings in profiler ([#18540](https://github.com/opensearch-project/OpenSearch/pull/18540))
+- Fix regex query from query string query to work with field alias ([#18215](https://github.com/opensearch-project/OpenSearch/issues/18215))
 - [Autotagging] Fix delete rule event consumption in InMemoryRuleProcessingService ([#18628](https://github.com/opensearch-project/OpenSearch/pull/18628))
 - Cannot communicate with HTTP/2 when reactor-netty is enabled ([#18599](https://github.com/opensearch-project/OpenSearch/pull/18599))
 - Fix the visit of sub queries for HasParentQuery and HasChildQuery ([#18621](https://github.com/opensearch-project/OpenSearch/pull/18621))
 
-
 ### Security
 
 [Unreleased 3.x]: https://github.com/opensearch-project/OpenSearch/compare/3.1...main

plugins/transport-grpc/src/main/java/org/opensearch/plugin/transport/grpc/ssl/SecureNetty4GrpcServerTransport.java

@@ -106,15 +106,16 @@ public String settingKey() {
      * @param provider for SSLContext and SecureAuxTransportParameters (ClientAuth and enabled ciphers).
      */
     private JdkSslContext getSslContext(Settings settings, SecureAuxTransportSettingsProvider provider) throws SSLException {
-        Optional<SSLContext> sslContext = provider.buildSecureAuxServerTransportContext(settings, this);
+        Optional<SSLContext> sslContext = provider.buildSecureAuxServerTransportContext(settings, this.settingKey());
         if (sslContext.isEmpty()) {
             try {
                 sslContext = Optional.of(SSLContext.getDefault());
             } catch (NoSuchAlgorithmException e) {
                 throw new SSLException("Failed to build default SSLContext for " + SecureNetty4GrpcServerTransport.class.getName(), e);
             }
         }
-        SecureAuxTransportSettingsProvider.SecureAuxTransportParameters params = provider.parameters().orElseGet(DefaultParameters::new);
+        SecureAuxTransportSettingsProvider.SecureAuxTransportParameters params = provider.parameters(settings, this.settingKey())
+            .orElseGet(DefaultParameters::new);
         ClientAuth clientAuth = ClientAuth.valueOf(params.clientAuth().orElseThrow().toUpperCase(Locale.ROOT));
         return new JdkSslContext(
             sslContext.get(),

plugins/transport-grpc/src/test/java/org/opensearch/plugin/transport/grpc/ssl/SecureSettingsHelpers.java

@@ -10,7 +10,6 @@
 
 import org.opensearch.common.settings.Settings;
 import org.opensearch.plugins.SecureAuxTransportSettingsProvider;
-import org.opensearch.transport.AuxTransport;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
@@ -110,7 +109,7 @@ static SecureAuxTransportSettingsProvider getSecureSettingsProvider(
     ) {
         return new SecureAuxTransportSettingsProvider() {
             @Override
-            public Optional<SSLContext> buildSecureAuxServerTransportContext(Settings settings, AuxTransport transport)
+            public Optional<SSLContext> buildSecureAuxServerTransportContext(Settings settings, String auxTransportType)
                 throws SSLException {
                 // Choose a random protocol from among supported test defaults
                 String protocol = randomFrom(DEFAULT_SSL_PROTOCOLS);
@@ -126,7 +125,7 @@ public Optional<SSLContext> buildSecureAuxServerTransportContext(Settings settin
             }
 
             @Override
-            public Optional<SecureAuxTransportParameters> parameters() {
+            public Optional<SecureAuxTransportParameters> parameters(Settings settings, String auxTransportType) {
                 return Optional.of(new SecureAuxTransportParameters() {
                     @Override
                     public Optional<String> clientAuth() {

rest-api-spec/src/main/resources/rest-api-spec/test/search/61_query_string_field_alias.yml

@@ -0,0 +1,56 @@
+setup:
+  - skip:
+      version: " - 3.1.99"
+      reason: "regex query over field alias support starts 3.2"
+
+  - do:
+      indices.create:
+        index: test_index
+        body:
+          settings:
+            number_of_shards: 1
+            number_of_replicas: 0
+          mappings:
+            properties:
+              test:
+                type: text
+              test_alias:
+                type: alias
+                path: test
+
+  - do:
+      bulk:
+        refresh: true
+        body: |
+          {"index":{"_index":"test_index","_id":"1"}}
+          {"test":"hello"}
+          {"index":{"_index":"test_index","_id":"2"}}
+          {"test":"world"}
+
+---
+"regex search on normal field":
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test_index
+        body:
+          query:
+            query_string:
+              query: "test: /h[a-z].*/"
+
+  - match: {hits.total: 1}
+  - match: {hits.hits.0._id: "1"}
+
+---
+"regex search on alias field":
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test_index
+        body:
+          query:
+            query_string:
+              query: "test_alias: /h[a-z].*/"
+
+  - match: {hits.total: 1}
+  - match: {hits.hits.0._id: "1"}

server/src/main/java/org/opensearch/index/search/QueryStringQueryParser.java

@@ -56,6 +56,7 @@
 import org.apache.lucene.search.SynonymQuery;
 import org.apache.lucene.search.WildcardQuery;
 import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.automaton.RegExp;
 import org.opensearch.common.lucene.search.Queries;
 import org.opensearch.common.regex.Regex;
 import org.opensearch.common.unit.Fuzziness;
@@ -787,8 +788,12 @@ private Query getRegexpQuerySingle(String field, String termStr) throws ParseExc
             if (currentFieldType == null) {
                 return newUnmappedFieldQuery(field);
             }
-            setAnalyzer(getSearchAnalyzer(currentFieldType));
-            return super.getRegexpQuery(field, termStr);
+            if (forceAnalyzer != null) {
+                setAnalyzer(forceAnalyzer);
+            }
+            // query string query normalizes search value
+            termStr = getAnalyzer().normalize(currentFieldType.name(), termStr).utf8ToString();
+            return currentFieldType.regexpQuery(termStr, RegExp.ALL, 0, getDeterminizeWorkLimit(), getMultiTermRewriteMethod(), context);
         } catch (RuntimeException e) {
             if (lenient) {
                 return newLenientFieldQuery(field, e);

server/src/main/java/org/opensearch/plugins/SecureAuxTransportSettingsProvider.java

@@ -10,7 +10,6 @@
 
 import org.opensearch.common.annotation.ExperimentalApi;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.transport.AuxTransport;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLException;
@@ -26,17 +25,22 @@
 public interface SecureAuxTransportSettingsProvider {
     /**
      * Fetch an SSLContext as managed by pluggable security provider.
+     * @param settings for providing additional configuration options when building the ssl context.
+     * @param auxTransportType key for enabling this transport with AUX_TRANSPORT_TYPES_SETTING.
      * @return an instance of SSLContext.
      */
-    default Optional<SSLContext> buildSecureAuxServerTransportContext(Settings settings, AuxTransport transport) throws SSLException {
+    default Optional<SSLContext> buildSecureAuxServerTransportContext(Settings settings, String auxTransportType) throws SSLException {
         return Optional.empty();
     }
 
     /**
      * Additional params required for configuring ALPN.
+     * @param settings for providing additional configuration options when building secure params.
+     * @param auxTransportType key for enabling this transport with AUX_TRANSPORT_TYPES_SETTING.
      * @return an instance of {@link SecureAuxTransportSettingsProvider.SecureAuxTransportParameters}
      */
-    default Optional<SecureAuxTransportSettingsProvider.SecureAuxTransportParameters> parameters() {
+    default Optional<SecureAuxTransportSettingsProvider.SecureAuxTransportParameters> parameters(Settings settings, String auxTransportType)
+        throws SSLException {
         return Optional.empty();
     }
 

server/src/test/java/org/opensearch/index/query/QueryStringQueryBuilderTests.java

@@ -786,6 +786,16 @@ public void testToQueryRegExpQuery() throws Exception {
         assertTrue(regexpQuery.toString().contains("/foo*bar/"));
     }
 
+    public void testRegexpQueryParserWithForceAnalyzer() throws Exception {
+        QueryStringQueryParser queryParser = new QueryStringQueryParser(createShardContext(), TEXT_FIELD_NAME);
+        queryParser.setForceAnalyzer(new org.apache.lucene.analysis.standard.StandardAnalyzer());
+        Query query = queryParser.parse("/aBc.*/");
+        assertThat(query, instanceOf(RegexpQuery.class));
+        RegexpQuery regexpQuery = (RegexpQuery) query;
+        // Standard analyzer normalizes to lowercase, verifying the normalization path with currentFieldType.name() is hit
+        assertTrue(regexpQuery.toString().contains("abc.*"));
+    }
+
     public void testToQueryRegExpQueryTooComplex() throws Exception {
         QueryStringQueryBuilder queryBuilder = queryStringQuery("/[ac]*a[ac]{50,200}/").defaultField(TEXT_FIELD_NAME);
 

test/fixtures/hdfs-fixture/build.gradle

@@ -88,6 +88,6 @@ dependencies {
   runtimeOnly("com.squareup.okhttp3:okhttp:4.12.0") {
     exclude group: "com.squareup.okio"
   }
-  runtimeOnly "com.squareup.okio:okio:3.13.0"
+  runtimeOnly "com.squareup.okio:okio:3.14.0"
   runtimeOnly "org.xerial.snappy:snappy-java:1.1.10.7"
 }