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

[MDS] Adds datasource filter for version decoupling #2051

Merged

Conversation

DarshitChanpura
Copy link
Member

@DarshitChanpura DarshitChanpura commented Jul 23, 2024

Description

This change adds a datasource filter function to allow for version decoupling for MDS feature.

Category

Enhancement

Why these changes are required?

To allow for version decoupling in MDS.

What is the old behavior before changes and new behavior after changes?

Before: Datasources with all versions were shown.
After: Datasource with only compatible versions are shown.

Issues Resolved

Testing

Unit tests

Check List

  • New functionality includes testing
    - [ ] New functionality has been documented
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
@DarshitChanpura DarshitChanpura added backport 2.x backport to 2.x branch v2.16.0 labels Jul 23, 2024
Copy link

codecov bot commented Jul 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 69.46%. Comparing base (a44e265) to head (df825d7).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2051      +/-   ##
==========================================
+ Coverage   69.34%   69.46%   +0.11%     
==========================================
  Files          96       96              
  Lines        2587     2597      +10     
  Branches      375      386      +11     
==========================================
+ Hits         1794     1804      +10     
  Misses        699      699              
  Partials       94       94              

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

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
@DarshitChanpura DarshitChanpura marked this pull request as ready for review July 23, 2024 18:43
@DarshitChanpura DarshitChanpura self-assigned this Jul 23, 2024
@DarshitChanpura DarshitChanpura changed the title Adds datasource filter for version decoupling in MDS [MDS] Adds datasource filter for version decoupling Jul 23, 2024
Copy link
Collaborator

@derek-ho derek-ho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
@DarshitChanpura
Copy link
Member Author

DarshitChanpura commented Jul 23, 2024

Copy link
Collaborator

@derek-ho derek-ho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the yarn.lock need to be updated?

cwperks
cwperks previously approved these changes Jul 23, 2024
Copy link
Collaborator

@derek-ho derek-ho left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets take a look at the cypress failures for MDS to make sure there are no regressions prior to merging

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
@cwperks cwperks added the backport 2.16 backport to 2.16 branch label Jul 23, 2024
cwperks
cwperks previously approved these changes Jul 23, 2024
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
@DarshitChanpura DarshitChanpura dismissed derek-ho’s stale review July 23, 2024 23:33

Changes have been addressed. MDS cypress tests are no longer failing.

@DarshitChanpura DarshitChanpura merged commit e9609ac into opensearch-project:main Jul 23, 2024
18 of 19 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-2051-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e9609acc76e7db541eb3701bd53369555a98517c
# Push it to GitHub
git push --set-upstream origin backport/backport-2051-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-2051-to-2.x.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.16 failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.16 2.16
# Navigate to the new working tree
cd .worktrees/backport-2.16
# Create a new branch
git switch --create backport/backport-2051-to-2.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e9609acc76e7db541eb3701bd53369555a98517c
# Push it to GitHub
git push --set-upstream origin backport/backport-2051-to-2.16
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.16

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

DarshitChanpura added a commit to DarshitChanpura/security-dashboards-plugin that referenced this pull request Jul 23, 2024
…ct#2051)

---------

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
(cherry picked from commit e9609ac)
DarshitChanpura added a commit to DarshitChanpura/security-dashboards-plugin that referenced this pull request Jul 23, 2024
…ct#2051)

---------

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
(cherry picked from commit e9609ac)
DarshitChanpura added a commit that referenced this pull request Jul 24, 2024
---------

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
(cherry picked from commit e9609ac)
DarshitChanpura added a commit that referenced this pull request Jul 24, 2024
---------

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
(cherry picked from commit e9609ac)
@DarshitChanpura DarshitChanpura deleted the dataSource-filter branch July 24, 2024 14:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport to 2.x branch backport 2.16 backport to 2.16 branch v2.16.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[FEATURE] Support Version Decoupling in Security Dashboards Plugin
6 participants