all: make certificates mandatory

environs/ec2/ec2.go

 package ec2
 
 import (
         "fmt"
         "io/ioutil"
         "launchpad.net/goamz/aws"
         "launchpad.net/goamz/ec2"
         "launchpad.net/goamz/s3"
         "launchpad.net/juju-core/environs"
         "launchpad.net/juju-core/environs/cloudinit"
@@ skipping 230 matching lines @@
                 if err != nil {
                         return fmt.Errorf("cannot find tools: %v", err)
                 }
         }
         config, err := environs.BootstrapConfig(providerInstance, e.Config(), tools)
         if err != nil {
                 return fmt.Errorf("unable to determine inital configuration: %v", err)
         }
         caCert, hasCert := e.Config().CACert()
         if !hasCert {
-                return fmt.Errorf("environ config has no CA certificate")

[niemeyer, 2012/11/27 19:35:23]

"no CA certificate in environment configuration" (as dummy)

+                return fmt.Errorf("no CA certificate in environment configuration")
         }
         info := &state.Info{
                 Password: trivial.PasswordHash(password),
                 CACert:   caCert,
         }
         inst, err := e.startInstance(&startInstanceParams{
                 machineId:       0,
                 info:            info,
                 tools:           tools,
                 stateServer:     true,
@@ skipping 22 matching lines @@
         return nil
 }
 
 func (e *environ) StateInfo() (*state.Info, error) {
         st, err := e.loadState()
         if err != nil {
                 return nil, err
         }
         cert, hasCert := e.Config().CACert()
         if !hasCert {
-                return nil, fmt.Errorf("environ config has no CA certificate")

[niemeyer, 2012/11/27 19:35:23]

"no CA certificate in environment configuration" (as dummy)

+                return nil, fmt.Errorf("no CA certificate in environment configuration")
         }
         var addrs []string
         // Wait for the DNS names of any of the instances
         // to become available.
         log.Printf("environs/ec2: waiting for DNS name(s) of state server instances %v", st.StateInstances)
         for a := longAttempt.Start(); len(addrs) == 0 && a.Next(); {
                 insts, err := e.Instances(st.StateInstances)
                 if err != nil && err != environs.ErrPartialInstances {
                         return nil, err
                 }
@@ skipping 655 matching lines @@
                 }
                 var data []byte
                 data, err = ioutil.ReadAll(resp.Body)
                 if err != nil {
                         continue
                 }
                 return strings.TrimSpace(string(data)), nil
         }
         return
 }