Augment ServiceGetResults

state/statecmd/get.go

Index: state/statecmd/get.go
=== modified file 'state/statecmd/get.go'
--- state/statecmd/get.go	2013-03-06 16:44:27 +0000
+++ state/statecmd/get.go	2013-04-08 20:52:01 +0000
@@ -20,7 +20,7 @@
 	if err != nil {
 		return params.ServiceGetResults{}, err
 	}
-	svcfg, err := svc.Config()
+	svcCfg, err := svc.Config()
 	if err != nil {
 		return params.ServiceGetResults{}, err
 	}
@@ -28,12 +28,18 @@
 	if err != nil {
 		return params.ServiceGetResults{}, err
 	}
-	chcfg := charm.Config().Options
+	charmCfg := charm.Config().Options
+
+	constraints, err := svc.Constraints()
+	if err != nil {
+		return params.ServiceGetResults{}, err
+	}
 
 	return params.ServiceGetResults{
-		Service:  p.ServiceName,
-		Charm:    charm.Meta().Name,
-		Settings: merge(svcfg.Map(), chcfg),
+		Service:     p.ServiceName,
+		Charm:       charm.Meta().Name,
+		Config:      merge(svcCfg.Map(), charmCfg),
+		Constraints: constraints,
 	}, nil
 }