Merge main into 1.x

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
+*   @opensearch-project/sql

.github/workflows/backport.yml

@@ -0,0 +1,28 @@
+name: Backport
+on:
+  pull_request_target:
+    types:
+      - closed
+      - labeled
+
+jobs:
+  backport:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    name: Backport
+    steps:
+      - name: GitHub App token
+        id: github_app_token
+        uses: tibdex/github-app-token@v1.5.0
+        with:
+          app_id: ${{ secrets.APP_ID }}
+          private_key: ${{ secrets.APP_PRIVATE_KEY }}
+          installation_id: 22958780
+
+      - name: Backport
+        uses: VachaShah/backport@v1.1.4
+        with:
+          github_token: ${{ steps.github_app_token.outputs.token }}
+          branch_name: backport/backport-${{ github.event.number }}

.github/workflows/bi-connectors.yml

@@ -0,0 +1,54 @@
+name: Build connectors for BI tools
+
+on:
+  push:
+    paths:
+      - 'bi-connectors/PowerBIConnector/**'
+      - 'bi-connectors/TableauConnector/**'
+      - '.github/workflows/bi-connectors.yml'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - 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 for 'OpenSearch Project'
+      run: |
+        cp OpenSearchProject.pq OpenSearchProject.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 Power BI ODBC connector for 'Amazon OpenSearch Service'
+      id: prep-powerbi-odbc-amz-os-svc
+      run: |
+        mv OpenSearchProject.m AmazonOpenSearchService.m
+        sed -i 's/<value>OpenSearch Project<\/value>/<value>Amazon OpenSearch Service<\/value>/g' resources.resx
+        sed -i 's/OpenSearch Project/Amazon OpenSearch Service/g' AmazonOpenSearchService.m
+        sed -i 's/OpenSearchProject/AmazonOpenSearchService/g' AmazonOpenSearchService.m
+        sed -i 's/opensearchproject/amazonopensearchservice/g' AmazonOpenSearchService.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 JDBC connector
+      if: steps.pack-tableau-jdbc.outcome == 'success'
+      uses: actions/upload-artifact@v2
+      with:
+        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')
+      uses: actions/upload-artifact@v2
+      with:
+        name: PBIConnectors
+        path: 'bi-connectors/PowerBIConnector/*.mez'

.github/workflows/dco.yml

@@ -0,0 +1,18 @@
+name: Developer Certificate of Origin Check
+
+on: [pull_request]
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Get PR Commits
+        id: 'get-pr-commits'
+        uses: tim-actions/get-pr-commits@v1.1.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: DCO Check
+        uses: tim-actions/dco@v1.1.0
+        with:
+          commits: ${{ steps.get-pr-commits.outputs.commits }}

.github/workflows/delete_backport_branch.yml

@@ -0,0 +1,15 @@
+name: Delete merged branch of the backport PRs
+on: 
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  delete-branch:
+    runs-on: ubuntu-latest
+    if: startsWith(github.event.pull_request.head.ref,'backport/')
+    steps:
+      - name: Delete merged branch
+        uses: SvanBoxel/delete-merged-branch@main
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/draft-release-notes-workflow.yml

@@ -16,6 +16,6 @@ jobs:
         with:
           config-name: draft-release-notes-config.yml
           tag: (None)
-          version: 1.1.0.0
+          version: 1.3.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/link-checker.yml

@@ -16,7 +16,7 @@ jobs:
         id: lychee
         uses: lycheeverse/lychee-action@master
         with:
-          args: --accept=200,403,429,999  "**/*.html" "**/*.md" "**/*.txt" --exclude "http://localhost*" "https://localhost" "https://odfe-node1:9200/" "https://community.tableau.com/docs/DOC-17978" ".*family.zzz" "https://pypi.python.org/pypi/opensearch-sql-cli/" "opensearch*" ".*@amazon.com" ".*email.com" "git@github.com" "http://timestamp.verisign.com/scripts/timstamp.dll"
+          args: --accept=200,403,429,999  "./**/*.html" "./**/*.md" "./**/*.txt" --exclude "http://localhost*" "https://localhost" "https://odfe-node1:9200/" "https://community.tableau.com/docs/DOC-17978" ".*family.zzz" "https://pypi.python.org/pypi/opensearchsql/" "opensearch*" ".*@amazon.com" ".*email.com" "git@github.com" "http://timestamp.verisign.com/scripts/timstamp.dll" ".*/PowerBIConnector/bin/Release"
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
       - name: Fail if there were link errors

.github/workflows/sql-cli-test-and-build-workflow.yml

@@ -53,11 +53,11 @@ jobs:
 
       - name: Create Artifact Path
         run: |
-          mkdir -p opensearch-sql-cli-builds
-          cp -r ./dist/*.tar.gz ./dist/*.whl opensearch-sql-cli-builds/
+          mkdir -p opensearchsql-builds
+          cp -r ./dist/*.tar.gz ./dist/*.whl opensearchsql-builds/
 
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
         with:
-          name: opensearch-sql-cli
-          path: sql-cli/opensearch-sql-cli-builds
+          name: opensearchsql
+          path: sql-cli/opensearchsql-builds

.github/workflows/sql-odbc-main.yml

@@ -11,7 +11,7 @@ env:
 
 jobs:    
   build-mac:
-    runs-on: macos-latest
+    runs-on: macos-10.15
     defaults:
       run:
         working-directory: sql-odbc
@@ -78,7 +78,7 @@ jobs:
     #    name: mac-test-results
     #    path: test-output
   build-windows32:
-    runs-on: windows-latest
+    runs-on: windows-2019
     defaults:
       run:
         working-directory: sql-odbc
@@ -123,7 +123,7 @@ jobs:
     #    name: windows-test-results
     #    path: $CI_OUTPUT_PATH/test
   build-windows64:
-    runs-on: windows-latest
+    runs-on: windows-2019
     defaults:
       run:
         working-directory: sql-odbc

.github/workflows/sql-odbc-release-workflow.yml

@@ -12,11 +12,11 @@ env:
   ODBC_BUILD_PATH: "./build/odbc/build"
   AWS_SDK_INSTALL_PATH: "./build/aws-sdk/install"
   PLUGIN_NAME: opensearch-sql-odbc
-  OD_VERSION: 1.1.0.0
+  OD_VERSION: 1.3.0.0
 
 jobs:
   build-mac:
-    runs-on: macos-latest
+    runs-on: macos-10.15
     defaults:
       run:
         working-directory: sql-odbc

.github/workflows/sql-odbc-rename-and-release-workflow.yml

@@ -8,7 +8,7 @@ on:
       - rename*
 
 env:
-  OD_VERSION: 1.1.0.0
+  OD_VERSION: 1.3.0.0
 
 jobs:
   upload-odbc:

.github/workflows/sql-test-and-build-workflow.yml

@@ -2,33 +2,31 @@ name: SQL Java CI
 
 on: [push, pull_request]
 
+env:
+  OPENSEARCH_VERSION: '1.3.0-SNAPSHOT'
+
 jobs:
   build:
-
+    strategy:
+      matrix:
+        java:
+          - 11
+          - 14
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v1
 
-    - name: Set up JDK 1.14
+    - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@v1
       with:
-        java-version: 1.14
-
-    # Publish OpenSearch to local Maven repo for now
-    - name: Checkout OpenSearch
-      uses: actions/checkout@v2
-      with:
-        repository: 'opensearch-project/OpenSearch'
-        path: OpenSearch
-        ref: '1.1'
-
-    - name: Build OpenSearch
-      working-directory: ./OpenSearch
-      run: ./gradlew publishToMavenLocal
+        java-version: ${{ matrix.java }}
 
     - name: Build with Gradle
-      run: ./gradlew build assemble -Dopensearch.version=1.1.0-SNAPSHOT
+      run: ./gradlew build assemble -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}
+
+    - name: Run backward compatibility tests
+      run: ./bwctest.sh
 
     - name: Create Artifact Path
       run: |
@@ -39,6 +37,7 @@ jobs:
     - name: Upload SQL Coverage Report
       uses: codecov/codecov-action@v1
       with:
+        flags: sql-engine
         token: ${{ secrets.CODECOV_TOKEN }}
 
     - name: Upload Artifacts

.github/workflows/sql-workbench-release-workflow.yml

@@ -7,8 +7,8 @@ on:
 
 env: 
   PLUGIN_NAME: query-workbench-dashboards
-  OPENSEARCH_VERSION: '1.0'
-  OPENSEARCH_PLUGIN_VERSION: 1.0.0.0
+  OPENSEARCH_VERSION: '1.x'
+  OPENSEARCH_PLUGIN_VERSION: 1.3.0.0
 
 jobs:
 

.github/workflows/sql-workbench-test-and-build-workflow.yml

@@ -5,7 +5,7 @@ on: [pull_request, push]
 env: 
   PLUGIN_NAME: query-workbench-dashboards
   OPENSEARCH_VERSION: '1.x'
-  OPENSEARCH_PLUGIN_VERSION: 1.1.0.0
+  OPENSEARCH_PLUGIN_VERSION: 1.3.0.0
 
 jobs:
 
@@ -43,7 +43,14 @@ jobs:
       - name: Test
         run: |
           cd OpenSearch-Dashboards/plugins/workbench
-          yarn test:jest
+          yarn test:jest --coverage
+
+      - name: Upload coverage
+        uses: codecov/codecov-action@v1
+        with:
+          flags: query-workbench
+          directory: ./OpenSearch-Dashboards/plugins/workbench
+          token: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Build Artifact
         run: |

.gitignore

@@ -10,7 +10,7 @@
 .project
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
-/bin/
+bin/
 /target/
 log/
 elasticsearch-sql.iml

.whitesource

@@ -0,0 +1,15 @@
+{
+  "scanSettings": {
+    "configMode": "AUTO",
+    "configExternalURL": "",
+    "projectToken": "",
+    "baseBranches": []
+  },
+  "checkRunSettings": {
+    "vulnerableCheckRunConclusionLevel": "failure",
+    "displayMode": "diff"
+  },
+  "issueSettings": {
+    "minSeverityLevel": "LOW"
+  }
+}