merge from main

Signed-off-by: xinyual <xinyual@amazon.com>

Author: xinyual

.github/workflows/enforce-labels.yml

@@ -9,5 +9,5 @@ jobs:
     steps:
     - uses: yogevbd/enforce-label-action@2.1.0
       with:
-        REQUIRED_LABELS_ANY: "breaking,feature,enhancement,bug,infrastructure,dependencies,documentation,maintenance,skip-changelog,testing,security fix"
-        REQUIRED_LABELS_ANY_DESCRIPTION: "A release label is required: ['breaking', 'bug', 'dependencies', 'documentation', 'enhancement', 'feature', 'infrastructure', 'maintenance', 'skip-changelog', 'testing', 'security fix']"
+        REQUIRED_LABELS_ANY: "breaking,feature,enhancement,bugFix,infrastructure,dependencies,documentation,maintenance,skip-changelog,testing,security fix"
+        REQUIRED_LABELS_ANY_DESCRIPTION: "A release label is required: ['breaking', 'bugFix', 'dependencies', 'documentation', 'enhancement', 'feature', 'infrastructure', 'maintenance', 'skip-changelog', 'testing', 'security fix']"

.github/workflows/integ-tests-with-security.yml

@@ -62,7 +62,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ windows-latest, macos-13 ]
+        os: [ windows-latest, macos-14 ]
         java: [21, 24]
 
     runs-on: ${{ matrix.os }}

.github/workflows/sql-test-and-build-workflow.yml

@@ -107,8 +107,8 @@ jobs:
         entry:
           - { os: windows-latest, java: 21, os_build_args: -PbuildPlatform=windows }
           - { os: windows-latest, java: 24, os_build_args: -PbuildPlatform=windows }
-          - { os: macos-13, java: 21, os_build_args: '' }
-          - { os: macos-13, java: 24, os_build_args: '' }
+          - { os: macos-14, java: 21, os_build_args: '' }
+          - { os: macos-14, java: 24, os_build_args: '' }
         test-type: ['unit', 'integration', 'doc']
         exclude:
           # Exclude doctest for Windows

async-query/src/test/resources/flint-index-mappings/flint_mys3_default_http_logs_cv1_index.json

@@ -30,7 +30,7 @@
         "number_of_replicas": 0,
         "max_result_window": 100,
         "version": {
-          "created": "6050399"
+          "created": "137217827"
         }
       }
     },

async-query/src/test/resources/flint-index-mappings/flint_mys3_default_http_logs_skipping_index.json

@@ -39,7 +39,7 @@
         "number_of_replicas": 0,
         "max_result_window": 100,
         "version": {
-          "created": "6050399"
+          "created": "137217827"
         }
       }
     },

async-query/src/test/resources/flint-index-mappings/npe_mapping.json

@@ -24,7 +24,7 @@
         "number_of_replicas": 0,
         "max_result_window": 100,
         "version": {
-          "created": "6050399"
+          "created": "137217827"
         }
       }
     },

common/src/main/java/org/opensearch/sql/common/grok/GrokCompiler.java

@@ -185,7 +185,6 @@ public Grok compile(final String pattern, ZoneId defaultTimeZone, boolean namedO
               (group.get("subname") != null ? group.get("subname") : group.get("name")));
           namedRegex =
               StringUtils.replace(namedRegex, "%{" + group.get("name") + "}", replacement, 1);
-          // System.out.println(_expanded_pattern);
           index++;
         }
       }

common/src/test/java/org/opensearch/sql/common/grok/ApacheDataTypeTest.java

@@ -49,7 +49,6 @@ public void test002_httpd_access_semi() throws GrokException {
                 + " HTTP/%{NUMBER:httpversion;float})?|%{DATA:rawrequest})\" %{NUMBER:response;int}"
                 + " (?:%{NUMBER:bytes;long}|-)");
 
-    System.out.println(line);
     Match gm = grok.match(line);
     Map<String, Object> map = gm.capture();
 

common/src/test/java/org/opensearch/sql/common/grok/ApacheTest.java

@@ -38,7 +38,6 @@ public void test001_httpd_access() throws GrokException, IOException {
 
     BufferedReader br = new BufferedReader(new FileReader(LOG_FILE));
     String line;
-    System.out.println("Starting test with httpd log");
     while ((line = br.readLine()) != null) {
       Match gm = grok.match(line);
       final Map<String, Object> capture = gm.capture();
@@ -50,7 +49,6 @@ public void test001_httpd_access() throws GrokException, IOException {
   @Test
   public void test002_nasa_httpd_access() throws GrokException, IOException {
     Grok grok = compiler.compile("%{COMMONAPACHELOG}");
-    System.out.println("Starting test with nasa log -- may take a while");
     BufferedReader br;
     String line;
     File dir = new File(LOG_DIR_NASA);

common/src/test/java/org/opensearch/sql/common/grok/GrokTest.java

@@ -317,7 +317,6 @@ public void test013_IpSet() throws Throwable {
     try (FileReader fr = new FileReader(Resources.getResource(ResourceManager.IP).getFile());
         BufferedReader br = new BufferedReader(fr)) {
       String line;
-      System.out.println("Starting test with ip");
       while ((line = br.readLine()) != null) {
         Match gm = grok.match(line);
         final Map<String, Object> map = gm.capture();