environs: move Bootstrap from juju

environs/bootstrap.go

-package juju
+package environs
 
 import (
         "bytes"
         "crypto/rand"
         "crypto/rsa"
         "crypto/sha1"
         "crypto/tls"
         "crypto/x509"
         "crypto/x509/pkix"
         "encoding/pem"
         "fmt"
         "io/ioutil"
-        "launchpad.net/juju-core/environs"
         "launchpad.net/juju-core/log"
         "math/big"
         "os"
         "path/filepath"
         "time"
 )
 
 // Bootstrap bootstraps the given environment.  The CA certificate and
 // private key in PEM format can be given in caPEM; if this is nil,
 // they are read from $HOME/.juju/<environ-name>.pem, or generated and
 // written there if the file does not exist.  If uploadTools is true,
 // the current version of the juju tools will be uploaded, as documented
-// in environs.Environ.Bootstrap.
-func Bootstrap(environ environs.Environ, uploadTools bool, caPEM []byte) error {
+// in Environ.Bootstrap.
+func Bootstrap(environ Environ, uploadTools bool, caPEM []byte) error {
         if caPEM == nil {
                 var err error
                 caPEM, err = generateCACert(environ.Name())
                 if err != nil {
                         return fmt.Errorf("cannot generate CA certificate: %v", err)
                 }
         }
         caCert, caKey, err := parseCAPEM(caPEM, true)
         if err != nil {
                 return fmt.Errorf("bad CA PEM: %v", err)
@@ skipping 28 matching lines @@
                         // TODO quote the environment name when we start using
                         // Go version 1.1. See Go issue 3791.
                         CommonName:   fmt.Sprintf("juju-generated CA for environment %s", envName),
                         Organization: []string{"juju"},
                 },
                 NotBefore:             now.UTC().Add(-5 * time.Minute),
                 NotAfter:              now.UTC().AddDate(10, 0, 0), // 10 years hence.
                 SubjectKeyId:          bigIntHash(priv.N),
                 KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature | x509.KeyUsageCertSign,
                 BasicConstraintsValid: true,
-                IsCA:                  true,
-                MaxPathLen:            0, // Disallow delegation for now.
+                IsCA:       true,
+                MaxPathLen: 0, // Disallow delegation for now.

[gz, 2012/11/23 17:25:35]

go fmt is weird.

         }
         certDER, err := x509.CreateCertificate(rand.Reader, template, template, &priv.PublicKey, priv)
         if err != nil {
                 return nil, fmt.Errorf("canot create certificate: %v", err)
         }
         var b bytes.Buffer
         pem.Encode(&b, &pem.Block{
                 Type:  "CERTIFICATE",
                 Bytes: certDER,
         })
@@ skipping 95 matching lines @@
         tlsCert, err := tls.X509KeyPair(pem.EncodeToMemory(certBlock), pem.EncodeToMemory(keyBlock))
         if err != nil {
                 return nil, nil, err
         }
         priv, ok := tlsCert.PrivateKey.(*rsa.PrivateKey)
         if !ok {
                 return nil, nil, fmt.Errorf("CA private key has unexpected type %T", tlsCert.PrivateKey)
         }
         return cert, priv, nil
 }