cleanup code to remove pending Actions

state/state.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 // Package state enables reading, observing, and changing
 // the state stored in MongoDB of a whole environment
 // managed by juju.
 package state
 
 import (
         "fmt"
@@ skipping 1393 matching lines @@
         }
         if err != nil {
                 return nil, fmt.Errorf("cannot get action %q: %v", id, err)
         }
         return newAction(st, doc), nil
 }
 
 // UnitActions returns a list of pending actions for a unit named name
 func (st *State) UnitActions(name string) ([]*Action, error) {
         actions := []*Action{}
-        actionId := actionPrefix(unitGlobalKey(name))

[fwereade, 2014/05/27 06:59:54]

`prefix :=` perhaps?

[johnweldon4, 2014/05/27 17:53:18]

Done.

-        sel := bson.D{{"_id", bson.D{{"$regex", "^" + actionId}}}}
+        prefix := actionPrefix(unitGlobalKey(name))
+        sel := bson.D{{"_id", bson.D{{"$regex", "^" + prefix}}}}
         iter := st.actions.Find(sel).Iter()
         doc := actionDoc{}
         for iter.Next(&doc) {
                 actions = append(actions, newAction(st, doc))
         }
         if err := iter.Err(); err != nil {
                 return actions, err
         }
         return actions, nil
 }
@@ skipping 173 matching lines @@
 func tagForGlobalKey(key string) (string, bool) {
         if len(key) < 3 || key[1] != '#' {
                 return "", false
         }
         p, ok := tagPrefix[key[0]]
         if !ok {
                 return "", false
         }
         return p + key[2:], true
 }