From 396ce1c34eed1dbedcf1c41ce8a54ccd8aafe30a Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Thu, 16 Dec 2021 18:17:28 -0800
Subject: [PATCH 01/19] Added GitHub actions script to build Tableau and Power
 BI connector. The PBI connector is being built twice with different names
 accroding to the Amazon's request.

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 .github/workflows/bi-connectors.yml | 41 +++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 .github/workflows/bi-connectors.yml

diff --git a/.github/workflows/bi-connectors.yml b/.github/workflows/bi-connectors.yml
new file mode 100644
index 0000000000..598ad9617b
--- /dev/null
+++ b/.github/workflows/bi-connectors.yml
@@ -0,0 +1,41 @@
+name: Build connectors for BI tools
+
+on:
+  push:
+    paths:
+      - 'bi-connectors/PowerBIConnector/**'
+      - 'bi-connectors/TableauConnector/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+#    defaults:
+#      run:
+#        working-directory: sql-odbc
+    steps:
+    - uses: actions/checkout@v1
+    - name: Pack Tableau JDBC connector
+      run: |
+        zip -r opensearch_sql_jdbc.taco bi-connectors/TableauConnector/opensearch_sql_jdbc -x *.taco
+    - name: Pack Power BI ODBC connector
+      run: |
+        zip OpenSearch-project.mez bi-connectors/PowerBIConnector
+    - name: Prepare the second Power BI ODBC connector
+      run: |
+        sed -i 's/<value>OpenSearch<\/value>/<value>Amazon OpenSearch Service<\/value>/g' bi-connectors/PowerBIConnector/resources.resx
+        sed -i 's/Documentation.Name = "OpenSearch"/Documentation.Name = "Amazon OpenSearch Service"/g' bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.pq
+    - name: Pack Power BI ODBC connector for 'Amazon OpenSearch Service'
+      run: |
+        zip Amazon-OpenSearch-Service.mez bi-connectors/PowerBIConnector
+    - name: Upload Tableau JDBC connector
+      if: success()
+      uses: actions/upload-artifact@v2
+      with:
+        name: TableauConnector
+        path: opensearch_sql_jdbc.taco
+    - name: Upload Power BI ODBC connectors
+      if: success()
+      uses: actions/upload-artifact@v2
+      with:
+        name: PBIConnectors
+        path: *.mez

From 1d3cceb2623041fc2e778b208dcfbc002c0fa286 Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Thu, 16 Dec 2021 18:28:06 -0800
Subject: [PATCH 02/19] A typo fix in yml

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 .github/workflows/bi-connectors.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bi-connectors.yml b/.github/workflows/bi-connectors.yml
index 598ad9617b..4eb7ffee7b 100644
--- a/.github/workflows/bi-connectors.yml
+++ b/.github/workflows/bi-connectors.yml
@@ -38,4 +38,4 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: PBIConnectors
-        path: *.mez
+        path: '*.mez'

From c277fe2c9aa5b43b2e223534bcb343e510196641 Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Thu, 16 Dec 2021 18:33:16 -0800
Subject: [PATCH 03/19] A dummy commit to make GitHub Actions start the desired
 workflow

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.pq | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.pq b/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.pq
index 0a4bbf09eb..79dce23391 100644
--- a/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.pq
+++ b/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.pq
@@ -229,7 +229,7 @@ Extension.LoadFunction = (name as text) =>
     in
         Expression.Evaluate(asText, #shared);
 
-// Diagnostics module contains multiple functions. .
+// Diagnostics module contains multiple functions.
 Diagnostics = Extension.LoadFunction("Diagnostics.pqm");
 Diagnostics.LogValue = if (EnableTraceOutput) then Diagnostics[LogValue] else (prefix, value) => value;
 

From 2be30f33058e5c9b9927918289aa407f52a5c36e Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Thu, 16 Dec 2021 18:46:13 -0800
Subject: [PATCH 04/19] Workflow fix - pack Tableau ODBC connector instead of
 JDBC one

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 .github/workflows/bi-connectors.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/bi-connectors.yml b/.github/workflows/bi-connectors.yml
index 4eb7ffee7b..01d73a1c4a 100644
--- a/.github/workflows/bi-connectors.yml
+++ b/.github/workflows/bi-connectors.yml
@@ -14,9 +14,9 @@ jobs:
 #        working-directory: sql-odbc
     steps:
     - uses: actions/checkout@v1
-    - name: Pack Tableau JDBC connector
+    - name: Pack Tableau ODBC connector
       run: |
-        zip -r opensearch_sql_jdbc.taco bi-connectors/TableauConnector/opensearch_sql_jdbc -x *.taco
+        zip -r opensearch_sql_odbc.taco bi-connectors/TableauConnector/opensearch_sql_odbc -x *.taco
     - name: Pack Power BI ODBC connector
       run: |
         zip OpenSearch-project.mez bi-connectors/PowerBIConnector
@@ -27,12 +27,12 @@ jobs:
     - name: Pack Power BI ODBC connector for 'Amazon OpenSearch Service'
       run: |
         zip Amazon-OpenSearch-Service.mez bi-connectors/PowerBIConnector
-    - name: Upload Tableau JDBC connector
+    - name: Upload Tableau ODBC connector
       if: success()
       uses: actions/upload-artifact@v2
       with:
         name: TableauConnector
-        path: opensearch_sql_jdbc.taco
+        path: opensearch_sql_odbc.taco
     - name: Upload Power BI ODBC connectors
       if: success()
       uses: actions/upload-artifact@v2

From 604adbf2e5b0b56e83a3eb100e851ff20e3b2805 Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Thu, 16 Dec 2021 18:46:47 -0800
Subject: [PATCH 05/19] Fix line endings in the workflow file

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 .github/workflows/bi-connectors.yml | 82 ++++++++++++++---------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/bi-connectors.yml b/.github/workflows/bi-connectors.yml
index 01d73a1c4a..7d38ea76eb 100644
--- a/.github/workflows/bi-connectors.yml
+++ b/.github/workflows/bi-connectors.yml
@@ -1,41 +1,41 @@
-name: Build connectors for BI tools
-
-on:
-  push:
-    paths:
-      - 'bi-connectors/PowerBIConnector/**'
-      - 'bi-connectors/TableauConnector/**'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-#    defaults:
-#      run:
-#        working-directory: sql-odbc
-    steps:
-    - uses: actions/checkout@v1
-    - name: Pack Tableau ODBC connector
-      run: |
-        zip -r opensearch_sql_odbc.taco bi-connectors/TableauConnector/opensearch_sql_odbc -x *.taco
-    - name: Pack Power BI ODBC connector
-      run: |
-        zip OpenSearch-project.mez bi-connectors/PowerBIConnector
-    - name: Prepare the second Power BI ODBC connector
-      run: |
-        sed -i 's/<value>OpenSearch<\/value>/<value>Amazon OpenSearch Service<\/value>/g' bi-connectors/PowerBIConnector/resources.resx
-        sed -i 's/Documentation.Name = "OpenSearch"/Documentation.Name = "Amazon OpenSearch Service"/g' bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.pq
-    - name: Pack Power BI ODBC connector for 'Amazon OpenSearch Service'
-      run: |
-        zip Amazon-OpenSearch-Service.mez bi-connectors/PowerBIConnector
-    - name: Upload Tableau ODBC connector
-      if: success()
-      uses: actions/upload-artifact@v2
-      with:
-        name: TableauConnector
-        path: opensearch_sql_odbc.taco
-    - name: Upload Power BI ODBC connectors
-      if: success()
-      uses: actions/upload-artifact@v2
-      with:
-        name: PBIConnectors
-        path: '*.mez'
+name: Build connectors for BI tools
+
+on:
+  push:
+    paths:
+      - 'bi-connectors/PowerBIConnector/**'
+      - 'bi-connectors/TableauConnector/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+#    defaults:
+#      run:
+#        working-directory: sql-odbc
+    steps:
+    - uses: actions/checkout@v1
+    - name: Pack Tableau ODBC connector
+      run: |
+        zip -r opensearch_sql_odbc.taco bi-connectors/TableauConnector/opensearch_sql_odbc -x *.taco
+    - name: Pack Power BI ODBC connector
+      run: |
+        zip OpenSearch-project.mez bi-connectors/PowerBIConnector
+    - name: Prepare the second Power BI ODBC connector
+      run: |
+        sed -i 's/<value>OpenSearch<\/value>/<value>Amazon OpenSearch Service<\/value>/g' bi-connectors/PowerBIConnector/resources.resx
+        sed -i 's/Documentation.Name = "OpenSearch"/Documentation.Name = "Amazon OpenSearch Service"/g' bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.pq
+    - name: Pack Power BI ODBC connector for 'Amazon OpenSearch Service'
+      run: |
+        zip Amazon-OpenSearch-Service.mez bi-connectors/PowerBIConnector
+    - name: Upload Tableau ODBC connector
+      if: success()
+      uses: actions/upload-artifact@v2
+      with:
+        name: TableauConnector
+        path: opensearch_sql_odbc.taco
+    - name: Upload Power BI ODBC connectors
+      if: success()
+      uses: actions/upload-artifact@v2
+      with:
+        name: PBIConnectors
+        path: '*.mez'

From 91dd569f057daeb96b41eaaa717e599a696bebc1 Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Thu, 16 Dec 2021 18:49:17 -0800
Subject: [PATCH 06/19] Another dummy commit to start the desired workflow

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 .../PowerBIConnector/SqlOdbcPBIConnector.pq          | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.pq b/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.pq
index 79dce23391..41c5d6845a 100644
--- a/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.pq
+++ b/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.pq
@@ -159,7 +159,7 @@ OnOdbcError = (errorRecord as record) =>
         else 
             error errorRecord;
 
-// Data Source Kind description
+// Data Source Kind description.
 SqlOdbcPBIConnector = [
     // Required for use with Power BI Service.
     TestConnection = (dataSourcePath) => 
@@ -169,7 +169,7 @@ SqlOdbcPBIConnector = [
         in
             { "SqlOdbcPBIConnector.Contents", Server },
 
-    // Authentication modes
+    // Authentication modes.
     Authentication = [
         Implicit = [
             Label = "NONE"
@@ -183,7 +183,7 @@ SqlOdbcPBIConnector = [
         ]
     ],
 
-    // PBIDS Handler
+    // PBIDS Handler.
     DSRHandlers = [
       #"sqlodbc" = [
         GetDSR = (server, schema, object, optional options) => [ protocol = "sqlodbc", address = [ server = server ] ],
@@ -196,13 +196,13 @@ SqlOdbcPBIConnector = [
       ]
     ],
 
-    // Enable Encryption
+    // Enable Encryption.
     SupportsEncryption = true,
 
     Label = Extension.LoadString("DataSourceLabel")
 ];
 
-// Data Source UI publishing description
+// Data Source UI publishing description.
 SqlOdbcPBIConnector.Publish = [
     Beta = true,
     Category = "Other",
@@ -221,7 +221,7 @@ SqlOdbcPBIConnector.Icons = [
     Icon32 = { Extension.Contents("SqlOdbcPBIConnector32.png"), Extension.Contents("SqlOdbcPBIConnector40.png"), Extension.Contents("SqlOdbcPBIConnector48.png"), Extension.Contents("SqlOdbcPBIConnector64.png") }
 ];
 
-// Load common library functions
+// Load common library functions.
 Extension.LoadFunction = (name as text) =>
     let
         binary = Extension.Contents(name),

From 6b89593b91972278bcaed7e4c7cbb551f89b1f1a Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Thu, 16 Dec 2021 19:59:19 -0800
Subject: [PATCH 07/19] Fix paths in the GitHub workflow

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 .github/workflows/bi-connectors.yml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/bi-connectors.yml b/.github/workflows/bi-connectors.yml
index 7d38ea76eb..aab94b1581 100644
--- a/.github/workflows/bi-connectors.yml
+++ b/.github/workflows/bi-connectors.yml
@@ -16,26 +16,33 @@ jobs:
     - uses: actions/checkout@v1
     - name: Pack Tableau ODBC connector
       run: |
-        zip -r opensearch_sql_odbc.taco bi-connectors/TableauConnector/opensearch_sql_odbc -x *.taco
+        zip -r opensearch_sql_odbc.taco . -x *.taco
+      working-directory: bi-connectors/TableauConnector/opensearch_sql_odbc
+    - name: Prepare Power BI ODBC connector
+      run: |
+        cp SqlOdbcPBIConnector.pq SqlOdbcPBIConnector.m
     - name: Pack Power BI ODBC connector
       run: |
-        zip OpenSearch-project.mez bi-connectors/PowerBIConnector
+        zip OpenSearch-project.mez *.png *.m *.resx *.pqm
+      working-directory: bi-connectors/PowerBIConnector
     - name: Prepare the second Power BI ODBC connector
       run: |
-        sed -i 's/<value>OpenSearch<\/value>/<value>Amazon OpenSearch Service<\/value>/g' bi-connectors/PowerBIConnector/resources.resx
-        sed -i 's/Documentation.Name = "OpenSearch"/Documentation.Name = "Amazon OpenSearch Service"/g' bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.pq
+        sed -i 's/<value>OpenSearch<\/value>/<value>Amazon OpenSearch Service<\/value>/g' resources.resx
+        sed -i 's/Documentation.Name = "OpenSearch"/Documentation.Name = "Amazon OpenSearch Service"/g' SqlOdbcPBIConnector.m
+      working-directory: bi-connectors/PowerBIConnector
     - name: Pack Power BI ODBC connector for 'Amazon OpenSearch Service'
       run: |
-        zip Amazon-OpenSearch-Service.mez bi-connectors/PowerBIConnector
+        zip Amazon-OpenSearch-Service.mez *.png *.m *.resx *.pqm
+      working-directory: bi-connectors/PowerBIConnector
     - name: Upload Tableau ODBC connector
       if: success()
       uses: actions/upload-artifact@v2
       with:
         name: TableauConnector
-        path: opensearch_sql_odbc.taco
+        path: bi-connectors/TableauConnector/opensearch_sql_odbc/opensearch_sql_odbc.taco
     - name: Upload Power BI ODBC connectors
       if: success()
       uses: actions/upload-artifact@v2
       with:
         name: PBIConnectors
-        path: '*.mez'
+        path: 'bi-connectors/PowerBIConnector/*.mez'

From 015fa7b870e58de25b2ebea90f82f438ad71c980 Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Thu, 16 Dec 2021 20:07:44 -0800
Subject: [PATCH 08/19] Modified workflow to trigger on changes of itself

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 .github/workflows/bi-connectors.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/bi-connectors.yml b/.github/workflows/bi-connectors.yml
index aab94b1581..f3b9bf0d44 100644
--- a/.github/workflows/bi-connectors.yml
+++ b/.github/workflows/bi-connectors.yml
@@ -5,6 +5,7 @@ on:
     paths:
       - 'bi-connectors/PowerBIConnector/**'
       - 'bi-connectors/TableauConnector/**'
+      - '.github/workflows/bi-connectors.yml'
 
 jobs:
   build:

From 081392ede7476e9e8218adf34598d5a4c6651401 Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Thu, 16 Dec 2021 20:11:15 -0800
Subject: [PATCH 09/19] Path fix for preparation step

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 .github/workflows/bi-connectors.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/bi-connectors.yml b/.github/workflows/bi-connectors.yml
index f3b9bf0d44..099f05bc27 100644
--- a/.github/workflows/bi-connectors.yml
+++ b/.github/workflows/bi-connectors.yml
@@ -22,6 +22,7 @@ jobs:
     - name: Prepare Power BI ODBC connector
       run: |
         cp SqlOdbcPBIConnector.pq SqlOdbcPBIConnector.m
+      working-directory: bi-connectors/PowerBIConnector
     - name: Pack Power BI ODBC connector
       run: |
         zip OpenSearch-project.mez *.png *.m *.resx *.pqm

From 450d4839f598baedab6e337323da6a165ac1c9d5 Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Fri, 17 Dec 2021 10:09:05 -0800
Subject: [PATCH 10/19] Added some changes to the second PBI connector - they
 should differ more than in filename to make PBI distuingish them

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 .github/workflows/bi-connectors.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/bi-connectors.yml b/.github/workflows/bi-connectors.yml
index 099f05bc27..52af2eaec4 100644
--- a/.github/workflows/bi-connectors.yml
+++ b/.github/workflows/bi-connectors.yml
@@ -10,9 +10,6 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-#    defaults:
-#      run:
-#        working-directory: sql-odbc
     steps:
     - uses: actions/checkout@v1
     - name: Pack Tableau ODBC connector
@@ -31,6 +28,7 @@ jobs:
       run: |
         sed -i 's/<value>OpenSearch<\/value>/<value>Amazon OpenSearch Service<\/value>/g' resources.resx
         sed -i 's/Documentation.Name = "OpenSearch"/Documentation.Name = "Amazon OpenSearch Service"/g' SqlOdbcPBIConnector.m
+        sed -i 's/SqlOdbcPBIConnector\([^1-9]\)/AmazonOpenSearchConnector\1/g' SqlOdbcPBIConnector.m
       working-directory: bi-connectors/PowerBIConnector
     - name: Pack Power BI ODBC connector for 'Amazon OpenSearch Service'
       run: |

From a62bdd17977ad6d510ce077a4f2d439e45a80644 Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Fri, 17 Dec 2021 10:44:51 -0800
Subject: [PATCH 11/19] Renamed PBI connector files

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 .github/workflows/bi-connectors.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/bi-connectors.yml b/.github/workflows/bi-connectors.yml
index 52af2eaec4..a36450103f 100644
--- a/.github/workflows/bi-connectors.yml
+++ b/.github/workflows/bi-connectors.yml
@@ -22,7 +22,7 @@ jobs:
       working-directory: bi-connectors/PowerBIConnector
     - name: Pack Power BI ODBC connector
       run: |
-        zip OpenSearch-project.mez *.png *.m *.resx *.pqm
+        zip OpenSearchProject.mez *.png *.m *.resx *.pqm
       working-directory: bi-connectors/PowerBIConnector
     - name: Prepare the second Power BI ODBC connector
       run: |
@@ -32,7 +32,7 @@ jobs:
       working-directory: bi-connectors/PowerBIConnector
     - name: Pack Power BI ODBC connector for 'Amazon OpenSearch Service'
       run: |
-        zip Amazon-OpenSearch-Service.mez *.png *.m *.resx *.pqm
+        zip AmazonOpenSearchService.mez *.png *.m *.resx *.pqm
       working-directory: bi-connectors/PowerBIConnector
     - name: Upload Tableau ODBC connector
       if: success()

From 47530d0d1acd0d6fc8cc59c1fca2e00149e1d31e Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Fri, 17 Dec 2021 10:57:15 -0800
Subject: [PATCH 12/19] Moved Tableau JDBC connector to bi-connectors

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 .../opensearch_sql_jdbc/META-INF/MANIFEST.MF        |   0
 .../opensearch_sql_jdbc/connection-fields.xml       |   0
 .../opensearch_sql_jdbc/connection-metadata.xml     |   0
 .../opensearch_sql_jdbc/connectionBuilder.js        |   0
 .../opensearch_sql_jdbc/connectionResolver.tdr      |   0
 .../opensearch_sql_jdbc/dialect.tdd                 |   0
 .../opensearch_sql_jdbc/manifest.xml                |   0
 .../opensearch_sql_jdbc_dev.taco                    | Bin
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename {sql-jdbc/src => bi-connectors}/TableauConnector/opensearch_sql_jdbc/META-INF/MANIFEST.MF (100%)
 rename {sql-jdbc/src => bi-connectors}/TableauConnector/opensearch_sql_jdbc/connection-fields.xml (100%)
 rename {sql-jdbc/src => bi-connectors}/TableauConnector/opensearch_sql_jdbc/connection-metadata.xml (100%)
 rename {sql-jdbc/src => bi-connectors}/TableauConnector/opensearch_sql_jdbc/connectionBuilder.js (100%)
 rename {sql-jdbc/src => bi-connectors}/TableauConnector/opensearch_sql_jdbc/connectionResolver.tdr (100%)
 rename {sql-jdbc/src => bi-connectors}/TableauConnector/opensearch_sql_jdbc/dialect.tdd (100%)
 rename {sql-jdbc/src => bi-connectors}/TableauConnector/opensearch_sql_jdbc/manifest.xml (100%)
 rename {sql-jdbc/src => bi-connectors}/TableauConnector/opensearch_sql_jdbc/opensearch_sql_jdbc_dev.taco (100%)

diff --git a/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/META-INF/MANIFEST.MF b/bi-connectors/TableauConnector/opensearch_sql_jdbc/META-INF/MANIFEST.MF
similarity index 100%
rename from sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/META-INF/MANIFEST.MF
rename to bi-connectors/TableauConnector/opensearch_sql_jdbc/META-INF/MANIFEST.MF
diff --git a/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/connection-fields.xml b/bi-connectors/TableauConnector/opensearch_sql_jdbc/connection-fields.xml
similarity index 100%
rename from sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/connection-fields.xml
rename to bi-connectors/TableauConnector/opensearch_sql_jdbc/connection-fields.xml
diff --git a/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/connection-metadata.xml b/bi-connectors/TableauConnector/opensearch_sql_jdbc/connection-metadata.xml
similarity index 100%
rename from sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/connection-metadata.xml
rename to bi-connectors/TableauConnector/opensearch_sql_jdbc/connection-metadata.xml
diff --git a/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/connectionBuilder.js b/bi-connectors/TableauConnector/opensearch_sql_jdbc/connectionBuilder.js
similarity index 100%
rename from sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/connectionBuilder.js
rename to bi-connectors/TableauConnector/opensearch_sql_jdbc/connectionBuilder.js
diff --git a/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/connectionResolver.tdr b/bi-connectors/TableauConnector/opensearch_sql_jdbc/connectionResolver.tdr
similarity index 100%
rename from sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/connectionResolver.tdr
rename to bi-connectors/TableauConnector/opensearch_sql_jdbc/connectionResolver.tdr
diff --git a/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/dialect.tdd b/bi-connectors/TableauConnector/opensearch_sql_jdbc/dialect.tdd
similarity index 100%
rename from sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/dialect.tdd
rename to bi-connectors/TableauConnector/opensearch_sql_jdbc/dialect.tdd
diff --git a/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/manifest.xml b/bi-connectors/TableauConnector/opensearch_sql_jdbc/manifest.xml
similarity index 100%
rename from sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/manifest.xml
rename to bi-connectors/TableauConnector/opensearch_sql_jdbc/manifest.xml
diff --git a/sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/opensearch_sql_jdbc_dev.taco b/bi-connectors/TableauConnector/opensearch_sql_jdbc/opensearch_sql_jdbc_dev.taco
similarity index 100%
rename from sql-jdbc/src/TableauConnector/opensearch_sql_jdbc/opensearch_sql_jdbc_dev.taco
rename to bi-connectors/TableauConnector/opensearch_sql_jdbc/opensearch_sql_jdbc_dev.taco

From 21e0bdf3a3c14506bc54870b900d545dd21060ab Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Fri, 17 Dec 2021 11:09:46 -0800
Subject: [PATCH 13/19] Added packing Tableau JDBC connector For all connectors
 added check for successful packing before publishing

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 .github/workflows/bi-connectors.yml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/bi-connectors.yml b/.github/workflows/bi-connectors.yml
index a36450103f..291fa000d7 100644
--- a/.github/workflows/bi-connectors.yml
+++ b/.github/workflows/bi-connectors.yml
@@ -13,35 +13,50 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Pack Tableau ODBC connector
+      id: pack-tableau-odbc
       run: |
         zip -r opensearch_sql_odbc.taco . -x *.taco
       working-directory: bi-connectors/TableauConnector/opensearch_sql_odbc
+    - name: Pack Tableau JDBC connector
+      id: pack-tableau-jdbc
+      run: |
+        zip -r opensearch_sql_jdbc.taco . -x *.taco
+      working-directory: bi-connectors/TableauConnector/opensearch_sql_jdbc
     - name: Prepare Power BI ODBC connector
       run: |
         cp SqlOdbcPBIConnector.pq SqlOdbcPBIConnector.m
       working-directory: bi-connectors/PowerBIConnector
     - name: Pack Power BI ODBC connector
+      id: pack-powerbi-odbc-os-proj
       run: |
         zip OpenSearchProject.mez *.png *.m *.resx *.pqm
       working-directory: bi-connectors/PowerBIConnector
     - name: Prepare the second Power BI ODBC connector
+      id: prep-powerbi-odbc-amz-os-svc
       run: |
         sed -i 's/<value>OpenSearch<\/value>/<value>Amazon OpenSearch Service<\/value>/g' resources.resx
         sed -i 's/Documentation.Name = "OpenSearch"/Documentation.Name = "Amazon OpenSearch Service"/g' SqlOdbcPBIConnector.m
         sed -i 's/SqlOdbcPBIConnector\([^1-9]\)/AmazonOpenSearchConnector\1/g' SqlOdbcPBIConnector.m
       working-directory: bi-connectors/PowerBIConnector
     - name: Pack Power BI ODBC connector for 'Amazon OpenSearch Service'
+      id: pack-powerbi-odbc-amz-os-svc
       run: |
         zip AmazonOpenSearchService.mez *.png *.m *.resx *.pqm
       working-directory: bi-connectors/PowerBIConnector
     - name: Upload Tableau ODBC connector
-      if: success()
+      if: steps.pack-tableau-odbc.outcome == 'success'
       uses: actions/upload-artifact@v2
       with:
         name: TableauConnector
         path: bi-connectors/TableauConnector/opensearch_sql_odbc/opensearch_sql_odbc.taco
+    - name: Upload Tableau JDBC connector
+      if: steps.pack-tableau-jdbc.outcome == 'success'
+      uses: actions/upload-artifact@v2
+      with:
+        name: TableauConnector
+        path: bi-connectors/TableauConnector/opensearch_sql_jdbc/opensearch_sql_jdbc.taco
     - name: Upload Power BI ODBC connectors
-      if: success()
+      if: steps.pack-powerbi-odbc-os-proj.outcome == 'success' || (steps.prep-powerbi-odbc-amz-os-svc.outcome == 'success' && steps.pack-powerbi-odbc-amz-os-svc.outcome == 'success')
       uses: actions/upload-artifact@v2
       with:
         name: PBIConnectors

From f5692ccdce2c3669c6f2098ef3643bc6602d2404 Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Fri, 17 Dec 2021 12:19:27 -0800
Subject: [PATCH 14/19] Renamed Power BI connector as "OpenSearch Project"

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 .github/workflows/bi-connectors.yml                   | 4 ++--
 bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.pq | 2 +-
 bi-connectors/PowerBIConnector/resources.resx         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/bi-connectors.yml b/.github/workflows/bi-connectors.yml
index 291fa000d7..84bf0aaf20 100644
--- a/.github/workflows/bi-connectors.yml
+++ b/.github/workflows/bi-connectors.yml
@@ -34,8 +34,8 @@ jobs:
     - name: Prepare the second Power BI ODBC connector
       id: prep-powerbi-odbc-amz-os-svc
       run: |
-        sed -i 's/<value>OpenSearch<\/value>/<value>Amazon OpenSearch Service<\/value>/g' resources.resx
-        sed -i 's/Documentation.Name = "OpenSearch"/Documentation.Name = "Amazon OpenSearch Service"/g' SqlOdbcPBIConnector.m
+        sed -i 's/<value>OpenSearch Project<\/value>/<value>Amazon OpenSearch Service<\/value>/g' resources.resx
+        sed -i 's/Documentation.Name = "OpenSearch Project"/Documentation.Name = "Amazon OpenSearch Service"/g' SqlOdbcPBIConnector.m
         sed -i 's/SqlOdbcPBIConnector\([^1-9]\)/AmazonOpenSearchConnector\1/g' SqlOdbcPBIConnector.m
       working-directory: bi-connectors/PowerBIConnector
     - name: Pack Power BI ODBC connector for 'Amazon OpenSearch Service'
diff --git a/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.pq b/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.pq
index 41c5d6845a..830343e6af 100644
--- a/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.pq
+++ b/bi-connectors/PowerBIConnector/SqlOdbcPBIConnector.pq
@@ -19,7 +19,7 @@ SqlOdbcPBIConnectorType = type function (
         ])
     )
     as table meta [
-        Documentation.Name = "OpenSearch"
+        Documentation.Name = "OpenSearch Project"
     ];
 
 SqlOdbcPBIConnectorImpl = (Server as text) as table =>
diff --git a/bi-connectors/PowerBIConnector/resources.resx b/bi-connectors/PowerBIConnector/resources.resx
index 3642a474fe..3db608e458 100644
--- a/bi-connectors/PowerBIConnector/resources.resx
+++ b/bi-connectors/PowerBIConnector/resources.resx
@@ -121,9 +121,9 @@
     <value>Connect to OpenSearch</value>
   </data>
   <data name="ButtonTitle" xml:space="preserve">
-    <value>OpenSearch</value>
+    <value>OpenSearch Project</value>
   </data>
   <data name="DataSourceLabel" xml:space="preserve">
-    <value>OpenSearch</value>
+    <value>OpenSearch Project</value>
   </data>
 </root>
\ No newline at end of file

From a432ac266688125dc149bc87c6d98a1bf4c246e7 Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Fri, 17 Dec 2021 12:28:46 -0800
Subject: [PATCH 15/19] Renamed output artifact

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 .github/workflows/bi-connectors.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/bi-connectors.yml b/.github/workflows/bi-connectors.yml
index 84bf0aaf20..dd2fd82a9f 100644
--- a/.github/workflows/bi-connectors.yml
+++ b/.github/workflows/bi-connectors.yml
@@ -47,13 +47,13 @@ jobs:
       if: steps.pack-tableau-odbc.outcome == 'success'
       uses: actions/upload-artifact@v2
       with:
-        name: TableauConnector
+        name: TableauConnectors
         path: bi-connectors/TableauConnector/opensearch_sql_odbc/opensearch_sql_odbc.taco
     - name: Upload Tableau JDBC connector
       if: steps.pack-tableau-jdbc.outcome == 'success'
       uses: actions/upload-artifact@v2
       with:
-        name: TableauConnector
+        name: TableauConnectors
         path: bi-connectors/TableauConnector/opensearch_sql_jdbc/opensearch_sql_jdbc.taco
     - name: Upload Power BI ODBC connectors
       if: steps.pack-powerbi-odbc-os-proj.outcome == 'success' || (steps.prep-powerbi-odbc-amz-os-svc.outcome == 'success' && steps.pack-powerbi-odbc-amz-os-svc.outcome == 'success')

From 4cadfd18ab9dfdb04fde21dcba0cb97c60c64f5b Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Mon, 20 Dec 2021 11:56:54 -0800
Subject: [PATCH 16/19] Disabled building Tableau ODBC connector, because it is
 not ready for shipping

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 .github/workflows/bi-connectors.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/bi-connectors.yml b/.github/workflows/bi-connectors.yml
index dd2fd82a9f..1211a8c873 100644
--- a/.github/workflows/bi-connectors.yml
+++ b/.github/workflows/bi-connectors.yml
@@ -12,11 +12,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
-    - name: Pack Tableau ODBC connector
-      id: pack-tableau-odbc
-      run: |
-        zip -r opensearch_sql_odbc.taco . -x *.taco
-      working-directory: bi-connectors/TableauConnector/opensearch_sql_odbc
+#    - name: Pack Tableau ODBC connector
+#      id: pack-tableau-odbc
+#      run: |
+#        zip -r opensearch_sql_odbc.taco . -x *.taco
+#      working-directory: bi-connectors/TableauConnector/opensearch_sql_odbc
     - name: Pack Tableau JDBC connector
       id: pack-tableau-jdbc
       run: |
@@ -43,12 +43,12 @@ jobs:
       run: |
         zip AmazonOpenSearchService.mez *.png *.m *.resx *.pqm
       working-directory: bi-connectors/PowerBIConnector
-    - name: Upload Tableau ODBC connector
-      if: steps.pack-tableau-odbc.outcome == 'success'
-      uses: actions/upload-artifact@v2
-      with:
-        name: TableauConnectors
-        path: bi-connectors/TableauConnector/opensearch_sql_odbc/opensearch_sql_odbc.taco
+#    - name: Upload Tableau ODBC connector
+#      if: steps.pack-tableau-odbc.outcome == 'success'
+#      uses: actions/upload-artifact@v2
+#      with:
+#        name: TableauConnectors
+#        path: bi-connectors/TableauConnector/opensearch_sql_odbc/opensearch_sql_odbc.taco
     - name: Upload Tableau JDBC connector
       if: steps.pack-tableau-jdbc.outcome == 'success'
       uses: actions/upload-artifact@v2

From 6e378705eef3c1f779b232680970e895ae85436b Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Mon, 20 Dec 2021 11:59:03 -0800
Subject: [PATCH 17/19] Updated workflow step description

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 .github/workflows/bi-connectors.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bi-connectors.yml b/.github/workflows/bi-connectors.yml
index 1211a8c873..9ffc429a13 100644
--- a/.github/workflows/bi-connectors.yml
+++ b/.github/workflows/bi-connectors.yml
@@ -31,7 +31,7 @@ jobs:
       run: |
         zip OpenSearchProject.mez *.png *.m *.resx *.pqm
       working-directory: bi-connectors/PowerBIConnector
-    - name: Prepare the second Power BI ODBC connector
+    - name: Prepare Power BI ODBC connector for 'Amazon OpenSearch Service'
       id: prep-powerbi-odbc-amz-os-svc
       run: |
         sed -i 's/<value>OpenSearch Project<\/value>/<value>Amazon OpenSearch Service<\/value>/g' resources.resx

From ccb52f469f3acdb1144c3ce1279c7be745a862be Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Mon, 20 Dec 2021 13:16:15 -0800
Subject: [PATCH 18/19] Removed packing ODBC driver for Tableau (re: 4cadfd18).
 Removed Tableau ODBC driver source files since the driver is not supposed to
 be.

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 .github/workflows/bi-connectors.yml           |  11 -
 .../opensearch_sql_odbc/README.md             |   8 -
 .../opensearch_sql_odbc/connection-dialog.tcd |  16 -
 .../opensearch_sql_odbc/connectionBuilder.js  |  42 ---
 .../connectionResolver.tdr                    |  27 --
 .../opensearch_sql_odbc/dialect.tdd           | 323 ------------------
 .../opensearch_sql_odbc/manifest.xml          |  49 ---
 .../opensearch_sql_odbc.taco                  | Bin 3643 -> 0 bytes
 .../opensearch_sql_odbc_dev/README.md         |  11 -
 .../connection-dialog.tcd                     |  16 -
 .../connectionBuilder.js                      |  42 ---
 .../connectionResolver.tdr                    |  27 --
 .../opensearch_sql_odbc_dev/dialect.tdd       |   7 -
 .../opensearch_sql_odbc_dev/manifest.xml      |  21 --
 .../opensearch_sql_odbc_dev.taco              | Bin 2711 -> 0 bytes
 15 files changed, 600 deletions(-)
 delete mode 100644 bi-connectors/TableauConnector/opensearch_sql_odbc/README.md
 delete mode 100644 bi-connectors/TableauConnector/opensearch_sql_odbc/connection-dialog.tcd
 delete mode 100644 bi-connectors/TableauConnector/opensearch_sql_odbc/connectionBuilder.js
 delete mode 100644 bi-connectors/TableauConnector/opensearch_sql_odbc/connectionResolver.tdr
 delete mode 100644 bi-connectors/TableauConnector/opensearch_sql_odbc/dialect.tdd
 delete mode 100644 bi-connectors/TableauConnector/opensearch_sql_odbc/manifest.xml
 delete mode 100644 bi-connectors/TableauConnector/opensearch_sql_odbc/opensearch_sql_odbc.taco
 delete mode 100644 bi-connectors/TableauConnector/opensearch_sql_odbc_dev/README.md
 delete mode 100644 bi-connectors/TableauConnector/opensearch_sql_odbc_dev/connection-dialog.tcd
 delete mode 100644 bi-connectors/TableauConnector/opensearch_sql_odbc_dev/connectionBuilder.js
 delete mode 100644 bi-connectors/TableauConnector/opensearch_sql_odbc_dev/connectionResolver.tdr
 delete mode 100644 bi-connectors/TableauConnector/opensearch_sql_odbc_dev/dialect.tdd
 delete mode 100644 bi-connectors/TableauConnector/opensearch_sql_odbc_dev/manifest.xml
 delete mode 100644 bi-connectors/TableauConnector/opensearch_sql_odbc_dev/opensearch_sql_odbc_dev.taco

diff --git a/.github/workflows/bi-connectors.yml b/.github/workflows/bi-connectors.yml
index 9ffc429a13..6b6124139e 100644
--- a/.github/workflows/bi-connectors.yml
+++ b/.github/workflows/bi-connectors.yml
@@ -12,11 +12,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
-#    - name: Pack Tableau ODBC connector
-#      id: pack-tableau-odbc
-#      run: |
-#        zip -r opensearch_sql_odbc.taco . -x *.taco
-#      working-directory: bi-connectors/TableauConnector/opensearch_sql_odbc
     - name: Pack Tableau JDBC connector
       id: pack-tableau-jdbc
       run: |
@@ -43,12 +38,6 @@ jobs:
       run: |
         zip AmazonOpenSearchService.mez *.png *.m *.resx *.pqm
       working-directory: bi-connectors/PowerBIConnector
-#    - name: Upload Tableau ODBC connector
-#      if: steps.pack-tableau-odbc.outcome == 'success'
-#      uses: actions/upload-artifact@v2
-#      with:
-#        name: TableauConnectors
-#        path: bi-connectors/TableauConnector/opensearch_sql_odbc/opensearch_sql_odbc.taco
     - name: Upload Tableau JDBC connector
       if: steps.pack-tableau-jdbc.outcome == 'success'
       uses: actions/upload-artifact@v2
diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc/README.md b/bi-connectors/TableauConnector/opensearch_sql_odbc/README.md
deleted file mode 100644
index c136140744..0000000000
--- a/bi-connectors/TableauConnector/opensearch_sql_odbc/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-## opensearch_sql_odbc
-
-The connector files in `opensearch_sql_odbc` can be used to connect to OpenSearch server in Tableau.
-
-* These connector files remove and modify a set of unsupported functions and operations.
-* It includes set of capabilities to customize and tune connector behavior
-
-To use this connector with Tableau, [Package the connector](https://tableau.github.io/connector-plugin-sdk/docs/package-sign) and [Run Packaged Connector (TACO file)](https://tableau.github.io/connector-plugin-sdk/docs/run-taco)
\ No newline at end of file
diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc/connection-dialog.tcd b/bi-connectors/TableauConnector/opensearch_sql_odbc/connection-dialog.tcd
deleted file mode 100644
index f7ae8da245..0000000000
--- a/bi-connectors/TableauConnector/opensearch_sql_odbc/connection-dialog.tcd
+++ /dev/null
@@ -1,16 +0,0 @@
-<connection-dialog class='opensearch_sql_odbc'>
-  <connection-config>  
-    <authentication-mode value='ComboBoxIntegrated' />
-        <authentication-options>
-            <option name="None" value="NONE" default="true" />
-            <option name="Integrated" value="AWS_SIGV4" />
-            <option name="UsernameAndPassword" value="BASIC" />
-        </authentication-options>
-    <port-prompt value="Port: " default="9200" />
-    <show-ssl-checkbox value="true" />
-    <vendor1-prompt value="Region: " />
-    <vendor2-prompt value="Additional Options: " />
-    <has-databases value="false" />
-    <has-schemas value="false" />
-  </connection-config>
-</connection-dialog>
diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc/connectionBuilder.js b/bi-connectors/TableauConnector/opensearch_sql_odbc/connectionBuilder.js
deleted file mode 100644
index b5a04d1777..0000000000
--- a/bi-connectors/TableauConnector/opensearch_sql_odbc/connectionBuilder.js
+++ /dev/null
@@ -1,42 +0,0 @@
-(function dsbuilder(attr){
-    var params = {};
-
-    // Set host information in connection string
-    params["SERVER"] = attr[connectionHelper.attributeServer];
-    params["PORT"] = attr[connectionHelper.attributePort];
-
-    // Set authentication values in connection string
-    var authAttrValue = attr[connectionHelper.attributeAuthentication];
-    params["Auth"] = attr[connectionHelper.attributeAuthentication];
-    if (authAttrValue == "AWS_SIGV4"){
-        params["Region"] = attr[connectionHelper.attributeVendor1];
-    } else if (authAttrValue == "BASIC"){
-        params["UID"] = attr[connectionHelper.attributeUsername];
-        params["PWD"] = attr[connectionHelper.attributePassword];
-    }
-
-    // Set SSL value in connection string 
-    if (attr[connectionHelper.attributeSSLMode] == "require"){
-        params["useSSL"] = "1";
-    } else {
-        params["useSSL"] = "0";
-    }
-
-    // Parse additional options and add in connection string
-    var odbcConnectStringExtrasMap = {};
-    const attributeODBCConnectStringExtras = "vendor2";
-    if (attributeODBCConnectStringExtras in attr){
-        odbcConnectStringExtrasMap = connectionHelper.ParseODBCConnectString(attr[attributeODBCConnectStringExtras]);
-    }
-    for (var key in odbcConnectStringExtrasMap){
-        params[key] = odbcConnectStringExtrasMap[key];
-    }
-
-    // Format the attributes as 'key=value'
-    var formattedParams = [];
-    formattedParams.push(connectionHelper.formatKeyValuePair(driverLocator.keywordDriver, driverLocator.locateDriver(attr)));
-    for (var key in params){
-        formattedParams.push(connectionHelper.formatKeyValuePair(key, params[key]));
-    }
-    return formattedParams;
-})
diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc/connectionResolver.tdr b/bi-connectors/TableauConnector/opensearch_sql_odbc/connectionResolver.tdr
deleted file mode 100644
index 68c376270c..0000000000
--- a/bi-connectors/TableauConnector/opensearch_sql_odbc/connectionResolver.tdr
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<tdr class='opensearch_sql_odbc'>
-  <connection-resolver>
-    <connection-builder>
-      <script file='connectionBuilder.js'/>
-    </connection-builder>
-    <connection-normalizer>
-      <required-attributes>
-        <attribute-list>
-          <attr>server</attr>
-          <attr>port</attr>
-          <attr>authentication</attr>
-          <attr>username</attr>
-          <attr>password</attr>
-          <attr>sslmode</attr>
-          <attr>vendor1</attr>
-          <attr>vendor2</attr>
-        </attribute-list>
-      </required-attributes>
-    </connection-normalizer>
-  </connection-resolver>
-  <driver-resolver>
-    <driver-match >
-      <driver-name type='regex'>OpenSearch SQL ODBC*</driver-name>
-    </driver-match>
-  </driver-resolver>
-</tdr>
diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc/dialect.tdd b/bi-connectors/TableauConnector/opensearch_sql_odbc/dialect.tdd
deleted file mode 100644
index e34857ce07..0000000000
--- a/bi-connectors/TableauConnector/opensearch_sql_odbc/dialect.tdd
+++ /dev/null
@@ -1,323 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dialect name='OpenSearchSqlOdbcDialect'
-         class='opensearch_sql_odbc'
-         base='MySQL41UnicodeDriverDialect'
-         version='18.1'>   
-   <function-map>
-        <function group='operator' name='!=' return-type='bool'>
-            <formula>(%1 AND NOT %2 OR NOT %1 AND %2)</formula>
-            <argument type='bool' />
-            <argument type='bool' />
-        </function>
-        <function group='operator' name='!=' return-type='bool'>
-            <formula>(%1 AND %2 = 0 OR NOT %1 AND %2 &lt;&gt; 0)</formula>
-            <argument type='bool' />
-            <argument type='int' />
-        </function>
-        <function group='operator' name='!=' return-type='bool'>
-            <formula>(%1 &lt;&gt; %2)</formula>
-            <argument type='real' />
-            <argument type='real' />
-        </function>
-        <function group='operator' name='!=' return-type='bool'>
-            <formula>(%1 = 0 AND %2 OR %1 &lt;&gt; 0 AND NOT %2)</formula>
-            <argument type='int' />
-            <argument type='bool' />
-        </function>
-        <function group='operator' name='!=' return-type='bool'>
-            <formula>(%1 &lt;&gt; %2)</formula>
-            <argument type='str' />
-            <argument type='str' />
-        </function>
-    
-        <function group='date' name='DAYOFYEAR' return-type='int'>
-            <formula>DAY_OF_YEAR(%1)</formula>
-            <argument type='date' />
-        </function>
-        <function group='date' name='DAYOFMONTH' return-type='int'>
-            <formula>DAY_OF_MONTH(%1)</formula>
-            <argument type='date' />
-        </function>
-        <function group='date' name='DAYOFWEEK' return-type='int'>
-            <formula>DAY_OF_WEEK(%1)</formula>
-            <argument type='date' />
-        </function>
-
-        <remove-function name='ASCII'>
-            <argument type='str' />
-        </remove-function>
-
-        <remove-function name='FIND'>
-            <argument type='str' />
-            <argument type='str' />
-        </remove-function>
-        <remove-function name='FIND'>
-            <argument type='str' />
-            <argument type='str' />
-            <argument type='real' />
-        </remove-function>
-        <remove-function name='FIND'>
-            <argument type='str' />
-            <argument type='str' />
-            <argument type='int' />        
-        </remove-function>
-        <remove-function name='FINDNTH'>
-            <argument type='str' />
-            <argument type='str' />
-            <argument type='real' />        
-        </remove-function>
-
-        <remove-function name='DATETRUNC'>
-            <argument type='localstr' />
-            <argument type='date' />
-            <argument type='localstr' />
-        </remove-function>
-        <remove-function name='DATETRUNC'>
-            <argument type='localstr' />
-            <argument type='datetime' />
-            <argument type='localstr' />
-        </remove-function>
-        <remove-function name='DATETRUNC'>
-            <argument type='localstr' />
-            <argument type='date' />
-        </remove-function>
-        <remove-function name='DATETRUNC'>
-            <argument type='localstr' />
-            <argument type='datetime' />
-        </remove-function>
-
-        <remove-function name='DATEPART'>
-            <argument type='localstr' />
-            <argument type='date' />
-            <argument type='localstr' />
-        </remove-function>
-        <remove-function name='DATEPART'>
-            <argument type='localstr' />
-            <argument type='datetime' />
-            <argument type='localstr' />
-        </remove-function>
-        <remove-function name='DATEPART'>
-            <argument type='localstr' />
-            <argument type='date' />
-        </remove-function>
-        <remove-function name='DATEPART'>
-            <argument type='localstr' />
-            <argument type='datetime' />
-        </remove-function>
-
-        <remove-function name='DATEPARSE'>
-            <argument type='localstr' />
-            <argument type='str' />
-        </remove-function>
-
-        <remove-function name='DATENAME'>
-            <argument type='localstr' />
-            <argument type='date' />
-            <argument type='localstr' />
-        </remove-function>
-        <remove-function name='DATENAME'>
-            <argument type='localstr' />
-            <argument type='datetime' />
-            <argument type='localstr' />
-        </remove-function>
-        <remove-function name='DATENAME'>
-            <argument type='localstr' />
-            <argument type='date' />
-        </remove-function>
-        <remove-function name='DATENAME'>
-            <argument type='localstr' />
-            <argument type='datetime' />
-        </remove-function>
-
-        <remove-function name='DATEDIFF'>
-            <argument type='localstr' />
-            <argument type='date' />
-            <argument type='date' />
-            <argument type='localstr' />
-        </remove-function>
-        <remove-function name='DATEDIFF'>
-            <argument type='localstr' />
-            <argument type='date' />
-            <argument type='datetime' />
-            <argument type='localstr' />
-        </remove-function>
-        <remove-function name='DATEDIFF'>
-            <argument type='localstr' />
-            <argument type='datetime' />
-            <argument type='date' />
-            <argument type='localstr' />
-        </remove-function>
-        <remove-function name='DATEDIFF'>
-            <argument type='localstr' />
-            <argument type='datetime' />
-            <argument type='datetime' />
-            <argument type='localstr' />
-        </remove-function>
-        <remove-function name='DATEDIFF'>
-            <argument type='localstr' />
-            <argument type='date' />
-            <argument type='date' />
-        </remove-function>
-        <remove-function name='DATEDIFF'>
-            <argument type='localstr' />
-            <argument type='date' />
-            <argument type='datetime' />
-        </remove-function>
-        <remove-function name='DATEDIFF'>
-            <argument type='localstr' />
-            <argument type='datetime' />
-            <argument type='date' />
-        </remove-function>
-        <remove-function name='DATEDIFF'>
-            <argument type='localstr' />
-            <argument type='datetime' />
-            <argument type='datetime' />
-        </remove-function>
-
-        <remove-function name='DATEADD'>
-            <argument type='localstr' />
-            <argument type='int' />
-            <argument type='datetime' />
-        </remove-function>
-        <remove-function name='DATEADD'>
-            <argument type='localstr' />
-            <argument type='real' />
-            <argument type='datetime' />
-        </remove-function>
-
-        <remove-function name='USEC_TO_TIMESTAMP'>
-            <argument type='int' />
-        </remove-function>
-
-        <remove-function name='TIMESTAMP_TO_USEC'>
-            <argument type='datetime' />
-        </remove-function>
-
-        <remove-function name='MAX'>
-            <argument type='datetime' />
-            <argument type='datetime' />
-        </remove-function>
-        <remove-function name='MAX'>
-            <argument type='date' />
-            <argument type='date' />
-        </remove-function>
-        <remove-function name='MAX'>
-            <argument type='str' />
-        </remove-function>
-        <remove-function name='MAX'>
-            <argument type='date' />
-        </remove-function>
-        <remove-function name='MAX'>
-            <argument type='datetime' />
-        </remove-function>
-
-        <remove-function name='MIN'>
-            <argument type='datetime' />
-            <argument type='datetime' />
-        </remove-function>
-        <remove-function name='MIN'>
-            <argument type='date' />
-            <argument type='date' />
-        </remove-function>
-        <remove-function name='MIN'>
-            <argument type='str' />
-        </remove-function>
-        <remove-function name='MIN'>
-            <argument type='date' />
-        </remove-function>
-        <remove-function name='MIN'>
-            <argument type='datetime' />
-        </remove-function> 
-
-        <remove-function name='STDEV'>
-            <argument type='real' />
-        </remove-function>  
-
-        <remove-function name='STDEVP'>
-            <argument type='real' />
-        </remove-function>   
-
-        <remove-function name='VAR'>
-            <argument type='real' />
-        </remove-function> 
-
-        <remove-function name='VARP'>
-            <argument type='real' />
-        </remove-function>   
- 
-        <remove-function name='!='>
-            <argument type='str' />
-            <argument type='datetime' />
-        </remove-function>   
-        <remove-function name='!='>
-            <argument type='datetime' />
-            <argument type='str' />
-        </remove-function>   
-        <remove-function name='!='>
-            <argument type='datetime' />
-            <argument type='datetime' />
-        </remove-function>   
-        <remove-function name='!='>
-            <argument type='datetime' />
-            <argument type='date' />
-        </remove-function>   
-        <remove-function name='!='>
-            <argument type='date' />
-            <argument type='datetime' />
-        </remove-function>   
-        <remove-function name='!='>
-            <argument type='date' />
-            <argument type='date' />
-        </remove-function>   
-
-        <remove-function name='+'>
-            <argument type='datetime' />
-            <argument type='real' />
-        </remove-function>   
-        <remove-function name='+'>
-            <argument type='datetime' />
-            <argument type='int' />
-        </remove-function>   
-        <remove-function name='+'>
-            <argument type='date' />
-            <argument type='real' />
-        </remove-function>   
-        <remove-function name='+'>
-            <argument type='date' />
-            <argument type='int' />
-        </remove-function>   
-        
-        <remove-function name='-'>
-            <argument type='datetime' />
-            <argument type='real' />
-        </remove-function>   
-        <remove-function name='-'>
-            <argument type='datetime' />
-            <argument type='int' />
-        </remove-function>   
-        <remove-function name='-'>
-            <argument type='date' />
-            <argument type='real' />
-        </remove-function>   
-        <remove-function name='-'>
-            <argument type='date' />
-            <argument type='int' />
-        </remove-function>   
-        <remove-function name='-'>
-            <argument type='datetime' />
-            <argument type='datetime' />
-        </remove-function>   
-        <remove-function name='-'>
-            <argument type='datetime' />
-            <argument type='date' />
-        </remove-function>   
-        <remove-function name='-'>
-            <argument type='date' />
-            <argument type='datetime' />
-        </remove-function>   
-        <remove-function name='-'>
-            <argument type='date' />
-            <argument type='date' />
-        </remove-function>                   
-   </function-map>
-</dialect>
diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc/manifest.xml b/bi-connectors/TableauConnector/opensearch_sql_odbc/manifest.xml
deleted file mode 100644
index 1d51e03f8b..0000000000
--- a/bi-connectors/TableauConnector/opensearch_sql_odbc/manifest.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-
-<connector-plugin class='opensearch_sql_odbc' superclass='odbc' plugin-version='1.2.0.0' name='SQL' version='18.1' min-version-tableau='2020.1'>
-  <vendor-information>
-      <company name="OpenSearch for ES"/>
-      <support-link url="https://github.com/opensearch-project/sql"/>
-      <driver-download-link url="https://github.com/opensearch-project/sql"/>
-  </vendor-information>
-  <connection-customization class="opensearch_sql_odbc" enabled="true" version="10.0">
-    <vendor name="OpenSearch for ES"/>
-    <driver name="SQL"/>
-    <customizations>
-      <customization name="CAP_CREATE_TEMP_TABLES" value="no"/>
-      <customization name="CAP_SUPPRESS_DISCOVERY_QUERIES" value="yes" />
-      <customization name="CAP_SELECT_INTO" value="no"/>
-      <customization name="CAP_SELECT_TOP_INTO" value="no"/>
-      <customization name="CAP_QUERY_BOOLEXPR_TO_INTEXPR" value="no"/>
-      <customization name="CAP_QUERY_GROUP_BY_BOOL" value="yes"/>
-      <customization name="CAP_QUERY_GROUP_BY_DEGREE" value="yes"/>
-      <customization name="CAP_QUERY_SORT_BY" value="yes"/>
-      <customization name="CAP_QUERY_SUBQUERIES" value="yes"/>
-      <customization name="CAP_QUERY_TOP_N" value="yes"/>
-      <customization name="CAP_QUERY_TOP_SAMPLE" value="yes"/>
-      <customization name="CAP_QUERY_TOP_SAMPLE_PERCENT" value="yes"/>
-      <customization name="CAP_QUERY_WHERE_FALSE_METADATA" value="yes"/>
-      <customization name="CAP_QUERY_SUBQUERIES_WITH_TOP" value="yes"/>
-      <customization name="CAP_SUPPORTS_SPLIT_FROM_LEFT" value="yes"/>
-      <customization name="CAP_SUPPORTS_SPLIT_FROM_RIGHT" value="yes"/>
-      <customization name="CAP_QUERY_ALLOW_PARTIAL_AGGREGATION" value="no"/>
-      <customization name="CAP_QUERY_TIME_REQUIRES_CAST" value="yes"/>
-      <customization name="CAP_ODBC_METADATA_FORCE_NUM_PREC_RADIX_10" value="yes"/>
-      <customization name="CAP_ODBC_METADATA_FORCE_LENGTH_AS_PRECISION" value="yes"/>
-      <customization name="CAP_ODBC_SUPPRESS_INFO_SCHEMA_TABLES" value="yes"/>
-      <customization name="CAP_ODBC_SUPPRESS_PG_TEMP_SCHEMA_TABLES" value="yes"/>
-      <customization name="CAP_ODBC_METADATA_SUPPRESS_SQLSTATISTICS_API" value="yes"/>
-      <customization name="CAP_SUPPORTS_SPLIT_FROM_RIGHT" value="no"/>
-      <customization name="CAP_CONNECT_STORED_PROCEDURE" value="no"/>
-      <!-- 
-      CAP_SUPPRESS_GET_SERVER_TIME will fix the error while creating extract in tableau.
-      This can be removed when OpenSearch supports query without FROM clause.
-      For smore details: https://community.tableau.com/message/1092123?et=watches.email.thread#1092123
-      -->
-      <customization name="CAP_SUPPRESS_GET_SERVER_TIME" value="yes"/>
-    </customizations>
-  </connection-customization>
-  <connection-dialog file='connection-dialog.tcd'/>
-  <connection-resolver file="connectionResolver.tdr"/>
-  <dialect file='dialect.tdd'/>
-</connector-plugin>
diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc/opensearch_sql_odbc.taco b/bi-connectors/TableauConnector/opensearch_sql_odbc/opensearch_sql_odbc.taco
deleted file mode 100644
index b90cd86d3cf9ed8313f8b6e215e1066230c6d342..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3643
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

diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/README.md b/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/README.md
deleted file mode 100644
index fad6167db2..0000000000
--- a/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-## opensearch_sql_odbc_dev
-
-The connector files in `opensearch_sql_odbc_dev` can be used for development purposes. 
-
-* Use this connector while running tdvt tests to identify the areas for improving query support.
-* These connector files do not remove or modify any dialect function.
-* It includes minimum set of capabilities required to connect to data source.
-
-To use this connector with Tableau, follow instructions at [Run Your "Under Development" Connector](https://tableau.github.io/connector-plugin-sdk/docs/share)
-
-To test this connector with TDVT, follow instructions at [Test with TDVT Suite](https://tableau.github.io/connector-plugin-sdk/docs/tdvt)
\ No newline at end of file
diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/connection-dialog.tcd b/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/connection-dialog.tcd
deleted file mode 100644
index bd7bae2aa2..0000000000
--- a/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/connection-dialog.tcd
+++ /dev/null
@@ -1,16 +0,0 @@
-<connection-dialog class='opensearch_sql_odbc_dev'>
-  <connection-config>  
-    <authentication-mode value='ComboBoxIntegrated' />
-        <authentication-options>
-            <option name="None" value="NONE" default="true" />
-            <option name="Integrated" value="AWS_SIGV4" />
-            <option name="UsernameAndPassword" value="BASIC" />
-        </authentication-options>
-    <port-prompt value="Port: " default="9200" />
-    <show-ssl-checkbox value="true" />
-    <vendor1-prompt value="Region: " />
-    <vendor2-prompt value="Additional Options: " />
-    <has-databases value="false" />
-    <has-schemas value="false" />
-  </connection-config>
-</connection-dialog>
diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/connectionBuilder.js b/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/connectionBuilder.js
deleted file mode 100644
index b5a04d1777..0000000000
--- a/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/connectionBuilder.js
+++ /dev/null
@@ -1,42 +0,0 @@
-(function dsbuilder(attr){
-    var params = {};
-
-    // Set host information in connection string
-    params["SERVER"] = attr[connectionHelper.attributeServer];
-    params["PORT"] = attr[connectionHelper.attributePort];
-
-    // Set authentication values in connection string
-    var authAttrValue = attr[connectionHelper.attributeAuthentication];
-    params["Auth"] = attr[connectionHelper.attributeAuthentication];
-    if (authAttrValue == "AWS_SIGV4"){
-        params["Region"] = attr[connectionHelper.attributeVendor1];
-    } else if (authAttrValue == "BASIC"){
-        params["UID"] = attr[connectionHelper.attributeUsername];
-        params["PWD"] = attr[connectionHelper.attributePassword];
-    }
-
-    // Set SSL value in connection string 
-    if (attr[connectionHelper.attributeSSLMode] == "require"){
-        params["useSSL"] = "1";
-    } else {
-        params["useSSL"] = "0";
-    }
-
-    // Parse additional options and add in connection string
-    var odbcConnectStringExtrasMap = {};
-    const attributeODBCConnectStringExtras = "vendor2";
-    if (attributeODBCConnectStringExtras in attr){
-        odbcConnectStringExtrasMap = connectionHelper.ParseODBCConnectString(attr[attributeODBCConnectStringExtras]);
-    }
-    for (var key in odbcConnectStringExtrasMap){
-        params[key] = odbcConnectStringExtrasMap[key];
-    }
-
-    // Format the attributes as 'key=value'
-    var formattedParams = [];
-    formattedParams.push(connectionHelper.formatKeyValuePair(driverLocator.keywordDriver, driverLocator.locateDriver(attr)));
-    for (var key in params){
-        formattedParams.push(connectionHelper.formatKeyValuePair(key, params[key]));
-    }
-    return formattedParams;
-})
diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/connectionResolver.tdr b/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/connectionResolver.tdr
deleted file mode 100644
index a5ec0b346d..0000000000
--- a/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/connectionResolver.tdr
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<tdr class='opensearch_sql_odbc_dev'>
-  <connection-resolver>
-    <connection-builder>
-      <script file='connectionBuilder.js'/>
-    </connection-builder>
-    <connection-normalizer>
-      <required-attributes>
-        <attribute-list>
-          <attr>server</attr>
-          <attr>port</attr>
-          <attr>authentication</attr>
-          <attr>username</attr>
-          <attr>password</attr>
-          <attr>sslmode</attr>
-          <attr>vendor1</attr>
-          <attr>vendor2</attr>
-        </attribute-list>
-      </required-attributes>
-    </connection-normalizer>
-  </connection-resolver>
-  <driver-resolver>
-    <driver-match >
-      <driver-name type='regex'>OpenSearch SQL ODBC*</driver-name>
-    </driver-match>
-  </driver-resolver>
-</tdr>
diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/dialect.tdd b/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/dialect.tdd
deleted file mode 100644
index 26cdbc43fd..0000000000
--- a/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/dialect.tdd
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<dialect name='OpenSearchSqlOdbcDialect'
-         class='opensearch_sql_odbc_dev'
-         base='MySQL41UnicodeDriverDialect'
-         version='18.1'>   
-</dialect>
-
diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/manifest.xml b/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/manifest.xml
deleted file mode 100644
index d43888fdb9..0000000000
--- a/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/manifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-
-<connector-plugin class='opensearch_sql_odbc_dev' superclass='odbc' plugin-version='1.2.0.0' name='OpenSearch SQL ODBC DEV' version='18.1' min-version-tableau='2020.1'>
-  <vendor-information>
-      <company name="OpenSearch"/>
-      <support-link url="https://github.com/opensearch-project/sql"/>
-      <driver-download-link url="https://github.com/opensearch-project/sql"/>
-  </vendor-information>
-  <connection-customization class="opensearch_sql_odbc_dev" enabled="true" version="10.0">
-    <vendor name="OpenSearch"/>
-    <driver name="SQL"/>
-    <customizations>
-      <customization name="CAP_CREATE_TEMP_TABLES" value="no"/>
-      <customization name="CAP_SUPPRESS_DISCOVERY_QUERIES" value="yes" />
-      <customization name="CAP_QUERY_SORT_BY" value="yes"/>
-    </customizations>
-  </connection-customization>
-  <connection-dialog file='connection-dialog.tcd'/>
-  <connection-resolver file="connectionResolver.tdr"/>
-  <dialect file='dialect.tdd'/>
-</connector-plugin>
diff --git a/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/opensearch_sql_odbc_dev.taco b/bi-connectors/TableauConnector/opensearch_sql_odbc_dev/opensearch_sql_odbc_dev.taco
deleted file mode 100644
index 1eb7797c04af3fc8fde3c402b7fb4447dd47c3da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2711
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
W3kl_5P!Ry&WL$L&$)o;snEwN`YAG53


From 2e676263b8cb4a0403fc74dc873f27be93ef19ae Mon Sep 17 00:00:00 2001
From: Yury Fridlyand <yuryf@bitquilltech.com>
Date: Tue, 21 Dec 2021 10:41:46 -0800
Subject: [PATCH 19/19] Updated workflow, because connector source files were
 renamed after merge

Signed-off-by: Yury Fridlyand <yuryf@bitquilltech.com>
---
 .github/workflows/bi-connectors.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/bi-connectors.yml b/.github/workflows/bi-connectors.yml
index 6b6124139e..e23489e17a 100644
--- a/.github/workflows/bi-connectors.yml
+++ b/.github/workflows/bi-connectors.yml
@@ -19,7 +19,7 @@ jobs:
       working-directory: bi-connectors/TableauConnector/opensearch_sql_jdbc
     - name: Prepare Power BI ODBC connector
       run: |
-        cp SqlOdbcPBIConnector.pq SqlOdbcPBIConnector.m
+        cp OpenSearch.pq OpenSearch.m
       working-directory: bi-connectors/PowerBIConnector
     - name: Pack Power BI ODBC connector
       id: pack-powerbi-odbc-os-proj
@@ -30,8 +30,8 @@ jobs:
       id: prep-powerbi-odbc-amz-os-svc
       run: |
         sed -i 's/<value>OpenSearch Project<\/value>/<value>Amazon OpenSearch Service<\/value>/g' resources.resx
-        sed -i 's/Documentation.Name = "OpenSearch Project"/Documentation.Name = "Amazon OpenSearch Service"/g' SqlOdbcPBIConnector.m
-        sed -i 's/SqlOdbcPBIConnector\([^1-9]\)/AmazonOpenSearchConnector\1/g' SqlOdbcPBIConnector.m
+        sed -i 's/Documentation.Name = "OpenSearch Project"/Documentation.Name = "Amazon OpenSearch Service"/g' OpenSearch.m
+        sed -i 's/OpenSearch\([^1-9]\)/AmazonOpenSearchConnector\1/g' OpenSearch.m
       working-directory: bi-connectors/PowerBIConnector
     - name: Pack Power BI ODBC connector for 'Amazon OpenSearch Service'
       id: pack-powerbi-odbc-amz-os-svc