Merge lp://staging/~tvansteenburgh/python-jujuclient/1625632 into lp://staging/python-jujuclient
Proposed by
Tim Van Steenburgh
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 97 | ||||
| Proposed branch: | lp://staging/~tvansteenburgh/python-jujuclient/1625632 | ||||
| Merge into: | lp://staging/python-jujuclient | ||||
| Diff against target: |
293 lines (+116/-26) 6 files modified
jujuclient/connector.py (+47/-15) jujuclient/juju1/connector.py (+5/-2) jujuclient/juju2/connector.py (+6/-3) jujuclient/juju2/rpc.py (+53/-5) jujuclient/rpc.py (+3/-0) tests/test_juju2.py (+2/-1) |
||||
| To merge this branch: | bzr merge lp://staging/~tvansteenburgh/python-jujuclient/1625632 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tim Van Steenburgh (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Add support for macaroon auth
Makes python-jujuclient usable with a shared controller or model
by automatically attempting macaroon auth using ~/.go-cookies.
Does not contain support for fetching or discharging new
macaroons. In other words, if you don't already have a discharged
macaroon (e.g. the ones created by the juju cli in ~/.go-cookies),
this won't work for you.
Also fixes a KeyError that could occur if accounts.yaml is missing
a password field.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Tested by deej.