Add ServiceDestroyUnits to the API

state/state.go

 // The state package enables reading, observing, and changing
 // the state stored in MongoDB of a whole environment
 // managed by juju.
 package state
 
 import (
         "fmt"
         "labix.org/v2/mgo"
         "labix.org/v2/mgo/bson"
         "labix.org/v2/mgo/txn"
@@ skipping 39 matching lines @@
         }
         var doc toolsDoc
         if err := raw.Unmarshal(&doc); err != nil {
                 return err
         }
         t.Binary = doc.Version
         t.URL = doc.URL
         return nil
 }
 
+const serviceSnippet = "[a-z][a-z0-9]*(-[a-z0-9]*[a-z][a-z0-9]*)*"
+
 var (
-        validService = regexp.MustCompile("^[a-z][a-z0-9]*(-[a-z0-9]*[a-z][a-z0-9]*)*$")
-        validUnit    = regexp.MustCompile("^[a-z][a-z0-9]*(-[a-z0-9]*[a-z][a-z0-9]*)*/[0-9]+$")
+        validService = regexp.MustCompile("^" + serviceSnippet + "$")
+        validUnit    = regexp.MustCompile("^" + serviceSnippet + "(-[a-z0-9]*[a-z][a-z0-9]*)*/[0-9]+$")
         validMachine = regexp.MustCompile("^0$|^[1-9][0-9]*$")
 )
 
 // IsServiceName returns whether name is a valid service name.
 func IsServiceName(name string) bool {
         return validService.MatchString(name)
 }
 
 // IsUnitName returns whether name is a valid unit name.
 func IsUnitName(name string) bool {
@@ skipping 754 matching lines @@
                 }}
                 if err := st.runner.Run(ops, "", nil); err != nil {
                         return fmt.Errorf("cannot remove empty cleanup document: %v", err)
                 }
         }
         if err := iter.Err(); err != nil {
                 return fmt.Errorf("cannot read cleanup document: %v", err)
         }
         return nil
 }