Left: | ||
Right: |
LEFT | RIGHT |
---|---|
1 package main | 1 package main |
2 | 2 |
3 import ( | 3 import ( |
4 "errors" | 4 "errors" |
5 | 5 |
6 "launchpad.net/gnuflag" | 6 "launchpad.net/gnuflag" |
7 "launchpad.net/juju-core/cmd" | 7 "launchpad.net/juju-core/cmd" |
8 "launchpad.net/juju-core/juju" | 8 "launchpad.net/juju-core/juju" |
9 "launchpad.net/juju-core/state/statecmd" | 9 "launchpad.net/juju-core/state/statecmd" |
10 ) | 10 ) |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
42 func (c *GetCommand) Run(ctx *cmd.Context) error { | 42 func (c *GetCommand) Run(ctx *cmd.Context) error { |
43 conn, err := juju.NewConnFromName(c.EnvName) | 43 conn, err := juju.NewConnFromName(c.EnvName) |
44 if err != nil { | 44 if err != nil { |
45 return err | 45 return err |
46 } | 46 } |
47 defer conn.Close() | 47 defer conn.Close() |
48 | 48 |
49 params := statecmd.ServiceGetParams{ | 49 params := statecmd.ServiceGetParams{ |
50 ServiceName: c.ServiceName, | 50 ServiceName: c.ServiceName, |
51 } | 51 } |
52 var results statecmd.ServiceGetResults | |
dfc
2013/02/21 01:51:31
See comment in state/statecmd/get.go
bac
2013/02/21 15:32:54
Done.
| |
53 | 52 |
54 » err = statecmd.ServiceGet(conn.State, params, &results) | 53 » results, err := statecmd.ServiceGet(conn.State, params) |
dfc
2013/02/21 01:51:31
if err := statecmd.ServiceGet(conn.State, params,
dimitern
2013/02/21 13:26:16
+1
bac
2013/02/21 15:32:54
Can't use that form now that I'm catching two retu
| |
55 if err != nil { | 54 if err != nil { |
56 return err | 55 return err |
57 } | 56 } |
58 | 57 |
59 resultsMap := map[string]interface{}{ | 58 resultsMap := map[string]interface{}{ |
60 "service": results.Service, | 59 "service": results.Service, |
61 "charm": results.Charm, | 60 "charm": results.Charm, |
62 "settings": results.Settings, | 61 "settings": results.Settings, |
63 } | 62 } |
64 return c.out.Write(ctx, resultsMap) | 63 return c.out.Write(ctx, resultsMap) |
65 } | 64 } |
LEFT | RIGHT |