Add machine instance metadata to state

state/open.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package state
 
 import (
         "crypto/tls"
         "crypto/x509"
         stderrors "errors"
         "fmt"
@@ skipping 180 matching lines @@
                 return &errors.UnauthorizedError{err, msg}
         }
         return fmt.Errorf("%s: %v", msg, err)
 }
 
 func newState(session *mgo.Session, info *Info) (*State, error) {
         db := session.DB("juju")
         pdb := session.DB("presence")
         if info.Tag != "" {
                 if err := db.Login(info.Tag, info.Password); err != nil {
-                        return nil, maybeUnauthorized(err, "cannot log in to juju database")
+                        return nil, maybeUnauthorized(err, fmt.Sprintf("cannot log in to juju database as %q", info.Tag))
                 }
                 if err := pdb.Login(info.Tag, info.Password); err != nil {
-                        return nil, maybeUnauthorized(err, "cannot log in to presence database")
+                        return nil, maybeUnauthorized(err, fmt.Sprintf("cannot log in to presence database as %q", info.Tag))
                 }
         } else if info.Password != "" {
                 admin := session.DB("admin")
                 if err := admin.Login("admin", info.Password); err != nil {
                         return nil, maybeUnauthorized(err, "cannot log in to admin database")
                 }
         }
         st := &State{
                 info:           info,
                 db:             db,
                 environments:   db.C("environments"),
                 charms:         db.C("charms"),
                 machines:       db.C("machines"),
                 containerRefs:  db.C("containerRefs"),
                 instanceData:   db.C("instanceData"),
                 relations:      db.C("relations"),
                 relationScopes: db.C("relationscopes"),
                 services:       db.C("services"),
+                minUnits:       db.C("minunits"),
                 settings:       db.C("settings"),
                 settingsrefs:   db.C("settingsrefs"),
                 constraints:    db.C("constraints"),
                 units:          db.C("units"),
                 users:          db.C("users"),
                 presence:       pdb.C("presence"),
                 cleanups:       db.C("cleanups"),
                 annotations:    db.C("annotations"),
                 statuses:       db.C("statuses"),
         }
@@ skipping 63 matching lines @@
         }
         st.mu.Unlock()
         st.db.Session.Close()
         for _, err := range []error{err1, err2, err3} {
                 if err != nil {
                         return err
                 }
         }
         return nil
 }