state: add CACert to Info.

environs/dummy/environs.go

 // The dummy provider implements an environment provider for testing
 // purposes, registered with environs under the name "dummy".
 //
 // The configuration YAML for the testing environment
 // must specify a "state-server" property with a boolean
 // value. If this is true, a state server will be started
 // the first time StateInfo is called on a newly reset environment.
 //
 // The configuration data also accepts a "broken" property
 // of type boolean. If this is non-empty, any operation
@@ skipping 27 matching lines @@
         "time"
 )
 
 // stateInfo returns a *state.Info which allows clients to connect to the
 // shared dummy state, if it exists.
 func stateInfo() *state.Info {
         if testing.MgoAddr == "" {
                 panic("dummy environ state tests must be run with MgoTestPackage")
         }
         return &state.Info{
-                Addrs:     []string{testing.MgoAddr},
-                CACertPEM: []byte(testing.CACertPEM),
+                Addrs:  []string{testing.MgoAddr},
+                CACert: []byte(testing.CACert),
         }
 }
 
 // Operation represents an action on the dummy provider.
 type Operation interface{}
 
 type GenericOperation struct {
         Env string
 }
 
@@ skipping 312 matching lines @@
                         return fmt.Errorf("dummy.%s is broken", method)
                 }
         }
         return nil
 }
 
 func (e *environ) Name() string {
         return e.state.name
 }
 
-func (e *environ) Bootstrap(uploadTools bool, certAndKey []byte) error {
+func (e *environ) Bootstrap(uploadTools bool, cert, key []byte) error {
         defer delay()
         if err := e.checkBroken("Bootstrap"); err != nil {
                 return err
         }
         password := e.Config().AdminSecret()
         if password == "" {
                 return fmt.Errorf("admin-secret is required for bootstrap")
         }
         var tools *state.Tools
         var err error
@@ skipping 311 matching lines @@
 // time.Durations into this value.
 var providerDelay time.Duration
 
 // pause execution to simulate the latency of a real provider
 func delay() {
         if providerDelay > 0 {
                 log.Printf("environs/dummy: pausing for %v", providerDelay)
                 <-time.After(providerDelay)
         }
 }