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.

Sign up for GitHub

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

fix cannot specify model access control parameters error #1068

Merged
merged 3 commits into from
Jul 11, 2023
Merged

fix cannot specify model access control parameters error #1068

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9012a96
fix cannot specify model access control parameters error
ylwu-amzn Jul 11, 2023
d766df9
add unit test for model group class and fix some bug
ylwu-amzn Jul 11, 2023
e20dc0b
fix failed ut
ylwu-amzn Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion plugin/src/main/java/org/opensearch/ml/model/MLModelGroupManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,9 @@ public void validateUniqueModelGroupName(String name, ActionListener<Boolean> li
}

private void validateSecurityDisabledOrModelAccessControlDisabled(MLRegisterModelGroupInput input) {
if (input.getModelAccessMode() != null || input.getIsAddAllBackendRoles() != null || input.getBackendRoles() != null) {
if (input.getModelAccessMode() != null
|| input.getIsAddAllBackendRoles() != null
|| !CollectionUtils.isEmpty(input.getBackendRoles())) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Seems strange, we better not allow backend_roles field show up in user's request instead of passing a empty list, can you change to this behavior?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thanks, think the same. I submit a new commit which add unit test for model group and fix some bug

Copy link
Collaborator

Choose a reason for hiding this comment

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

I think we can change this back to input.getBackEndRoles() != null, right?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I think keep as CollectionUtils.isEmpty is safer. Do you see any bug if we keep CollectionUtils.isEmpty?

Copy link
Collaborator

Choose a reason for hiding this comment

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

I mean we better make the field not showing up when access control is not enabled, user can pass the backend_roles field with empty list when using CollectionUtils.isEmpty, I prefer to make the field not shown.

throw new IllegalArgumentException(
"You cannot specify model access control parameters because the Security plugin or model access control is disabled on your cluster."
);
Expand Down