| Index: juju/api.go |
| === modified file 'juju/api.go' |
| --- juju/api.go 2013-08-25 10:52:51 +0000 |
| +++ juju/api.go 2013-08-28 07:14:38 +0000 |
| @@ -50,12 +50,17 @@ |
| return c.State.Close() |
| } |
| -// NewAPIConnFromName returns an APIConn pointing at the environName |
| -// environment, or the default environment if not specified. |
| -func NewAPIConnFromName(environName string) (*APIConn, error) { |
| +// NewAPIClientFromName returns an api.Client connected to the API Server for |
| +// the environName environment. If environName is "" the default environment |
| +// will be used. |
| +func NewAPIClientFromName(environName string) (*api.Client, error) { |
| environ, err := environs.NewFromName(environName) |
| if err != nil { |
| return nil, err |
| } |
| - return NewAPIConn(environ, api.DefaultDialOpts()) |
| + apiconn, err := NewAPIConn(environ, api.DefaultDialOpts()) |
| + if err != nil { |
| + return nil, err |
| + } |
| + return apiconn.State.Client(), nil |
| } |
