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

Integrate multitenancy into workflow provisioning #1012

Merged
merged 4 commits into from
Jan 23, 2025

Conversation

siddharthabingi
Copy link
Contributor

@siddharthabingi siddharthabingi commented Jan 21, 2025

Description

Pass the tenantId in the (de-)(re-)provisioning transport actions to the workflow steps that execute the provisioning, and eventually to the respective client calls.

Related Issues

#987

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

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
Member

@dbwiddis dbwiddis left a comment

Choose a reason for hiding this comment

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

LGTM So far.

Can you do the actual passing to mlClient for connector, model, and model group steps? (Yes, the PR for model was merged after you submitted, but yay rapid iteration!)

Siddhartha Bingi added 4 commits January 22, 2025 14:48
Copy link

codecov bot commented Jan 22, 2025

Codecov Report

Attention: Patch coverage is 71.42857% with 2 lines in your changes missing coverage. Please review.

Project coverage is 76.39%. Comparing base (6312605) to head (16e2f2d).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
.../transport/DeprovisionWorkflowTransportAction.java 50.00% 1 Missing ⚠️
...opensearch/flowframework/workflow/ProcessNode.java 50.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main    #1012      +/-   ##
============================================
- Coverage     76.40%   76.39%   -0.02%     
  Complexity     1010     1010              
============================================
  Files           100      100              
  Lines          4879     4881       +2     
  Branches        455      455              
============================================
+ Hits           3728     3729       +1     
- Misses          954      955       +1     
  Partials        197      197              

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

Copy link
Member

@dbwiddis dbwiddis left a comment

Choose a reason for hiding this comment

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

LGTM. Let's get this merged so I can rebase against it and you can work on a new PR for the mlClient connection now that you have the tenantId in the workflow steps.

@owaiskazi19 owaiskazi19 merged commit 055f1ea into opensearch-project:main Jan 23, 2025
21 of 22 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 23, 2025
* Adding tenantId in ProcessNode to be surfaced to the client

Signed-off-by: Siddhartha Bingi <[email protected]>

* Passing tenantId in Transport Actions

Signed-off-by: Siddhartha Bingi <[email protected]>

* Updating tests to have tenantId as null for consistency

Signed-off-by: Siddhartha Bingi <[email protected]>

* Minor code refactoring

Signed-off-by: Siddhartha Bingi <[email protected]>

---------

Signed-off-by: Siddhartha Bingi <[email protected]>
Co-authored-by: Siddhartha Bingi <[email protected]>
(cherry picked from commit 055f1ea)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
dbwiddis pushed a commit that referenced this pull request Jan 23, 2025
Integrate multitenancy into workflow provisioning  (#1012)

* Adding tenantId in ProcessNode to be surfaced to the client



* Passing tenantId in Transport Actions



* Updating tests to have tenantId as null for consistency



* Minor code refactoring



---------



(cherry picked from commit 055f1ea)

Signed-off-by: Siddhartha Bingi <[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>
Co-authored-by: Siddhartha Bingi <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport PRs to 2.x branch skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants