From 5c121805598fb731851b0e05788ca259e581d35b Mon Sep 17 00:00:00 2001
From: Zhongnan Su <szhongna@amazon.com>
Date: Wed, 30 Jun 2021 16:27:37 -0700
Subject: [PATCH] Bump node version, fix workflow and gradle build (#108)

* Bump nodejs version to keep up with upstream

Signed-off-by: Zhongnan Su <szhongna@amazon.com>

* fix github workflow

Signed-off-by: Zhongnan Su <szhongna@amazon.com>
---
 .../dashboards-reports-release-workflow.yml      |  2 +-
 ...ashboards-reports-test-and-build-workflow.yml |  2 +-
 ...reports-scheduler-test-and-build-workflow.yml | 16 ++++++++++------
 reports-scheduler/build.gradle                   |  6 ++++--
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/dashboards-reports-release-workflow.yml b/.github/workflows/dashboards-reports-release-workflow.yml
index 18f51298..bceefb9d 100644
--- a/.github/workflows/dashboards-reports-release-workflow.yml
+++ b/.github/workflows/dashboards-reports-release-workflow.yml
@@ -36,7 +36,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v1
         with:
-          node-version: "10.23.1"
+          node-version: "10.24.1"
 
       - name: Move Dashboards Reports to Plugins Dir
         run: mv dashboards-reports OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
diff --git a/.github/workflows/dashboards-reports-test-and-build-workflow.yml b/.github/workflows/dashboards-reports-test-and-build-workflow.yml
index 36b9912a..3edea050 100644
--- a/.github/workflows/dashboards-reports-test-and-build-workflow.yml
+++ b/.github/workflows/dashboards-reports-test-and-build-workflow.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v1
         with:
-          node-version: "10.23.1"
+          node-version: "10.24.1"
 
       - name: Move Dashboards Reports to Plugins Dir
         run: mv dashboards-reports OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
diff --git a/.github/workflows/reports-scheduler-test-and-build-workflow.yml b/.github/workflows/reports-scheduler-test-and-build-workflow.yml
index 2312d90b..564ce506 100644
--- a/.github/workflows/reports-scheduler-test-and-build-workflow.yml
+++ b/.github/workflows/reports-scheduler-test-and-build-workflow.yml
@@ -2,6 +2,10 @@ name: Test and Build Reports Scheduler
 
 on: [push, pull_request]
 
+env:
+  OPENSEARCH_VERSION: '1.0'
+  COMMON_UTILS_VERSION: '1.0'
+  JOB_SCHEDULER_VERSION: '1.0'
 
 jobs:
   build:
@@ -19,7 +23,7 @@ jobs:
         with:
           repository: 'opensearch-project/OpenSearch'
           path: OpenSearch
-          ref: '1.0'
+          ref: ${{ env.OPENSEARCH_VERSION }}
       - name: Build OpenSearch
         working-directory: ./OpenSearch
         run: ./gradlew publishToMavenLocal -Dbuild.snapshot=false
@@ -29,22 +33,22 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: 'opensearch-project/common-utils'
-          ref: 'main'
+          ref: ${{ env.COMMON_UTILS_VERSION }}
           path: common-utils
       - name: Build common-utils
         working-directory: ./common-utils
-        run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0
+        run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}.0
 
       # dependencies: job-scheduler
       - name: Checkout job-scheduler
         uses: actions/checkout@v2
         with:
           repository: 'opensearch-project/job-scheduler'
-          ref: 'main'
+          ref: ${{ env.JOB_SCHEDULER_VERSION }}
           path: job-scheduler
       - name: Build job-scheduler
         working-directory: ./job-scheduler
-        run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0 -Dbuild.snapshot=false
+        run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}.0 -Dbuild.snapshot=false
 
       # reports-scheduler
       - name: Checkout Reports Scheduler
@@ -53,7 +57,7 @@ jobs:
       - name: Build with Gradle
         run: |
           cd reports-scheduler
-          ./gradlew build -Dopensearch.version=1.0.0
+          ./gradlew build -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}.0
 
       - name: Upload coverage
         uses: codecov/codecov-action@v1
diff --git a/reports-scheduler/build.gradle b/reports-scheduler/build.gradle
index b4d6f79f..38da24d9 100644
--- a/reports-scheduler/build.gradle
+++ b/reports-scheduler/build.gradle
@@ -32,6 +32,8 @@ buildscript {
         opensearch_group = "org.opensearch"
         opensearch_version = System.getProperty("opensearch.version", "1.0.0")
         kotlin_version = System.getProperty("kotlin.version", "1.4.0")
+        common_utils_version = "1.0.0.0"
+        job_scheduler_version = "1.0.0.0"
     }
 
     repositories {
@@ -139,8 +141,8 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
     compile "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
     compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9"
-    compile "${group}:common-utils:${opensearchVersion}"
-    compileOnly "${group}:opensearch-job-scheduler-spi:${opensearchVersion}"
+    compile "${group}:common-utils:${common_utils_version}"
+    compileOnly "${group}:opensearch-job-scheduler-spi:${job_scheduler_version}"
     compile group: 'com.google.guava', name: 'guava', version: '15.0'
     compile "org.json:json:20180813"
     compile group: 'com.github.wnameless', name: 'json-flattener', version: '0.1.0'