From a5e35e3eb4b5a891bf880b14c40c3646a36fdf86 Mon Sep 17 00:00:00 2001
From: Ryan Liang <109499885+RyanL1997@users.noreply.github.com>
Date: Thu, 3 Aug 2023 14:04:22 -0700
Subject: [PATCH] [2.x] Change the regex command in install dashboard GHA +
 Increment version to 2.10.0 (#1533)

* Change to regex in install dashboard gha to handle generic version format

Signed-off-by: Ryan Liang <jiallian@amazon.com>
---
 .github/actions/install-dashboards/action.yml | 6 +++---
 opensearch_dashboards.json                    | 4 ++--
 package.json                                  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/actions/install-dashboards/action.yml b/.github/actions/install-dashboards/action.yml
index 77555f3268..f5383c39c6 100644
--- a/.github/actions/install-dashboards/action.yml
+++ b/.github/actions/install-dashboards/action.yml
@@ -39,15 +39,15 @@ runs:
 
     - id: osd-version
       run: |
-        echo "::set-output name=osd-version::$(cat package.json | jq '.opensearchDashboards.version' | cut -c 2-4)"
-        echo "::set-output name=osd-x-version::$(cat package.json | jq '.opensearchDashboards.version' | cut -c 2-3)"
+        echo "::set-output name=osd-version::$(jq -r '.opensearchDashboards.version | split(".") | .[:2] | join(".")' package.json)"
+        echo "::set-output name=osd-x-version::$(jq -r '.opensearchDashboards.version | split(".") | .[0]' package.json).x"
       working-directory: ${{ steps.determine-plugin-directory.outputs.plugin-directory }}
       shell: bash
 
     - id: branch-switch-if-possible
       continue-on-error: true # Defaults onto main if the branch switch doesn't work
       if: ${{ steps.osd-version.outputs.osd-version }}
-      run: git checkout ${{ steps.osd-version.outputs.osd-version }} || git checkout ${{ steps.osd-version.outputs.osd-x-version }}x
+      run: git checkout ${{ steps.osd-version.outputs.osd-version }} || git checkout ${{ steps.osd-version.outputs.osd-x-version }}
       working-directory: ./OpenSearch-Dashboards
       shell: bash
 
diff --git a/opensearch_dashboards.json b/opensearch_dashboards.json
index f1419c7750..5f2f070ed4 100644
--- a/opensearch_dashboards.json
+++ b/opensearch_dashboards.json
@@ -1,7 +1,7 @@
 {
   "id": "securityDashboards",
-  "version": "2.9.0.0",
-  "opensearchDashboardsVersion": "2.9.0",
+  "version": "2.10.0.0",
+  "opensearchDashboardsVersion": "2.10.0",
   "configPath": [
     "opensearch_security"
   ],
diff --git a/package.json b/package.json
index b1d33d3def..eeb542d73f 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "opensearch-security-dashboards",
-  "version": "2.9.0.0",
+  "version": "2.10.0.0",
   "main": "target/plugins/opensearch_security_dashboards",
   "opensearchDashboards": {
-    "version": "2.9.0",
-    "templateVersion": "2.9.0"
+    "version": "2.10.0",
+    "templateVersion": "2.10.0"
   },
   "license": "Apache-2.0",
   "homepage": "https://github.com/opensearch-project/security-dashboards-plugin",