From 9042485549299dbd467d6706b9c96bd575a0ca55 Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Tue, 1 Oct 2024 13:04:41 -0700
Subject: [PATCH] [Backport 6.x] Revert to the `gradle-check` alias logic
 rather than querying `-*` gradle check indices (#511)

Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 build.gradle                                  | 2 +-
 src/gradlecheck/OpenSearchMetricsQuery.groovy | 5 +++--
 vars/publishGradleCheckTestResults.groovy     | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3c48cbdd..a765785e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -127,7 +127,7 @@ jacocoTestReport {
     }
 }
 
-String version = '6.9.1'
+String version = '6.9.2'
 
 task updateVersion {
     doLast {
diff --git a/src/gradlecheck/OpenSearchMetricsQuery.groovy b/src/gradlecheck/OpenSearchMetricsQuery.groovy
index d732677d..4951705f 100644
--- a/src/gradlecheck/OpenSearchMetricsQuery.groovy
+++ b/src/gradlecheck/OpenSearchMetricsQuery.groovy
@@ -26,16 +26,17 @@ class OpenSearchMetricsQuery {
         this.script = script
     }
 
+    // Ensure the alias `gradle-check` is created targeting all the gradle-check-* indices.
     def fetchMetrics(String query) {
         def response = script.sh(
             script: """
             set -e
             set +x
             MONTH_YEAR=\$(date +"%m-%Y")
-            curl -s -XGET "${metricsUrl}/gradle-check-*/_search" --aws-sigv4 "aws:amz:us-east-1:es" --user "${awsAccessKey}:${awsSecretKey}" -H "x-amz-security-token:${awsSessionToken}" -H 'Content-Type: application/json' -d "${query}" | jq '.'
+            curl -s -XGET "${metricsUrl}/gradle-check/_search" --aws-sigv4 "aws:amz:us-east-1:es" --user "${awsAccessKey}:${awsSecretKey}" -H "x-amz-security-token:${awsSessionToken}" -H 'Content-Type: application/json' -d "${query}" | jq '.'
         """,
                 returnStdout: true
         ).trim()
         return new JsonSlurper().parseText(response)
     }
-}
\ No newline at end of file
+}
diff --git a/vars/publishGradleCheckTestResults.groovy b/vars/publishGradleCheckTestResults.groovy
index f795f99f..1b773482 100644
--- a/vars/publishGradleCheckTestResults.groovy
+++ b/vars/publishGradleCheckTestResults.groovy
@@ -164,6 +164,9 @@ void indexFailedTestData() {
                                 "type": "keyword"
                             }
                         }
+                    },
+                    "aliases": {
+                        "gradle-check": {}
                     }
                 }'
                 echo "INDEX NAME IS \$INDEX_NAME"