From 670e1c49dfff34f03f2e26938d291c4db5208942 Mon Sep 17 00:00:00 2001
From: Craig Perkins <cwperx@amazon.com>
Date: Wed, 31 May 2023 15:43:35 -0400
Subject: [PATCH 1/9] Use version from package.json for integration tests

Signed-off-by: Craig Perkins <cwperx@amazon.com>
---
 .github/workflows/integration-test.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index e445fa0af..aaaab1058 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -5,9 +5,8 @@ on: [push, pull_request]
 env:
   TEST_BROWSER_HEADLESS: 1
   CI: 1
-  OPENSEARCH_VERSION: 3.0.0
+  OPENSEARCH_VERSION: $(node -p "require('./package.json').version")
   PLUGIN_NAME: opensearch-security
-  PLUGIN_VERSION: 3.0.0.0
 
 jobs:
   tests:
@@ -19,6 +18,9 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
+      - name: Set env
+        run: echo "PLUGIN_VERSION=${OPENSEARCH_VERSION}" >> $GITHUB_ENV
+
       - name: Checkout Branch
         uses: actions/checkout@v3
 

From f9faa9d901c6568d0d766b777936f708ce002121 Mon Sep 17 00:00:00 2001
From: Craig Perkins <cwperx@amazon.com>
Date: Wed, 31 May 2023 16:00:10 -0400
Subject: [PATCH 2/9] Use corresponding versions

Signed-off-by: Craig Perkins <cwperx@amazon.com>
---
 .github/workflows/integration-test.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index aaaab1058..4254e816f 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -5,8 +5,9 @@ on: [push, pull_request]
 env:
   TEST_BROWSER_HEADLESS: 1
   CI: 1
-  OPENSEARCH_VERSION: $(node -p "require('./package.json').version")
+  OPENSEARCH_VERSION: $(node -p "require('./package.json').opensearchDashboards.version")
   PLUGIN_NAME: opensearch-security
+  PLUGIN_VERSION: $(node -p "require('./package.json').version")
 
 jobs:
   tests:
@@ -18,9 +19,6 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - name: Set env
-        run: echo "PLUGIN_VERSION=${OPENSEARCH_VERSION}" >> $GITHUB_ENV
-
       - name: Checkout Branch
         uses: actions/checkout@v3
 

From c96c9fe848083f9413ce3d2eb7794c0a162fa9f4 Mon Sep 17 00:00:00 2001
From: Craig Perkins <cwperx@amazon.com>
Date: Wed, 31 May 2023 16:12:00 -0400
Subject: [PATCH 3/9] Add step to set env

Signed-off-by: Craig Perkins <cwperx@amazon.com>
---
 .github/workflows/cypress-test-tenancy-disabled.yml | 7 +++++--
 .github/workflows/cypress-test.yml                  | 7 +++++--
 .github/workflows/integration-test.yml              | 7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cypress-test-tenancy-disabled.yml b/.github/workflows/cypress-test-tenancy-disabled.yml
index c494f1390..344765d81 100644
--- a/.github/workflows/cypress-test-tenancy-disabled.yml
+++ b/.github/workflows/cypress-test-tenancy-disabled.yml
@@ -9,9 +9,7 @@ env:
   START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --opensearch_security.multitenancy.enable_aggregation_view=true'
   OPENSEARCH_SNAPSHOT_CMD: 'node ../scripts/opensearch snapshot'
   SPEC: 'cypress/integration/plugins/security-dashboards-plugin/aggregation_view.js,'
-  OPENSEARCH_VERSION: 3.0.0
   PLUGIN_NAME: opensearch-security
-  PLUGIN_VERSION: 3.0.0.0
 
 jobs:
   tests:
@@ -23,6 +21,11 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
+      - name: Set env
+        run: |
+          echo "OPENSEARCH_VERSION=$(node -p "require('./package.json').opensearchDashboards.version")" >> $GITHUB_ENV
+          echo "PLUGIN_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV
+
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
diff --git a/.github/workflows/cypress-test.yml b/.github/workflows/cypress-test.yml
index e61149cf6..e467cba8a 100644
--- a/.github/workflows/cypress-test.yml
+++ b/.github/workflows/cypress-test.yml
@@ -9,9 +9,7 @@ env:
   START_CMD: 'node ../scripts/opensearch_dashboards --dev --no-base-path --no-watch --opensearch_security.multitenancy.enable_aggregation_view=true'
   OPENSEARCH_SNAPSHOT_CMD: 'node ../scripts/opensearch snapshot'
   SPEC: 'cypress/integration/plugins/security-dashboards-plugin/aggregation_view.js,'
-  OPENSEARCH_VERSION: 3.0.0
   PLUGIN_NAME: opensearch-security
-  PLUGIN_VERSION: 3.0.0.0
 
 jobs:
   tests:
@@ -23,6 +21,11 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
+      - name: Set env
+        run: |
+          echo "OPENSEARCH_VERSION=$(node -p "require('./package.json').opensearchDashboards.version")" >> $GITHUB_ENV
+          echo "PLUGIN_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV
+
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index 4254e816f..ebb33b44b 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -5,9 +5,7 @@ on: [push, pull_request]
 env:
   TEST_BROWSER_HEADLESS: 1
   CI: 1
-  OPENSEARCH_VERSION: $(node -p "require('./package.json').opensearchDashboards.version")
   PLUGIN_NAME: opensearch-security
-  PLUGIN_VERSION: $(node -p "require('./package.json').version")
 
 jobs:
   tests:
@@ -19,6 +17,11 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
+      - name: Set env
+        run: |
+          echo "OPENSEARCH_VERSION=$(node -p "require('./package.json').opensearchDashboards.version")" >> $GITHUB_ENV
+          echo "PLUGIN_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV
+
       - name: Checkout Branch
         uses: actions/checkout@v3
 

From 3e25554be5bd742e727885f39ea7cc2f4738e8b4 Mon Sep 17 00:00:00 2001
From: Craig Perkins <cwperx@amazon.com>
Date: Wed, 31 May 2023 16:17:51 -0400
Subject: [PATCH 4/9] escape backslashes

Signed-off-by: Craig Perkins <cwperx@amazon.com>
---
 .github/workflows/cypress-test-tenancy-disabled.yml | 4 ++--
 .github/workflows/cypress-test.yml                  | 4 ++--
 .github/workflows/integration-test.yml              | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cypress-test-tenancy-disabled.yml b/.github/workflows/cypress-test-tenancy-disabled.yml
index 344765d81..86691e4b1 100644
--- a/.github/workflows/cypress-test-tenancy-disabled.yml
+++ b/.github/workflows/cypress-test-tenancy-disabled.yml
@@ -23,8 +23,8 @@ jobs:
     steps:
       - name: Set env
         run: |
-          echo "OPENSEARCH_VERSION=$(node -p "require('./package.json').opensearchDashboards.version")" >> $GITHUB_ENV
-          echo "PLUGIN_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV
+          echo "OPENSEARCH_VERSION=$(node -p \"require('./package.json').opensearchDashboards.version\")" >> $GITHUB_ENV
+          echo "PLUGIN_VERSION=$(node -p \"require('./package.json').version\")" >> $GITHUB_ENV
 
       - name: Set up JDK
         uses: actions/setup-java@v1
diff --git a/.github/workflows/cypress-test.yml b/.github/workflows/cypress-test.yml
index e467cba8a..facc13bf4 100644
--- a/.github/workflows/cypress-test.yml
+++ b/.github/workflows/cypress-test.yml
@@ -23,8 +23,8 @@ jobs:
     steps:
       - name: Set env
         run: |
-          echo "OPENSEARCH_VERSION=$(node -p "require('./package.json').opensearchDashboards.version")" >> $GITHUB_ENV
-          echo "PLUGIN_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV
+          echo "OPENSEARCH_VERSION=$(node -p \"require('./package.json').opensearchDashboards.version\")" >> $GITHUB_ENV
+          echo "PLUGIN_VERSION=$(node -p \"require('./package.json').version\")" >> $GITHUB_ENV
 
       - name: Set up JDK
         uses: actions/setup-java@v1
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index ebb33b44b..7689f8a76 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -19,8 +19,8 @@ jobs:
     steps:
       - name: Set env
         run: |
-          echo "OPENSEARCH_VERSION=$(node -p "require('./package.json').opensearchDashboards.version")" >> $GITHUB_ENV
-          echo "PLUGIN_VERSION=$(node -p "require('./package.json').version")" >> $GITHUB_ENV
+          echo "OPENSEARCH_VERSION=$(node -p \"require('./package.json').opensearchDashboards.version\")" >> $GITHUB_ENV
+          echo "PLUGIN_VERSION=$(node -p \"require('./package.json').version\")" >> $GITHUB_ENV
 
       - name: Checkout Branch
         uses: actions/checkout@v3

From 23bb79578586f9567b87834543eb96c38218008c Mon Sep 17 00:00:00 2001
From: Craig Perkins <cwperx@amazon.com>
Date: Wed, 31 May 2023 16:25:51 -0400
Subject: [PATCH 5/9] Use variables

Signed-off-by: Craig Perkins <cwperx@amazon.com>
---
 .github/workflows/cypress-test-tenancy-disabled.yml | 6 ++++--
 .github/workflows/cypress-test.yml                  | 6 ++++--
 .github/workflows/integration-test.yml              | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cypress-test-tenancy-disabled.yml b/.github/workflows/cypress-test-tenancy-disabled.yml
index 86691e4b1..08b8f7bc6 100644
--- a/.github/workflows/cypress-test-tenancy-disabled.yml
+++ b/.github/workflows/cypress-test-tenancy-disabled.yml
@@ -23,8 +23,10 @@ jobs:
     steps:
       - name: Set env
         run: |
-          echo "OPENSEARCH_VERSION=$(node -p \"require('./package.json').opensearchDashboards.version\")" >> $GITHUB_ENV
-          echo "PLUGIN_VERSION=$(node -p \"require('./package.json').version\")" >> $GITHUB_ENV
+          opensearch_version = $(node -p "require('./package.json').opensearchDashboards.version")
+          plugin_version = $(node -p "require('./package.json').version")
+          echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
+          echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
 
       - name: Set up JDK
         uses: actions/setup-java@v1
diff --git a/.github/workflows/cypress-test.yml b/.github/workflows/cypress-test.yml
index facc13bf4..b7bf86e9f 100644
--- a/.github/workflows/cypress-test.yml
+++ b/.github/workflows/cypress-test.yml
@@ -23,8 +23,10 @@ jobs:
     steps:
       - name: Set env
         run: |
-          echo "OPENSEARCH_VERSION=$(node -p \"require('./package.json').opensearchDashboards.version\")" >> $GITHUB_ENV
-          echo "PLUGIN_VERSION=$(node -p \"require('./package.json').version\")" >> $GITHUB_ENV
+          opensearch_version = $(node -p "require('./package.json').opensearchDashboards.version")
+          plugin_version = $(node -p "require('./package.json').version")
+          echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
+          echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
 
       - name: Set up JDK
         uses: actions/setup-java@v1
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index 7689f8a76..889b72de9 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -19,8 +19,10 @@ jobs:
     steps:
       - name: Set env
         run: |
-          echo "OPENSEARCH_VERSION=$(node -p \"require('./package.json').opensearchDashboards.version\")" >> $GITHUB_ENV
-          echo "PLUGIN_VERSION=$(node -p \"require('./package.json').version\")" >> $GITHUB_ENV
+          opensearch_version = $(node -p "require('./package.json').opensearchDashboards.version")
+          plugin_version = $(node -p "require('./package.json').version")
+          echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
+          echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
 
       - name: Checkout Branch
         uses: actions/checkout@v3

From de370dfd54caa9b9072ab73e0a37dcea0f6dc8a9 Mon Sep 17 00:00:00 2001
From: Craig Perkins <cwperx@amazon.com>
Date: Wed, 31 May 2023 16:33:08 -0400
Subject: [PATCH 6/9] Update path

Signed-off-by: Craig Perkins <cwperx@amazon.com>
---
 .github/workflows/cypress-test-tenancy-disabled.yml | 4 ++--
 .github/workflows/cypress-test.yml                  | 4 ++--
 .github/workflows/integration-test.yml              | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cypress-test-tenancy-disabled.yml b/.github/workflows/cypress-test-tenancy-disabled.yml
index 08b8f7bc6..d588097da 100644
--- a/.github/workflows/cypress-test-tenancy-disabled.yml
+++ b/.github/workflows/cypress-test-tenancy-disabled.yml
@@ -23,8 +23,8 @@ jobs:
     steps:
       - name: Set env
         run: |
-          opensearch_version = $(node -p "require('./package.json').opensearchDashboards.version")
-          plugin_version = $(node -p "require('./package.json').version")
+          opensearch_version = $(node -p "require('../../package.json').opensearchDashboards.version")
+          plugin_version = $(node -p "require('../../package.json').version")
           echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
           echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
 
diff --git a/.github/workflows/cypress-test.yml b/.github/workflows/cypress-test.yml
index b7bf86e9f..c1055162f 100644
--- a/.github/workflows/cypress-test.yml
+++ b/.github/workflows/cypress-test.yml
@@ -23,8 +23,8 @@ jobs:
     steps:
       - name: Set env
         run: |
-          opensearch_version = $(node -p "require('./package.json').opensearchDashboards.version")
-          plugin_version = $(node -p "require('./package.json').version")
+          opensearch_version = $(node -p "require('../../package.json').opensearchDashboards.version")
+          plugin_version = $(node -p "require('../../package.json').version")
           echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
           echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
 
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index 889b72de9..96de2e55d 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -19,8 +19,8 @@ jobs:
     steps:
       - name: Set env
         run: |
-          opensearch_version = $(node -p "require('./package.json').opensearchDashboards.version")
-          plugin_version = $(node -p "require('./package.json').version")
+          opensearch_version = $(node -p "require('../../package.json').opensearchDashboards.version")
+          plugin_version = $(node -p "require('../../package.json').version")
           echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
           echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
 

From c0bd26adcf7818ddc07a1c3c19b5e2510184adc2 Mon Sep 17 00:00:00 2001
From: Craig Perkins <cwperx@amazon.com>
Date: Thu, 1 Jun 2023 09:29:56 -0400
Subject: [PATCH 7/9] Place after checkout

Signed-off-by: Craig Perkins <cwperx@amazon.com>
---
 .../workflows/cypress-test-tenancy-disabled.yml    | 14 +++++++-------
 .github/workflows/cypress-test.yml                 | 14 +++++++-------
 .github/workflows/integration-test.yml             | 14 +++++++-------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/cypress-test-tenancy-disabled.yml b/.github/workflows/cypress-test-tenancy-disabled.yml
index d588097da..1c5580b7c 100644
--- a/.github/workflows/cypress-test-tenancy-disabled.yml
+++ b/.github/workflows/cypress-test-tenancy-disabled.yml
@@ -21,13 +21,6 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - name: Set env
-        run: |
-          opensearch_version = $(node -p "require('../../package.json').opensearchDashboards.version")
-          plugin_version = $(node -p "require('../../package.json').version")
-          echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
-          echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
-
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
@@ -36,6 +29,13 @@ jobs:
       - name: Checkout Branch
         uses: actions/checkout@v3
 
+      - name: Set env
+        run: |
+          opensearch_version = $(node -p "require('./package.json').opensearchDashboards.version")
+          plugin_version = $(node -p "require('./package.json').version")
+          echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
+          echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
+
       - name: Download security plugin and create setup scripts
         uses: ./.github/actions/download-plugin
         with:
diff --git a/.github/workflows/cypress-test.yml b/.github/workflows/cypress-test.yml
index c1055162f..b07376d4c 100644
--- a/.github/workflows/cypress-test.yml
+++ b/.github/workflows/cypress-test.yml
@@ -21,13 +21,6 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - name: Set env
-        run: |
-          opensearch_version = $(node -p "require('../../package.json').opensearchDashboards.version")
-          plugin_version = $(node -p "require('../../package.json').version")
-          echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
-          echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
-
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
@@ -36,6 +29,13 @@ jobs:
       - name: Checkout Branch
         uses: actions/checkout@v3
 
+      - name: Set env
+        run: |
+          opensearch_version = $(node -p "require('./package.json').opensearchDashboards.version")
+          plugin_version = $(node -p "require('./package.json').version")
+          echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
+          echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
+
       - name: Download security plugin and create setup scripts
         uses: ./.github/actions/download-plugin
         with:
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index 96de2e55d..923fd5f73 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -17,13 +17,6 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - name: Set env
-        run: |
-          opensearch_version = $(node -p "require('../../package.json').opensearchDashboards.version")
-          plugin_version = $(node -p "require('../../package.json').version")
-          echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
-          echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
-
       - name: Checkout Branch
         uses: actions/checkout@v3
 
@@ -32,6 +25,13 @@ jobs:
         with:
           java-version: 11
 
+      - name: Set env
+        run: |
+          opensearch_version = $(node -p "require('./package.json').opensearchDashboards.version")
+          plugin_version = $(node -p "require('./package.json').version")
+          echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
+          echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
+
       - uses: browser-actions/setup-geckodriver@v0.0.0
       - run: geckodriver --version
 

From 880eb08ed6bd3928621f45741d864cdbfff6c8d4 Mon Sep 17 00:00:00 2001
From: Craig Perkins <cwperx@amazon.com>
Date: Thu, 1 Jun 2023 09:36:40 -0400
Subject: [PATCH 8/9] Remove spaces

Signed-off-by: Craig Perkins <cwperx@amazon.com>
---
 .github/workflows/cypress-test-tenancy-disabled.yml | 4 ++--
 .github/workflows/cypress-test.yml                  | 4 ++--
 .github/workflows/integration-test.yml              | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cypress-test-tenancy-disabled.yml b/.github/workflows/cypress-test-tenancy-disabled.yml
index 1c5580b7c..10c2d1e34 100644
--- a/.github/workflows/cypress-test-tenancy-disabled.yml
+++ b/.github/workflows/cypress-test-tenancy-disabled.yml
@@ -31,8 +31,8 @@ jobs:
 
       - name: Set env
         run: |
-          opensearch_version = $(node -p "require('./package.json').opensearchDashboards.version")
-          plugin_version = $(node -p "require('./package.json').version")
+          opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version")
+          plugin_version=$(node -p "require('./package.json').version")
           echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
           echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
 
diff --git a/.github/workflows/cypress-test.yml b/.github/workflows/cypress-test.yml
index b07376d4c..f42f462ff 100644
--- a/.github/workflows/cypress-test.yml
+++ b/.github/workflows/cypress-test.yml
@@ -31,8 +31,8 @@ jobs:
 
       - name: Set env
         run: |
-          opensearch_version = $(node -p "require('./package.json').opensearchDashboards.version")
-          plugin_version = $(node -p "require('./package.json').version")
+          opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version")
+          plugin_version=$(node -p "require('./package.json').version")
           echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
           echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
 
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index 923fd5f73..7c8f4b9f4 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -27,8 +27,8 @@ jobs:
 
       - name: Set env
         run: |
-          opensearch_version = $(node -p "require('./package.json').opensearchDashboards.version")
-          plugin_version = $(node -p "require('./package.json').version")
+          opensearch_version=$(node -p "require('./package.json').opensearchDashboards.version")
+          plugin_version=$(node -p "require('./package.json').version")
           echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
           echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
 

From add8368278705f12ea54d613cc0756c2dda1f93f Mon Sep 17 00:00:00 2001
From: Craig Perkins <cwperx@amazon.com>
Date: Thu, 1 Jun 2023 09:43:56 -0400
Subject: [PATCH 9/9] Add shell bash

Signed-off-by: Craig Perkins <cwperx@amazon.com>
---
 .github/workflows/cypress-test-tenancy-disabled.yml | 1 +
 .github/workflows/cypress-test.yml                  | 1 +
 .github/workflows/integration-test.yml              | 1 +
 3 files changed, 3 insertions(+)

diff --git a/.github/workflows/cypress-test-tenancy-disabled.yml b/.github/workflows/cypress-test-tenancy-disabled.yml
index 10c2d1e34..23494d1c3 100644
--- a/.github/workflows/cypress-test-tenancy-disabled.yml
+++ b/.github/workflows/cypress-test-tenancy-disabled.yml
@@ -35,6 +35,7 @@ jobs:
           plugin_version=$(node -p "require('./package.json').version")
           echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
           echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
+        shell: bash
 
       - name: Download security plugin and create setup scripts
         uses: ./.github/actions/download-plugin
diff --git a/.github/workflows/cypress-test.yml b/.github/workflows/cypress-test.yml
index f42f462ff..c5e5370c1 100644
--- a/.github/workflows/cypress-test.yml
+++ b/.github/workflows/cypress-test.yml
@@ -35,6 +35,7 @@ jobs:
           plugin_version=$(node -p "require('./package.json').version")
           echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
           echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
+        shell: bash
 
       - name: Download security plugin and create setup scripts
         uses: ./.github/actions/download-plugin
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index 7c8f4b9f4..b97526175 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -31,6 +31,7 @@ jobs:
           plugin_version=$(node -p "require('./package.json').version")
           echo "OPENSEARCH_VERSION=$opensearch_version" >> $GITHUB_ENV
           echo "PLUGIN_VERSION=$plugin_version" >> $GITHUB_ENV
+        shell: bash
 
       - uses: browser-actions/setup-geckodriver@v0.0.0
       - run: geckodriver --version