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

Add applicable_data_sources field to workflows definition #1868

Merged
merged 9 commits into from
Jun 10, 2024

Conversation

Swiddis
Copy link
Collaborator

@Swiddis Swiddis commented Jun 3, 2024

Description

Implements the solution discussed in #1855 to add an applicable_data_sources field that filters integration workflow rendering. As a proof of concept I added this filtering to the VPC integration to show it works.

image

Issues Resolved

Closes #1855

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • 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.

@Swiddis Swiddis added enhancement New feature or request integrations Used to denote items related to the Integrations project labels Jun 3, 2024
@Swiddis Swiddis marked this pull request as ready for review June 3, 2024 21:32
@ps48
Copy link
Member

ps48 commented Jun 4, 2024

@Swiddis can you please resolve the conflicts?

@Swiddis Swiddis added the v2.15.0 label Jun 7, 2024
@ps48 ps48 merged commit fe25bf1 into opensearch-project:main Jun 10, 2024
13 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 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/dashboards-observability/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/dashboards-observability/backport-2.x
# Create a new branch
git switch --create backport/backport-1868-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 fe25bf19acf5f973ccd86bafb1ecc8d8ce754d33
# Push it to GitHub
git push --set-upstream origin backport/backport-1868-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-observability/backport-2.x

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x enhancement New feature or request integrations Used to denote items related to the Integrations project v2.15.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[FEATURE] Integration: align datasource with workflow
4 participants