Role optional #753
Merged
Role optional #753
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AthenZ#746) * Adding a new API to get pending members for audit enabled or selfserve roles * using latest version of GO and NODE in travis * review comments changes
havetisyan
reviewed
Aug 16, 2019
servers/zms/src/main/java/com/yahoo/athenz/zms/store/file/FileConnection.java
Outdated
Show resolved
Hide resolved
| @@ -90,10 +90,10 @@ | |||
| + "WHERE role.role_id=? AND principal.name=? AND role_member.active=true;"; | |||
| private static final String SQL_GET_ROLE_MEMBER_EXISTS = "SELECT principal_id FROM role_member WHERE role_id=? AND principal_id=?;"; | |||
| private static final String SQL_GET_ROLE_MEMBER_INACTIVE_EXISTS = "SELECT principal_id FROM role_member WHERE role_id=? AND principal_id=? AND active=false;"; | |||
| private static final String SQL_LIST_ROLE_MEMBERS = "SELECT principal.name, role_member.expiration FROM principal " | |||
| private static final String SQL_LIST_ROLE_MEMBERS = "SELECT principal.name, role_member.expiration, role_member.active FROM principal " | |||
There was a problem hiding this comment.
why do we need to make this a conditional? don't we already have active set to 1 by default? so isn't it as simple as:
WHERE role.role_id=? AND role_member.active=?
| @@ -1288,7 +1290,15 @@ public int countRoles(String domainName) { | |||
| throw notFoundError(caller, ZMSConsts.OBJECT_ROLE, ZMSUtils.roleResourceName(domainName, roleName)); | |||
| } | |||
| List<RoleMember> members = new ArrayList<>(); | |||
| try (PreparedStatement ps = con.prepareStatement(SQL_LIST_ROLE_MEMBERS)) { | |||
|
|
|||
| String query = SQL_LIST_ROLE_MEMBERS; | |||
There was a problem hiding this comment.
see comment about the query string.
havetisyan
approved these changes
Aug 17, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I confirm that this contribution is made under the terms of the license found in the root directory of this repository's source tree and that I have the authority necessary to make this contribution on behalf of its copyright owner.