Support different user credentials for different Roxy operations - #438 #602
Conversation
|
Odd, github shows a lot of diffs, must be whitespace/lineends? Use this to see the real diff: https://github.com/marklogic/roxy/pull/602/files?w=1 Looks clean to me at first glance, but haven't tried yet.. |
|
Thanks! I swear up and down my sublime settings match (or at least, should match) the recommendations provided. I have no idea why those diffs are in there or how I can clear them out. Open to any and all suggestions. |
| @@ -728,6 +734,10 @@ def bootstrap | |||
| end | |||
|
|
|||
| def wipe | |||
|
|
|||
| @ml_username = @properties['ml.bootstrap-user'] || @properties['ml.user'] | |||
| @ml_password = @properties['ml.bootstrap-password'] || @properties['ml.password'] | |||
There was a problem hiding this comment.
I think password selection needs to be a little more involved.
if ml.bootstrap-user, then use ml.bootstrap-password
use it even if it's empty, which will result in calling password_prompt
if !ml.bootstrap-user, then fall back to ml.password
Likewise for deploy-password below. This will handle the situation where some other password is used with the bootstrap user (unlikely, but quite possible).
There was a problem hiding this comment.
Great catch! I will make these changes and update the PR soon.
… for mlcp and corb user properly
|
@dmcassel I confirmed and then fixed the edge case you found. I also added support for a corb user and mlcp user properly. Look good to merge? |
|
Looks good! |
Implementation of the proposal to support #438 and somewhat related to #624