Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/add-untriaged.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ jobs:
apply-label:
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v6
- uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
with:
script: |
github.rest.issues.addLabels({
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/backport.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,14 @@ jobs:
steps:
- name: GitHub App token
id: github_app_token
uses: tibdex/github-app-token@v1.5.0
uses: tibdex/github-app-token@1901dc7d52169e70c27a8da37aef0d423e2867a2 # 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
uses: VachaShah/backport@28c49d91ceec57d7c9f625f1031c1a4d637251f5 # v1.1.4
with:
github_token: ${{ steps.github_app_token.outputs.token }}
branch_name: backport/backport-${{ github.event.number }}
4 changes: 2 additions & 2 deletions .github/workflows/dco.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,10 +9,10 @@ jobs:
steps:
- name: Get PR Commits
id: 'get-pr-commits'
uses: tim-actions/get-pr-commits@v1.1.0
uses: tim-actions/get-pr-commits@55b867b9b28954e6f5c1a0fe2f729dc926c306d0 # v1.1.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: DCO Check
uses: tim-actions/dco@v1.1.0
uses: tim-actions/dco@f2279e6e62d5a7d9115b0cb8e837b777b1b02e21 # v1.1.0
with:
commits: ${{ steps.get-pr-commits.outputs.commits }}
2 changes: 1 addition & 1 deletion .github/workflows/delete_backport_branch.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,6 @@ jobs:
if: startsWith(github.event.pull_request.head.ref,'backport/')
steps:
- name: Delete merged branch
uses: SvanBoxel/delete-merged-branch@main
uses: SvanBoxel/delete-merged-branch@2b5b058e3db41a3328fd9a6a58fd4c2545a14353 # main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/draft-release-notes-workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ jobs:
steps:
# Drafts your next Release notes as Pull Requests are merged into "main"
- name: Update draft release notes
uses: release-drafter/release-drafter@v5
uses: release-drafter/release-drafter@09c613e259eb8d4e7c81c2cb00618eb5fc4575a7 # v5
with:
config-name: draft-release-notes-config.yml
tag: (None)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/link-checker.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2
- name: lychee Link Checker
id: lychee
uses: lycheeverse/lychee-action@master
uses: lycheeverse/lychee-action@6da1d14f3a43098a294b7696d93d938aa8d20fc0 # master
with:
args: --accept=200,403,429 "./**/*.html" "./**/*.md" "./**/*.txt"
env:
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/sql-cli-test-and-build-workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,14 +19,17 @@ jobs:
strategy:
matrix:
python-version: [3.8]
opensearch-version: [ latest ]
# Pinned rather than 'latest': the explain assertions in tests/test_main.py
# depend on the SQL plugin's query representation, which changes between
# server releases. Bumping this may require updating those expectations.
opensearch-version: [ 3.7.0 ]

steps:
- name: Checkout SQL CLI
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@7f4fc3e22c37d6ff65e88745f38bd3157c663f7c # v4
with:
python-version: ${{ matrix.python-version }}

Expand All@@ -42,7 +45,7 @@ jobs:
docker run -p 9200:9200 -e "discovery.type=single-node" -e "DISABLE_SECURITY_PLUGIN=true" --name test -d opensearchproject/opensearch:${{ matrix.opensearch-version }}

- name: Wait for cluster to start
uses: nick-fields/retry@v2
uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2
with:
timeout_seconds: 1
max_attempts: 30
Expand All@@ -60,7 +63,7 @@ jobs:
cp -r ./dist/*.tar.gz ./dist/*.whl opensearchsql-builds/

- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: opensearchsql
path: opensearchsql-builds
Expand Down
34 changes: 18 additions & 16 deletions tests/test_main.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,21 +25,6 @@ def test_explain(self, connection):
load_data(connection, doc)

err_message = "Can not connect to endpoint %s" % INVALID_ENDPOINT
expected_output = {
"root": {
"name": "ProjectOperator",
"description": {"fields": "[a]"},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": 'OpenSearchQueryRequest(indexName=opensearchsql_cli_test, sourceBuilder={"from":0,"size":150,"timeout":"1m","_source":{"includes":["a"],"excludes":[]}}, searchDone=false)'
},
"children": [],
}
],
}
}
expected_tabular_output = dedent(
"""\
fetched rows / total rows = 1/1
Expand All@@ -57,7 +42,24 @@ def test_explain(self, connection):

# test -q -e
result = runner.invoke(cli, [f"-q{QUERY}", "-e"])
mock_echo.assert_called_with(expected_output)
# The scan's "request" is the SQL plugin's internal query
# representation, and its exact text changes between server releases
# (PIT fields, dropped "excludes", dropped "searchDone", ...).
# Assert the plan structure exactly and only the stable parts of the
# request, so this does not break on every server bump.
explain_output = mock_echo.call_args[0][0]
root = explain_output["root"]
assert root["name"] == "ProjectOperator"
assert root["description"] == {"fields": "[a]"}

scan = root["children"][0]
assert scan["name"] == "OpenSearchIndexScan"
assert scan["children"] == []

request = scan["description"]["request"]
assert "indexName=%s" % TEST_INDEX_NAME in request
assert '"size":150' in request
assert '"includes":["a"]' in request
assert result.exit_code == 0

# test -q
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/add-untriaged.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ jobs:
apply-label:
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v6
- uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
with:
script: |
github.rest.issues.addLabels({
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/backport.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,14 @@ jobs:
steps:
- name: GitHub App token
id: github_app_token
uses: tibdex/github-app-token@v1.5.0
uses: tibdex/github-app-token@1901dc7d52169e70c27a8da37aef0d423e2867a2 # 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
uses: VachaShah/backport@28c49d91ceec57d7c9f625f1031c1a4d637251f5 # v1.1.4
with:
github_token: ${{ steps.github_app_token.outputs.token }}
branch_name: backport/backport-${{ github.event.number }}
4 changes: 2 additions & 2 deletions .github/workflows/dco.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,10 +9,10 @@ jobs:
steps:
- name: Get PR Commits
id: 'get-pr-commits'
uses: tim-actions/get-pr-commits@v1.1.0
uses: tim-actions/get-pr-commits@55b867b9b28954e6f5c1a0fe2f729dc926c306d0 # v1.1.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: DCO Check
uses: tim-actions/dco@v1.1.0
uses: tim-actions/dco@f2279e6e62d5a7d9115b0cb8e837b777b1b02e21 # v1.1.0
with:
commits: ${{ steps.get-pr-commits.outputs.commits }}
2 changes: 1 addition & 1 deletion .github/workflows/delete_backport_branch.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,6 @@ jobs:
if: startsWith(github.event.pull_request.head.ref,'backport/')
steps:
- name: Delete merged branch
uses: SvanBoxel/delete-merged-branch@main
uses: SvanBoxel/delete-merged-branch@2b5b058e3db41a3328fd9a6a58fd4c2545a14353 # main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/draft-release-notes-workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ jobs:
steps:
# Drafts your next Release notes as Pull Requests are merged into "main"
- name: Update draft release notes
uses: release-drafter/release-drafter@v5
uses: release-drafter/release-drafter@09c613e259eb8d4e7c81c2cb00618eb5fc4575a7 # v5
with:
config-name: draft-release-notes-config.yml
tag: (None)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/link-checker.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2
- name: lychee Link Checker
id: lychee
uses: lycheeverse/lychee-action@master
uses: lycheeverse/lychee-action@6da1d14f3a43098a294b7696d93d938aa8d20fc0 # master
with:
args: --accept=200,403,429 "./**/*.html" "./**/*.md" "./**/*.txt"
env:
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/sql-cli-test-and-build-workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,14 +19,17 @@ jobs:
strategy:
matrix:
python-version: [3.8]
opensearch-version: [ latest ]
# Pinned rather than 'latest': the explain assertions in tests/test_main.py
# depend on the SQL plugin's query representation, which changes between
# server releases. Bumping this may require updating those expectations.
opensearch-version: [ 3.7.0 ]

steps:
- name: Checkout SQL CLI
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@7f4fc3e22c37d6ff65e88745f38bd3157c663f7c # v4
with:
python-version: ${{ matrix.python-version }}

Expand All@@ -42,7 +45,7 @@ jobs:
docker run -p 9200:9200 -e "discovery.type=single-node" -e "DISABLE_SECURITY_PLUGIN=true" --name test -d opensearchproject/opensearch:${{ matrix.opensearch-version }}

- name: Wait for cluster to start
uses: nick-fields/retry@v2
uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2
with:
timeout_seconds: 1
max_attempts: 30
Expand All@@ -60,7 +63,7 @@ jobs:
cp -r ./dist/*.tar.gz ./dist/*.whl opensearchsql-builds/

- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: opensearchsql
path: opensearchsql-builds
Expand Down
34 changes: 18 additions & 16 deletions tests/test_main.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,21 +25,6 @@ def test_explain(self, connection):
load_data(connection, doc)

err_message = "Can not connect to endpoint %s" % INVALID_ENDPOINT
expected_output = {
"root": {
"name": "ProjectOperator",
"description": {"fields": "[a]"},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": 'OpenSearchQueryRequest(indexName=opensearchsql_cli_test, sourceBuilder={"from":0,"size":150,"timeout":"1m","_source":{"includes":["a"],"excludes":[]}}, searchDone=false)'
},
"children": [],
}
],
}
}
expected_tabular_output = dedent(
"""\
fetched rows / total rows = 1/1
Expand All@@ -57,7 +42,24 @@ def test_explain(self, connection):

# test -q -e
result = runner.invoke(cli, [f"-q{QUERY}", "-e"])
mock_echo.assert_called_with(expected_output)
# The scan's "request" is the SQL plugin's internal query
# representation, and its exact text changes between server releases
# (PIT fields, dropped "excludes", dropped "searchDone", ...).
# Assert the plan structure exactly and only the stable parts of the
# request, so this does not break on every server bump.
explain_output = mock_echo.call_args[0][0]
root = explain_output["root"]
assert root["name"] == "ProjectOperator"
assert root["description"] == {"fields": "[a]"}

scan = root["children"][0]
assert scan["name"] == "OpenSearchIndexScan"
assert scan["children"] == []

request = scan["description"]["request"]
assert "indexName=%s" % TEST_INDEX_NAME in request
assert '"size":150' in request
assert '"includes":["a"]' in request
assert result.exit_code == 0

# test -q
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/add-untriaged.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ jobs:
apply-label:
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v6
- uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
with:
script: |
github.rest.issues.addLabels({
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/backport.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,14 @@ jobs:
steps:
- name: GitHub App token
id: github_app_token
uses: tibdex/github-app-token@v1.5.0
uses: tibdex/github-app-token@1901dc7d52169e70c27a8da37aef0d423e2867a2 # 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
uses: VachaShah/backport@28c49d91ceec57d7c9f625f1031c1a4d637251f5 # v1.1.4
with:
github_token: ${{ steps.github_app_token.outputs.token }}
branch_name: backport/backport-${{ github.event.number }}
4 changes: 2 additions & 2 deletions .github/workflows/dco.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,10 +9,10 @@ jobs:
steps:
- name: Get PR Commits
id: 'get-pr-commits'
uses: tim-actions/get-pr-commits@v1.1.0
uses: tim-actions/get-pr-commits@55b867b9b28954e6f5c1a0fe2f729dc926c306d0 # v1.1.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: DCO Check
uses: tim-actions/dco@v1.1.0
uses: tim-actions/dco@f2279e6e62d5a7d9115b0cb8e837b777b1b02e21 # v1.1.0
with:
commits: ${{ steps.get-pr-commits.outputs.commits }}
2 changes: 1 addition & 1 deletion .github/workflows/delete_backport_branch.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,6 @@ jobs:
if: startsWith(github.event.pull_request.head.ref,'backport/')
steps:
- name: Delete merged branch
uses: SvanBoxel/delete-merged-branch@main
uses: SvanBoxel/delete-merged-branch@2b5b058e3db41a3328fd9a6a58fd4c2545a14353 # main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/draft-release-notes-workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ jobs:
steps:
# Drafts your next Release notes as Pull Requests are merged into "main"
- name: Update draft release notes
uses: release-drafter/release-drafter@v5
uses: release-drafter/release-drafter@09c613e259eb8d4e7c81c2cb00618eb5fc4575a7 # v5
with:
config-name: draft-release-notes-config.yml
tag: (None)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/link-checker.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2
- name: lychee Link Checker
id: lychee
uses: lycheeverse/lychee-action@master
uses: lycheeverse/lychee-action@6da1d14f3a43098a294b7696d93d938aa8d20fc0 # master
with:
args: --accept=200,403,429 "./**/*.html" "./**/*.md" "./**/*.txt"
env:
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/sql-cli-test-and-build-workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,14 +19,17 @@ jobs:
strategy:
matrix:
python-version: [3.8]
opensearch-version: [ latest ]
# Pinned rather than 'latest': the explain assertions in tests/test_main.py
# depend on the SQL plugin's query representation, which changes between
# server releases. Bumping this may require updating those expectations.
opensearch-version: [ 3.7.0 ]

steps:
- name: Checkout SQL CLI
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@7f4fc3e22c37d6ff65e88745f38bd3157c663f7c # v4
with:
python-version: ${{ matrix.python-version }}

Expand All@@ -42,7 +45,7 @@ jobs:
docker run -p 9200:9200 -e "discovery.type=single-node" -e "DISABLE_SECURITY_PLUGIN=true" --name test -d opensearchproject/opensearch:${{ matrix.opensearch-version }}

- name: Wait for cluster to start
uses: nick-fields/retry@v2
uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2
with:
timeout_seconds: 1
max_attempts: 30
Expand All@@ -60,7 +63,7 @@ jobs:
cp -r ./dist/*.tar.gz ./dist/*.whl opensearchsql-builds/

- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: opensearchsql
path: opensearchsql-builds
Expand Down
34 changes: 18 additions & 16 deletions tests/test_main.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,21 +25,6 @@ def test_explain(self, connection):
load_data(connection, doc)

err_message = "Can not connect to endpoint %s" % INVALID_ENDPOINT
expected_output = {
"root": {
"name": "ProjectOperator",
"description": {"fields": "[a]"},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": 'OpenSearchQueryRequest(indexName=opensearchsql_cli_test, sourceBuilder={"from":0,"size":150,"timeout":"1m","_source":{"includes":["a"],"excludes":[]}}, searchDone=false)'
},
"children": [],
}
],
}
}
expected_tabular_output = dedent(
"""\
fetched rows / total rows = 1/1
Expand All@@ -57,7 +42,24 @@ def test_explain(self, connection):

# test -q -e
result = runner.invoke(cli, [f"-q{QUERY}", "-e"])
mock_echo.assert_called_with(expected_output)
# The scan's "request" is the SQL plugin's internal query
# representation, and its exact text changes between server releases
# (PIT fields, dropped "excludes", dropped "searchDone", ...).
# Assert the plan structure exactly and only the stable parts of the
# request, so this does not break on every server bump.
explain_output = mock_echo.call_args[0][0]
root = explain_output["root"]
assert root["name"] == "ProjectOperator"
assert root["description"] == {"fields": "[a]"}

scan = root["children"][0]
assert scan["name"] == "OpenSearchIndexScan"
assert scan["children"] == []

request = scan["description"]["request"]
assert "indexName=%s" % TEST_INDEX_NAME in request
assert '"size":150' in request
assert '"includes":["a"]' in request
assert result.exit_code == 0

# test -q
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/add-untriaged.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ jobs:
apply-label:
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v6
- uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
with:
script: |
github.rest.issues.addLabels({
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/backport.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,14 @@ jobs:
steps:
- name: GitHub App token
id: github_app_token
uses: tibdex/github-app-token@v1.5.0
uses: tibdex/github-app-token@1901dc7d52169e70c27a8da37aef0d423e2867a2 # 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
uses: VachaShah/backport@28c49d91ceec57d7c9f625f1031c1a4d637251f5 # v1.1.4
with:
github_token: ${{ steps.github_app_token.outputs.token }}
branch_name: backport/backport-${{ github.event.number }}
4 changes: 2 additions & 2 deletions .github/workflows/dco.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,10 +9,10 @@ jobs:
steps:
- name: Get PR Commits
id: 'get-pr-commits'
uses: tim-actions/get-pr-commits@v1.1.0
uses: tim-actions/get-pr-commits@55b867b9b28954e6f5c1a0fe2f729dc926c306d0 # v1.1.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: DCO Check
uses: tim-actions/dco@v1.1.0
uses: tim-actions/dco@f2279e6e62d5a7d9115b0cb8e837b777b1b02e21 # v1.1.0
with:
commits: ${{ steps.get-pr-commits.outputs.commits }}
2 changes: 1 addition & 1 deletion .github/workflows/delete_backport_branch.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,6 @@ jobs:
if: startsWith(github.event.pull_request.head.ref,'backport/')
steps:
- name: Delete merged branch
uses: SvanBoxel/delete-merged-branch@main
uses: SvanBoxel/delete-merged-branch@2b5b058e3db41a3328fd9a6a58fd4c2545a14353 # main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/draft-release-notes-workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ jobs:
steps:
# Drafts your next Release notes as Pull Requests are merged into "main"
- name: Update draft release notes
uses: release-drafter/release-drafter@v5
uses: release-drafter/release-drafter@09c613e259eb8d4e7c81c2cb00618eb5fc4575a7 # v5
with:
config-name: draft-release-notes-config.yml
tag: (None)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/link-checker.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2
- name: lychee Link Checker
id: lychee
uses: lycheeverse/lychee-action@master
uses: lycheeverse/lychee-action@6da1d14f3a43098a294b7696d93d938aa8d20fc0 # master
with:
args: --accept=200,403,429 "./**/*.html" "./**/*.md" "./**/*.txt"
env:
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/sql-cli-test-and-build-workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,14 +19,17 @@ jobs:
strategy:
matrix:
python-version: [3.8]
opensearch-version: [ latest ]
# Pinned rather than 'latest': the explain assertions in tests/test_main.py
# depend on the SQL plugin's query representation, which changes between
# server releases. Bumping this may require updating those expectations.
opensearch-version: [ 3.7.0 ]

steps:
- name: Checkout SQL CLI
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@7f4fc3e22c37d6ff65e88745f38bd3157c663f7c # v4
with:
python-version: ${{ matrix.python-version }}

Expand All@@ -42,7 +45,7 @@ jobs:
docker run -p 9200:9200 -e "discovery.type=single-node" -e "DISABLE_SECURITY_PLUGIN=true" --name test -d opensearchproject/opensearch:${{ matrix.opensearch-version }}

- name: Wait for cluster to start
uses: nick-fields/retry@v2
uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2
with:
timeout_seconds: 1
max_attempts: 30
Expand All@@ -60,7 +63,7 @@ jobs:
cp -r ./dist/*.tar.gz ./dist/*.whl opensearchsql-builds/

- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: opensearchsql
path: opensearchsql-builds
Expand Down
34 changes: 18 additions & 16 deletions tests/test_main.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,21 +25,6 @@ def test_explain(self, connection):
load_data(connection, doc)

err_message = "Can not connect to endpoint %s" % INVALID_ENDPOINT
expected_output = {
"root": {
"name": "ProjectOperator",
"description": {"fields": "[a]"},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": 'OpenSearchQueryRequest(indexName=opensearchsql_cli_test, sourceBuilder={"from":0,"size":150,"timeout":"1m","_source":{"includes":["a"],"excludes":[]}}, searchDone=false)'
},
"children": [],
}
],
}
}
expected_tabular_output = dedent(
"""\
fetched rows / total rows = 1/1
Expand All@@ -57,7 +42,24 @@ def test_explain(self, connection):

# test -q -e
result = runner.invoke(cli, [f"-q{QUERY}", "-e"])
mock_echo.assert_called_with(expected_output)
# The scan's "request" is the SQL plugin's internal query
# representation, and its exact text changes between server releases
# (PIT fields, dropped "excludes", dropped "searchDone", ...).
# Assert the plan structure exactly and only the stable parts of the
# request, so this does not break on every server bump.
explain_output = mock_echo.call_args[0][0]
root = explain_output["root"]
assert root["name"] == "ProjectOperator"
assert root["description"] == {"fields": "[a]"}

scan = root["children"][0]
assert scan["name"] == "OpenSearchIndexScan"
assert scan["children"] == []

request = scan["description"]["request"]
assert "indexName=%s" % TEST_INDEX_NAME in request
assert '"size":150' in request
assert '"includes":["a"]' in request
assert result.exit_code == 0

# test -q
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/add-untriaged.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ jobs:
apply-label:
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v6
- uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
with:
script: |
github.rest.issues.addLabels({
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/backport.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,14 @@ jobs:
steps:
- name: GitHub App token
id: github_app_token
uses: tibdex/github-app-token@v1.5.0
uses: tibdex/github-app-token@1901dc7d52169e70c27a8da37aef0d423e2867a2 # 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
uses: VachaShah/backport@28c49d91ceec57d7c9f625f1031c1a4d637251f5 # v1.1.4
with:
github_token: ${{ steps.github_app_token.outputs.token }}
branch_name: backport/backport-${{ github.event.number }}
4 changes: 2 additions & 2 deletions .github/workflows/dco.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,10 +9,10 @@ jobs:
steps:
- name: Get PR Commits
id: 'get-pr-commits'
uses: tim-actions/get-pr-commits@v1.1.0
uses: tim-actions/get-pr-commits@55b867b9b28954e6f5c1a0fe2f729dc926c306d0 # v1.1.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: DCO Check
uses: tim-actions/dco@v1.1.0
uses: tim-actions/dco@f2279e6e62d5a7d9115b0cb8e837b777b1b02e21 # v1.1.0
with:
commits: ${{ steps.get-pr-commits.outputs.commits }}
2 changes: 1 addition & 1 deletion .github/workflows/delete_backport_branch.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,6 @@ jobs:
if: startsWith(github.event.pull_request.head.ref,'backport/')
steps:
- name: Delete merged branch
uses: SvanBoxel/delete-merged-branch@main
uses: SvanBoxel/delete-merged-branch@2b5b058e3db41a3328fd9a6a58fd4c2545a14353 # main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/draft-release-notes-workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ jobs:
steps:
# Drafts your next Release notes as Pull Requests are merged into "main"
- name: Update draft release notes
uses: release-drafter/release-drafter@v5
uses: release-drafter/release-drafter@09c613e259eb8d4e7c81c2cb00618eb5fc4575a7 # v5
with:
config-name: draft-release-notes-config.yml
tag: (None)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/link-checker.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2
- name: lychee Link Checker
id: lychee
uses: lycheeverse/lychee-action@master
uses: lycheeverse/lychee-action@6da1d14f3a43098a294b7696d93d938aa8d20fc0 # master
with:
args: --accept=200,403,429 "./**/*.html" "./**/*.md" "./**/*.txt"
env:
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/sql-cli-test-and-build-workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,14 +19,17 @@ jobs:
strategy:
matrix:
python-version: [3.8]
opensearch-version: [ latest ]
# Pinned rather than 'latest': the explain assertions in tests/test_main.py
# depend on the SQL plugin's query representation, which changes between
# server releases. Bumping this may require updating those expectations.
opensearch-version: [ 3.7.0 ]

steps:
- name: Checkout SQL CLI
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@7f4fc3e22c37d6ff65e88745f38bd3157c663f7c # v4
with:
python-version: ${{ matrix.python-version }}

Expand All@@ -42,7 +45,7 @@ jobs:
docker run -p 9200:9200 -e "discovery.type=single-node" -e "DISABLE_SECURITY_PLUGIN=true" --name test -d opensearchproject/opensearch:${{ matrix.opensearch-version }}

- name: Wait for cluster to start
uses: nick-fields/retry@v2
uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2
with:
timeout_seconds: 1
max_attempts: 30
Expand All@@ -60,7 +63,7 @@ jobs:
cp -r ./dist/*.tar.gz ./dist/*.whl opensearchsql-builds/

- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: opensearchsql
path: opensearchsql-builds
Expand Down
34 changes: 18 additions & 16 deletions tests/test_main.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,21 +25,6 @@ def test_explain(self, connection):
load_data(connection, doc)

err_message = "Can not connect to endpoint %s" % INVALID_ENDPOINT
expected_output = {
"root": {
"name": "ProjectOperator",
"description": {"fields": "[a]"},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": 'OpenSearchQueryRequest(indexName=opensearchsql_cli_test, sourceBuilder={"from":0,"size":150,"timeout":"1m","_source":{"includes":["a"],"excludes":[]}}, searchDone=false)'
},
"children": [],
}
],
}
}
expected_tabular_output = dedent(
"""\
fetched rows / total rows = 1/1
Expand All@@ -57,7 +42,24 @@ def test_explain(self, connection):

# test -q -e
result = runner.invoke(cli, [f"-q{QUERY}", "-e"])
mock_echo.assert_called_with(expected_output)
# The scan's "request" is the SQL plugin's internal query
# representation, and its exact text changes between server releases
# (PIT fields, dropped "excludes", dropped "searchDone", ...).
# Assert the plan structure exactly and only the stable parts of the
# request, so this does not break on every server bump.
explain_output = mock_echo.call_args[0][0]
root = explain_output["root"]
assert root["name"] == "ProjectOperator"
assert root["description"] == {"fields": "[a]"}

scan = root["children"][0]
assert scan["name"] == "OpenSearchIndexScan"
assert scan["children"] == []

request = scan["description"]["request"]
assert "indexName=%s" % TEST_INDEX_NAME in request
assert '"size":150' in request
assert '"includes":["a"]' in request
assert result.exit_code == 0

# test -q
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/add-untriaged.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ jobs:
apply-label:
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v6
- uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
with:
script: |
github.rest.issues.addLabels({
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/backport.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,14 @@ jobs:
steps:
- name: GitHub App token
id: github_app_token
uses: tibdex/github-app-token@v1.5.0
uses: tibdex/github-app-token@1901dc7d52169e70c27a8da37aef0d423e2867a2 # 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
uses: VachaShah/backport@28c49d91ceec57d7c9f625f1031c1a4d637251f5 # v1.1.4
with:
github_token: ${{ steps.github_app_token.outputs.token }}
branch_name: backport/backport-${{ github.event.number }}
4 changes: 2 additions & 2 deletions .github/workflows/dco.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,10 +9,10 @@ jobs:
steps:
- name: Get PR Commits
id: 'get-pr-commits'
uses: tim-actions/get-pr-commits@v1.1.0
uses: tim-actions/get-pr-commits@55b867b9b28954e6f5c1a0fe2f729dc926c306d0 # v1.1.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: DCO Check
uses: tim-actions/dco@v1.1.0
uses: tim-actions/dco@f2279e6e62d5a7d9115b0cb8e837b777b1b02e21 # v1.1.0
with:
commits: ${{ steps.get-pr-commits.outputs.commits }}
2 changes: 1 addition & 1 deletion .github/workflows/delete_backport_branch.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,6 @@ jobs:
if: startsWith(github.event.pull_request.head.ref,'backport/')
steps:
- name: Delete merged branch
uses: SvanBoxel/delete-merged-branch@main
uses: SvanBoxel/delete-merged-branch@2b5b058e3db41a3328fd9a6a58fd4c2545a14353 # main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/draft-release-notes-workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ jobs:
steps:
# Drafts your next Release notes as Pull Requests are merged into "main"
- name: Update draft release notes
uses: release-drafter/release-drafter@v5
uses: release-drafter/release-drafter@09c613e259eb8d4e7c81c2cb00618eb5fc4575a7 # v5
with:
config-name: draft-release-notes-config.yml
tag: (None)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/link-checker.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2
- name: lychee Link Checker
id: lychee
uses: lycheeverse/lychee-action@master
uses: lycheeverse/lychee-action@6da1d14f3a43098a294b7696d93d938aa8d20fc0 # master
with:
args: --accept=200,403,429 "./**/*.html" "./**/*.md" "./**/*.txt"
env:
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/sql-cli-test-and-build-workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,14 +19,17 @@ jobs:
strategy:
matrix:
python-version: [3.8]
opensearch-version: [ latest ]
# Pinned rather than 'latest': the explain assertions in tests/test_main.py
# depend on the SQL plugin's query representation, which changes between
# server releases. Bumping this may require updating those expectations.
opensearch-version: [ 3.7.0 ]

steps:
- name: Checkout SQL CLI
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@7f4fc3e22c37d6ff65e88745f38bd3157c663f7c # v4
with:
python-version: ${{ matrix.python-version }}

Expand All@@ -42,7 +45,7 @@ jobs:
docker run -p 9200:9200 -e "discovery.type=single-node" -e "DISABLE_SECURITY_PLUGIN=true" --name test -d opensearchproject/opensearch:${{ matrix.opensearch-version }}

- name: Wait for cluster to start
uses: nick-fields/retry@v2
uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2
with:
timeout_seconds: 1
max_attempts: 30
Expand All@@ -60,7 +63,7 @@ jobs:
cp -r ./dist/*.tar.gz ./dist/*.whl opensearchsql-builds/

- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: opensearchsql
path: opensearchsql-builds
Expand Down
34 changes: 18 additions & 16 deletions tests/test_main.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,21 +25,6 @@ def test_explain(self, connection):
load_data(connection, doc)

err_message = "Can not connect to endpoint %s" % INVALID_ENDPOINT
expected_output = {
"root": {
"name": "ProjectOperator",
"description": {"fields": "[a]"},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": 'OpenSearchQueryRequest(indexName=opensearchsql_cli_test, sourceBuilder={"from":0,"size":150,"timeout":"1m","_source":{"includes":["a"],"excludes":[]}}, searchDone=false)'
},
"children": [],
}
],
}
}
expected_tabular_output = dedent(
"""\
fetched rows / total rows = 1/1
Expand All@@ -57,7 +42,24 @@ def test_explain(self, connection):

# test -q -e
result = runner.invoke(cli, [f"-q{QUERY}", "-e"])
mock_echo.assert_called_with(expected_output)
# The scan's "request" is the SQL plugin's internal query
# representation, and its exact text changes between server releases
# (PIT fields, dropped "excludes", dropped "searchDone", ...).
# Assert the plan structure exactly and only the stable parts of the
# request, so this does not break on every server bump.
explain_output = mock_echo.call_args[0][0]
root = explain_output["root"]
assert root["name"] == "ProjectOperator"
assert root["description"] == {"fields": "[a]"}

scan = root["children"][0]
assert scan["name"] == "OpenSearchIndexScan"
assert scan["children"] == []

request = scan["description"]["request"]
assert "indexName=%s" % TEST_INDEX_NAME in request
assert '"size":150' in request
assert '"includes":["a"]' in request
assert result.exit_code == 0

# test -q
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/add-untriaged.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ jobs:
apply-label:
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v6
- uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
with:
script: |
github.rest.issues.addLabels({
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/backport.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,14 @@ jobs:
steps:
- name: GitHub App token
id: github_app_token
uses: tibdex/github-app-token@v1.5.0
uses: tibdex/github-app-token@1901dc7d52169e70c27a8da37aef0d423e2867a2 # 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
uses: VachaShah/backport@28c49d91ceec57d7c9f625f1031c1a4d637251f5 # v1.1.4
with:
github_token: ${{ steps.github_app_token.outputs.token }}
branch_name: backport/backport-${{ github.event.number }}
4 changes: 2 additions & 2 deletions .github/workflows/dco.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,10 +9,10 @@ jobs:
steps:
- name: Get PR Commits
id: 'get-pr-commits'
uses: tim-actions/get-pr-commits@v1.1.0
uses: tim-actions/get-pr-commits@55b867b9b28954e6f5c1a0fe2f729dc926c306d0 # v1.1.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: DCO Check
uses: tim-actions/dco@v1.1.0
uses: tim-actions/dco@f2279e6e62d5a7d9115b0cb8e837b777b1b02e21 # v1.1.0
with:
commits: ${{ steps.get-pr-commits.outputs.commits }}
2 changes: 1 addition & 1 deletion .github/workflows/delete_backport_branch.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,6 @@ jobs:
if: startsWith(github.event.pull_request.head.ref,'backport/')
steps:
- name: Delete merged branch
uses: SvanBoxel/delete-merged-branch@main
uses: SvanBoxel/delete-merged-branch@2b5b058e3db41a3328fd9a6a58fd4c2545a14353 # main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/draft-release-notes-workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ jobs:
steps:
# Drafts your next Release notes as Pull Requests are merged into "main"
- name: Update draft release notes
uses: release-drafter/release-drafter@v5
uses: release-drafter/release-drafter@09c613e259eb8d4e7c81c2cb00618eb5fc4575a7 # v5
with:
config-name: draft-release-notes-config.yml
tag: (None)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/link-checker.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2
- name: lychee Link Checker
id: lychee
uses: lycheeverse/lychee-action@master
uses: lycheeverse/lychee-action@6da1d14f3a43098a294b7696d93d938aa8d20fc0 # master
with:
args: --accept=200,403,429 "./**/*.html" "./**/*.md" "./**/*.txt"
env:
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/sql-cli-test-and-build-workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,14 +19,17 @@ jobs:
strategy:
matrix:
python-version: [3.8]
opensearch-version: [ latest ]
# Pinned rather than 'latest': the explain assertions in tests/test_main.py
# depend on the SQL plugin's query representation, which changes between
# server releases. Bumping this may require updating those expectations.
opensearch-version: [ 3.7.0 ]

steps:
- name: Checkout SQL CLI
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@7f4fc3e22c37d6ff65e88745f38bd3157c663f7c # v4
with:
python-version: ${{ matrix.python-version }}

Expand All@@ -42,7 +45,7 @@ jobs:
docker run -p 9200:9200 -e "discovery.type=single-node" -e "DISABLE_SECURITY_PLUGIN=true" --name test -d opensearchproject/opensearch:${{ matrix.opensearch-version }}

- name: Wait for cluster to start
uses: nick-fields/retry@v2
uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2
with:
timeout_seconds: 1
max_attempts: 30
Expand All@@ -60,7 +63,7 @@ jobs:
cp -r ./dist/*.tar.gz ./dist/*.whl opensearchsql-builds/

- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: opensearchsql
path: opensearchsql-builds
Expand Down
34 changes: 18 additions & 16 deletions tests/test_main.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,21 +25,6 @@ def test_explain(self, connection):
load_data(connection, doc)

err_message = "Can not connect to endpoint %s" % INVALID_ENDPOINT
expected_output = {
"root": {
"name": "ProjectOperator",
"description": {"fields": "[a]"},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": 'OpenSearchQueryRequest(indexName=opensearchsql_cli_test, sourceBuilder={"from":0,"size":150,"timeout":"1m","_source":{"includes":["a"],"excludes":[]}}, searchDone=false)'
},
"children": [],
}
],
}
}
expected_tabular_output = dedent(
"""\
fetched rows / total rows = 1/1
Expand All@@ -57,7 +42,24 @@ def test_explain(self, connection):

# test -q -e
result = runner.invoke(cli, [f"-q{QUERY}", "-e"])
mock_echo.assert_called_with(expected_output)
# The scan's "request" is the SQL plugin's internal query
# representation, and its exact text changes between server releases
# (PIT fields, dropped "excludes", dropped "searchDone", ...).
# Assert the plan structure exactly and only the stable parts of the
# request, so this does not break on every server bump.
explain_output = mock_echo.call_args[0][0]
root = explain_output["root"]
assert root["name"] == "ProjectOperator"
assert root["description"] == {"fields": "[a]"}

scan = root["children"][0]
assert scan["name"] == "OpenSearchIndexScan"
assert scan["children"] == []

request = scan["description"]["request"]
assert "indexName=%s" % TEST_INDEX_NAME in request
assert '"size":150' in request
assert '"includes":["a"]' in request
assert result.exit_code == 0

# test -q
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/add-untriaged.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ jobs:
apply-label:
runs-on: ubuntu-latest
steps:
- uses: actions/github-script@v6
- uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
with:
script: |
github.rest.issues.addLabels({
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/backport.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,14 +15,14 @@ jobs:
steps:
- name: GitHub App token
id: github_app_token
uses: tibdex/github-app-token@v1.5.0
uses: tibdex/github-app-token@1901dc7d52169e70c27a8da37aef0d423e2867a2 # 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
uses: VachaShah/backport@28c49d91ceec57d7c9f625f1031c1a4d637251f5 # v1.1.4
with:
github_token: ${{ steps.github_app_token.outputs.token }}
branch_name: backport/backport-${{ github.event.number }}
4 changes: 2 additions & 2 deletions .github/workflows/dco.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,10 +9,10 @@ jobs:
steps:
- name: Get PR Commits
id: 'get-pr-commits'
uses: tim-actions/get-pr-commits@v1.1.0
uses: tim-actions/get-pr-commits@55b867b9b28954e6f5c1a0fe2f729dc926c306d0 # v1.1.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: DCO Check
uses: tim-actions/dco@v1.1.0
uses: tim-actions/dco@f2279e6e62d5a7d9115b0cb8e837b777b1b02e21 # v1.1.0
with:
commits: ${{ steps.get-pr-commits.outputs.commits }}
2 changes: 1 addition & 1 deletion .github/workflows/delete_backport_branch.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,6 @@ jobs:
if: startsWith(github.event.pull_request.head.ref,'backport/')
steps:
- name: Delete merged branch
uses: SvanBoxel/delete-merged-branch@main
uses: SvanBoxel/delete-merged-branch@2b5b058e3db41a3328fd9a6a58fd4c2545a14353 # main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/draft-release-notes-workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ jobs:
steps:
# Drafts your next Release notes as Pull Requests are merged into "main"
- name: Update draft release notes
uses: release-drafter/release-drafter@v5
uses: release-drafter/release-drafter@09c613e259eb8d4e7c81c2cb00618eb5fc4575a7 # v5
with:
config-name: draft-release-notes-config.yml
tag: (None)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/link-checker.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,10 +11,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2
- name: lychee Link Checker
id: lychee
uses: lycheeverse/lychee-action@master
uses: lycheeverse/lychee-action@6da1d14f3a43098a294b7696d93d938aa8d20fc0 # master
with:
args: --accept=200,403,429 "./**/*.html" "./**/*.md" "./**/*.txt"
env:
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/sql-cli-test-and-build-workflow.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,14 +19,17 @@ jobs:
strategy:
matrix:
python-version: [3.8]
opensearch-version: [ latest ]
# Pinned rather than 'latest': the explain assertions in tests/test_main.py
# depend on the SQL plugin's query representation, which changes between
# server releases. Bumping this may require updating those expectations.
opensearch-version: [ 3.7.0 ]

steps:
- name: Checkout SQL CLI
uses: actions/checkout@v3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@7f4fc3e22c37d6ff65e88745f38bd3157c663f7c # v4
with:
python-version: ${{ matrix.python-version }}

Expand All@@ -42,7 +45,7 @@ jobs:
docker run -p 9200:9200 -e "discovery.type=single-node" -e "DISABLE_SECURITY_PLUGIN=true" --name test -d opensearchproject/opensearch:${{ matrix.opensearch-version }}

- name: Wait for cluster to start
uses: nick-fields/retry@v2
uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2
with:
timeout_seconds: 1
max_attempts: 30
Expand All@@ -60,7 +63,7 @@ jobs:
cp -r ./dist/*.tar.gz ./dist/*.whl opensearchsql-builds/

- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: opensearchsql
path: opensearchsql-builds
Expand Down
34 changes: 18 additions & 16 deletions tests/test_main.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,21 +25,6 @@ def test_explain(self, connection):
load_data(connection, doc)

err_message = "Can not connect to endpoint %s" % INVALID_ENDPOINT
expected_output = {
"root": {
"name": "ProjectOperator",
"description": {"fields": "[a]"},
"children": [
{
"name": "OpenSearchIndexScan",
"description": {
"request": 'OpenSearchQueryRequest(indexName=opensearchsql_cli_test, sourceBuilder={"from":0,"size":150,"timeout":"1m","_source":{"includes":["a"],"excludes":[]}}, searchDone=false)'
},
"children": [],
}
],
}
}
expected_tabular_output = dedent(
"""\
fetched rows / total rows = 1/1
Expand All@@ -57,7 +42,24 @@ def test_explain(self, connection):

# test -q -e
result = runner.invoke(cli, [f"-q{QUERY}", "-e"])
mock_echo.assert_called_with(expected_output)
# The scan's "request" is the SQL plugin's internal query
# representation, and its exact text changes between server releases
# (PIT fields, dropped "excludes", dropped "searchDone", ...).
# Assert the plan structure exactly and only the stable parts of the
# request, so this does not break on every server bump.
explain_output = mock_echo.call_args[0][0]
root = explain_output["root"]
assert root["name"] == "ProjectOperator"
assert root["description"] == {"fields": "[a]"}

scan = root["children"][0]
assert scan["name"] == "OpenSearchIndexScan"
assert scan["children"] == []

request = scan["description"]["request"]
assert "indexName=%s" % TEST_INDEX_NAME in request
assert '"size":150' in request
assert '"includes":["a"]' in request
assert result.exit_code == 0

# test -q
Expand Down
Loading