statecmd: don't use juju.Conn unnecessarily

juju/conn.go

 package juju
 
 import (
         "crypto/sha256"
         "encoding/hex"
         "errors"
         "fmt"
         "io"
         "io/ioutil"
         "launchpad.net/goyaml"
@@ skipping 26 matching lines @@
 func NewConn(environ environs.Environ) (*Conn, error) {
         info, _, err := environ.StateInfo()
         if err != nil {
                 return nil, err
         }
         password := environ.Config().AdminSecret()
         if password == "" {
                 return nil, fmt.Errorf("cannot connect without admin-secret")
         }
         info.Password = password
-        st, err := state.Open(info)
+        st, err := state.Open(info, state.DefaultDialTimeout)
         if state.IsUnauthorizedError(err) {
                 // We can't connect with the administrator password,;
                 // perhaps this was the first connection and the
                 // password has not been changed yet.
                 info.Password = trivial.PasswordHash(password)
 
                 // We try for a while because we might succeed in
                 // connecting to mongo before the state has been
                 // initialized and the initial password set.
                 for a := redialStrategy.Start(); a.Next(); {
-                        st, err = state.Open(info)
+                        st, err = state.Open(info, state.DefaultDialTimeout)
                         if !state.IsUnauthorizedError(err) {
                                 break
                         }
                 }
                 if err != nil {
                         return nil, err
                 }
                 if err := st.SetAdminMongoPassword(password); err != nil {
                         return nil, err
                 }
@@ skipping 323 matching lines @@
 
 // strip removes from validated, any keys which are not also present in unvalidated.
 func strip(validated map[string]interface{}, unvalidated map[string]string) map[string]interface{} {
         for k := range validated {
                 if _, ok := unvalidated[k]; !ok {
                         delete(validated, k)
                 }
         }
         return validated
 }