various: set passwords in state at bootstrap time.

juju/conn.go

 package juju
 
 import (
         "fmt"
         "launchpad.net/juju-core/environs"
         "launchpad.net/juju-core/state"
         "launchpad.net/juju-core/trivial"
 )
 
 // Conn holds a connection to a juju environment and its
 // associated state.
 type Conn struct {
         Environ environs.Environ
         State   *state.State
 }
 
 // NewConn returns a new Conn that uses the
 // given environment. The environment must have already
 // been bootstrapped.
 func NewConn(environ environs.Environ) (*Conn, error) {
         info, err := environ.StateInfo()
         if err != nil {
                 return nil, err
         }
         password := environ.Config().AdminSecret()
         info.Password = password
         st, err := state.Open(info)
         if err == state.ErrUnauthorized {
                 // We can't connect with the administrator password,;
-                // perhaps we are the first connection and the

[niemeyer, 2012/10/09 22:35:45]

s/we are/this was/

[rog, 2012/10/11 10:51:13]

Done.

+                // perhaps this was the first connection and the
                 // password has not been changed yet.
                 info.Password = trivial.PasswordHash(password)
                 st, err = state.Open(info)
                 if err != nil {
                         return nil, err
                 }
                 if err := st.SetAdminPassword(password); err != nil {
                         return nil, err
                 }

[niemeyer, 2012/10/09 22:35:45]

This turned out rather nice.

         } else if err != nil {
                 return nil, err
         }
         conn := &Conn{
                 Environ: environ,
                 State:   st,
         }
         if err := conn.updateSecrets(); err != nil {
                 conn.Close()
                 return nil, fmt.Errorf("unable to push secrets: %v", err)
@@ skipping 37 matching lines @@
                         // Environment already has secrets. Won't send again.
                         return nil
                 }
         }
         cfg, err = cfg.Apply(secrets)
         if err != nil {
                 return err
         }
         return c.State.SetEnvironConfig(cfg)
 }