Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 2.x] add queryFieldNames field in Doc Level Queries #597

Merged
merged 1 commit into from
Feb 19, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 75925dc from #582.

* add queryFieldNames field in Doc Level Queries

Signed-off-by: Surya Sashank Nistala <[email protected]>

* add tests to verify queryFieldNames field in DocLevelQuery

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>
(cherry picked from commit 75925dc)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Copy link

codecov bot commented Feb 19, 2024

Codecov Report

Attention: 8 lines in your changes are missing coverage. Please review.

Comparison is base (9959c32) 72.86% compared to head (312cb5f) 72.83%.

Files Patch % Lines
...opensearch/commons/alerting/model/DocLevelQuery.kt 69.23% 8 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##                2.x     #597      +/-   ##
============================================
- Coverage     72.86%   72.83%   -0.04%     
- Complexity      863      865       +2     
============================================
  Files           133      133              
  Lines          5823     5845      +22     
  Branches        716      717       +1     
============================================
+ Hits           4243     4257      +14     
- Misses         1266     1274       +8     
  Partials        314      314              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@eirsep eirsep merged commit a0635a6 into 2.x Feb 19, 2024
16 of 19 checks passed
eirsep pushed a commit to eirsep/common-utils that referenced this pull request Mar 13, 2024
… (opensearch-project#597)

* add queryFieldNames field in Doc Level Queries

* add tests to verify queryFieldNames field in DocLevelQuery

---------

(cherry picked from commit 75925dc)

Signed-off-by: Surya Sashank Nistala <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
eirsep added a commit that referenced this pull request Mar 13, 2024
* add queryFieldNames field in Doc Level Queries

* add tests to verify queryFieldNames field in DocLevelQuery

---------

(cherry picked from commit 75925dc)

Signed-off-by: Surya Sashank Nistala <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor Author

The backport to 2.5 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/common-utils/backport-2.5 2.5
# Navigate to the new working tree
pushd ../.worktrees/common-utils/backport-2.5
# Create a new branch
git switch --create backport-597-to-2.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a0635a6f57f1e266e4beac55c382430396cfefda
# Push it to GitHub
git push --set-upstream origin backport-597-to-2.5
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/common-utils/backport-2.5

Then, create a pull request where the base branch is 2.5 and the compare/head branch is backport-597-to-2.5.

@opensearch-trigger-bot
Copy link
Contributor Author

The backport to 2.9 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/common-utils/backport-2.9 2.9
# Navigate to the new working tree
pushd ../.worktrees/common-utils/backport-2.9
# Create a new branch
git switch --create backport-597-to-2.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a0635a6f57f1e266e4beac55c382430396cfefda
# Push it to GitHub
git push --set-upstream origin backport-597-to-2.9
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/common-utils/backport-2.9

Then, create a pull request where the base branch is 2.9 and the compare/head branch is backport-597-to-2.9.

@opensearch-trigger-bot
Copy link
Contributor Author

The backport to 2.11 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/common-utils/backport-2.11 2.11
# Navigate to the new working tree
pushd ../.worktrees/common-utils/backport-2.11
# Create a new branch
git switch --create backport-597-to-2.11
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a0635a6f57f1e266e4beac55c382430396cfefda
# Push it to GitHub
git push --set-upstream origin backport-597-to-2.11
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/common-utils/backport-2.11

Then, create a pull request where the base branch is 2.11 and the compare/head branch is backport-597-to-2.11.

@opensearch-trigger-bot
Copy link
Contributor Author

The backport to 2.7 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/common-utils/backport-2.7 2.7
# Navigate to the new working tree
pushd ../.worktrees/common-utils/backport-2.7
# Create a new branch
git switch --create backport-597-to-2.7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a0635a6f57f1e266e4beac55c382430396cfefda
# Push it to GitHub
git push --set-upstream origin backport-597-to-2.7
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/common-utils/backport-2.7

Then, create a pull request where the base branch is 2.7 and the compare/head branch is backport-597-to-2.7.

goyamegh pushed a commit to goyamegh/common-utils that referenced this pull request Mar 13, 2024
… (opensearch-project#597)

---------

(cherry picked from commit 75925dc)

Signed-off-by: Surya Sashank Nistala <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
jowg-amazon added a commit that referenced this pull request Mar 14, 2024
* fix cve

Signed-off-by: jowg-amazon <[email protected]>

* add queryFieldNames field in Doc Level Queries (#582)

* add queryFieldNames field in Doc Level Queries

Signed-off-by: Surya Sashank Nistala <[email protected]>

* add tests to verify queryFieldNames field in DocLevelQuery

Signed-off-by: Surya Sashank Nistala <[email protected]>

---------

Signed-off-by: Surya Sashank Nistala <[email protected]>
(cherry picked from commit 75925dc)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

---------

Signed-off-by: jowg-amazon <[email protected]>
Signed-off-by: Surya Sashank Nistala <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
goyamegh added a commit to goyamegh/common-utils that referenced this pull request Mar 15, 2024
… (opensearch-project#597)

---------

(cherry picked from commit 75925dc)

Signed-off-by: Surya Sashank Nistala <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	src/test/kotlin/org/opensearch/commons/alerting/model/XContentTests.kt
AWSHurneyt pushed a commit to AWSHurneyt/common-utils that referenced this pull request Apr 12, 2024
… (opensearch-project#597)

* add queryFieldNames field in Doc Level Queries



* add tests to verify queryFieldNames field in DocLevelQuery



---------


(cherry picked from commit 75925dc)

Signed-off-by: Surya Sashank Nistala <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: AWSHurneyt <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants