lp:~jameinel/juju-core/login-env-urls

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~go-bot/juju-core/trunk

Juju Engineering: Pending requested 2014-06-01

Diff: 1784 lines (+941/-101) (has conflicts)

29 files modified

dependencies.tsv (+1/-0)
environs/configstore/disk.go (+5/-2)
environs/configstore/interface.go (+4/-0)
environs/configstore/interface_test.go (+6/-4)
juju/api.go (+42/-14)
juju/apiconn_test.go (+139/-3)
juju/mock_test.go (+5/-0)
state/api/apiclient.go (+41/-6)
state/api/apiclient_test.go (+102/-1)
state/api/client_test.go (+69/-6)
state/api/export_test.go (+1/-0)
state/api/params/params.go (+2/-1)
state/api/state.go (+1/-0)
state/api/state_test.go (+21/-0)
state/apiserver/admin.go (+21/-1)
state/apiserver/apiserver.go (+84/-22)
state/apiserver/charms.go (+4/-0)
state/apiserver/charms_test.go (+93/-3)
state/apiserver/common/errors.go (+19/-0)
state/apiserver/common/errors_test.go (+9/-0)
state/apiserver/debuglog.go (+5/-0)
state/apiserver/debuglog_test.go (+54/-13)
state/apiserver/export_test.go (+4/-0)
state/apiserver/httphandler.go (+26/-0)
state/apiserver/login_test.go (+30/-5)
state/apiserver/root_test.go (+28/-0)
state/apiserver/server_test.go (+51/-0)
state/apiserver/tools.go (+4/-0)
state/apiserver/tools_test.go (+70/-20)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2823. By John A Meinel on 2014-06-05

add a test that we don't allow any-old-path

2822. By John A Meinel on 2014-06-03

custom error type.

2821. By John A Meinel on 2014-06-03

cache the environmentUUID to avoid extra DB requests on API requests.

2820. By John A Meinel on 2014-06-03

rename setup to setUp and Setup to SetUp

2819. By John A Meinel on 2014-06-01

merge trunk, resolve conflicts

2818. By John A Meinel on 2014-06-01

review changes from AXW's review.

2817. By John A Meinel on 2014-06-01

include bmizerany as a dependency

2816. By John A Meinel on 2014-06-01

Serve the errRoot which does what we need.

When the client connects, it doesn't fail during the websocket open, because
our websocket library supresses real errors. However, we can go one layer
deeper, and only serve an RPC layer that will return the error we want.

2815. By John A Meinel on 2014-06-01

Test that errRoot can proxy errors for us, as we want it to.

2814. By John A Meinel on 2014-05-30

I still have to figure out how/when to trigger validation of the environment UUID.

For the log/charms/tools URLs they are serving at a different time and are expecting a specific
response to their request.
However, I'm not sure how to get api.Open() to give the right error.