Fixing Issue #353 Capture config users&roles by name #354
Conversation
The setup:get-configuration function in setup.xqy used only ids to return users and roles. This prevented the capture configurations option from capturing users and roles specified by name in the current project configuration or as a parameter. This was a documented “TODO” in the code in order to improve the capture functionality. The setup:get-configuration function will now take user/role names or ids as a parameter and return the requested configurations. Also added default users and roles from current project to capture_environment_config in server_config.rb. Lastly removed word “full” from logging since it could be a full or partial configuration that is being captured.
|
Looks good (haven't tested). A future enhancement would be to pull in the names from the merged configuration rather than the properties, as there are sometimes users or roles put directly into ml-config.xml. |
|
Simplified implementation based on Geert's comments, thanks Geert! |
| declare function setup:get-users-by-name($names as xs:string*) as element(sec:users)? { | ||
| let $ids := | ||
| for $name in $names | ||
| return xdmp:user($name) |
There was a problem hiding this comment.
I am afraid my advise has had a negative side effect. You former approach would probably have silently ignored users and roles that didn't exist, whereas this will throw a large stacktrace. I lean towards ignoring it silently, you will notice soon enough it didn't capture such users/roles once you look inside the captured ml-config..
There was a problem hiding this comment.
I agree, I will make change to absorb when users and roles don't exists. Thanks!
|
Is this PR still in progress? |
|
My apologies, I had not seen the last comments from Geert, my first foray into GitHub, I will look over all comments within the next couple of days for both of my pull requests and report back findings/commit fixes as needed. |
…o that typeswitch works as intended in XQuery.
|
Committed changes based on feedback. |
|
Capture now runs without errors.. |
…les-by-name Fixing Issue #353 Capture config users&roles by name
The setup:get-configuration function in setup.xqy used only ids to
return users and roles. This prevented the capture configurations
option from capturing users and roles specified by name in the
current project configuration or as a parameter. This was a
documented “TODO” in the code in order to improve the capture
functionality. The setup:get-configuration function will now take
user/role names or ids as a parameter and return the requested
configurations. Also added default users and roles from current
project to capture_environment_config in server_config.rb. Lastly
removed word “full” from logging since it could be a full or partial
configuration that is being captured.