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] Do not decode datasource id from url; update global state on datasource change #1216

Conversation

amsiglan
Copy link
Collaborator

Description

This PR fixes two issues:

  • When a data source is changed, the corresponding global state like Channel types, installed plugins and log types should get updated in this plugin
  • The datasource Id passed in the url should be used as is and not decoded when parsing the url

Check List

  • 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.

Copy link
Collaborator

@AWSHurneyt AWSHurneyt left a comment

Choose a reason for hiding this comment

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

Approved assuming CI passes.

@AWSHurneyt AWSHurneyt merged commit ad76b7b into opensearch-project:main Oct 31, 2024
9 of 14 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 31, 2024
Signed-off-by: Amardeepsingh Siglani <[email protected]>
(cherry picked from commit ad76b7b)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.17 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/security-analytics-dashboards-plugin/backport-2.17 2.17
# Navigate to the new working tree
pushd ../.worktrees/security-analytics-dashboards-plugin/backport-2.17
# Create a new branch
git switch --create backport-1216-to-2.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ad76b7bfacd90eaeb95ea8ee674eaf3a1af4746d
# Push it to GitHub
git push --set-upstream origin backport-1216-to-2.17
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security-analytics-dashboards-plugin/backport-2.17

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.18 failed:

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

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/security-analytics-dashboards-plugin/backport-2.18 2.18
# Navigate to the new working tree
pushd ../.worktrees/security-analytics-dashboards-plugin/backport-2.18
# Create a new branch
git switch --create backport-1216-to-2.18
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ad76b7bfacd90eaeb95ea8ee674eaf3a1af4746d
# Push it to GitHub
git push --set-upstream origin backport-1216-to-2.18
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security-analytics-dashboards-plugin/backport-2.18

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

AWSHurneyt pushed a commit to AWSHurneyt/security-analytics-dashboards-plugin that referenced this pull request Oct 31, 2024
amsiglan pushed a commit that referenced this pull request Oct 31, 2024
#1217)

(cherry picked from commit ad76b7b)

Signed-off-by: Amardeepsingh Siglani <[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>
amsiglan added a commit that referenced this pull request Dec 2, 2024
#1219)

Signed-off-by: Amardeepsingh Siglani <[email protected]>
(cherry picked from commit ad76b7b)

Co-authored-by: Amardeepsingh Siglani <[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