From fc83f9d8c33346779d48158837da4619f86eda1a Mon Sep 17 00:00:00 2001
From: lizkrznarich <liz.krznarich@datacite.org>
Date: Wed, 19 Apr 2023 11:01:28 -0500
Subject: [PATCH] add option to index ES 6 or 7

---
 .github/workflows/dev_manual_index.yml | 10 +++++++++-
 .github/workflows/index_files.py       |  4 +++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev_manual_index.yml b/.github/workflows/dev_manual_index.yml
index 7055d6459..317f45cc2 100644
--- a/.github/workflows/dev_manual_index.yml
+++ b/.github/workflows/dev_manual_index.yml
@@ -6,6 +6,14 @@ on:
         type: string
         required: true
         description: Name of the directory you would like to deploy to DEV
+      es-version:
+        description: Elastic search version to deploy to
+        required: true
+        default: 7
+        type: choice
+        options:
+          - 6
+          - 7
 env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -105,7 +113,7 @@ jobs:
           cd .github/workflows
           python -m pip install --upgrade pip
           pip install requests==2.23.0
-          python index_files.py -u ${{ secrets.INDEX_DEV_API_URL }} -d ${{ github.event.inputs.directory-name }} -he ${{ secrets.INDEX_DEV_API_HEADERS }}
+          python index_files.py -u ${{ secrets.INDEX_DEV_API_URL }} -d ${{ github.event.inputs.directory-name }} -es -d ${{ github.event.inputs.es-version }} -he ${{ secrets.INDEX_DEV_API_HEADERS }}
       - name: Notify Slack
         if: always()
         uses: edge/simple-slack-notify@master
diff --git a/.github/workflows/index_files.py b/.github/workflows/index_files.py
index b7281f46f..791d94ca6 100644
--- a/.github/workflows/index_files.py
+++ b/.github/workflows/index_files.py
@@ -9,6 +9,7 @@ def set_args():
                     description="Send request to index files")
     parser.add_argument('-u', '--url', help='URL to index files', required=True)
     parser.add_argument('-d', '--dir', help='directory in S3 bucket that is to be indexed', required=True)
+    parser.add_argument('-es', '--esversion', help='Elastic search version to index', required=True)
     parser.add_argument('-he', '--headers', help='key:value json string; headers to authenticate request', required=True, type=json.loads)
     args = parser.parse_args()
     return args
@@ -24,8 +25,9 @@ def main():
     args = set_args()
     url = args.url
     dir = args.dir
+    esversion = args.esversion
     headers = args.headers
-    full_url = os.path.join(url, dir)
+    full_url = os.path.join(url, dir, esversion)
     response = send_request(full_url, headers)
     if not(response.ok):
         print(response.text)