state: add CACert to Info.

environs/bootstrap_test.go

 package environs_test
 
 import (
         "bytes"
         "crypto/rsa"
         "crypto/tls"
         "crypto/x509"
         "encoding/pem"
         "fmt"
         "io"
@@ skipping 39 matching lines @@
         // correctly.
         caKeyPEM, err := ioutil.ReadFile(filepath.Join(os.Getenv("HOME"), ".juju", "foo.pem"))
         c.Assert(err, IsNil)
 
         caCert, _ := parseCertAndKey(c, caKeyPEM)
 
         caName := checkTLSConnection(c, caCert, bootstrapCert, bootstrapKey)
         c.Assert(caName, Equals, `juju-generated CA for environment foo`)
 }
 
-var testServerPEM = []byte(testing.CACertPEM + testing.CAKeyPEM)
+var testServerPEM = []byte(testing.CACert + testing.CAKey)
 
 func (s *bootstrapSuite) TestBootstrapExistingKey(c *C) {
         path := filepath.Join(os.Getenv("HOME"), ".juju", "bar.pem")
         err := ioutil.WriteFile(path, testServerPEM, 0600)
         c.Assert(err, IsNil)
 
         env := &bootstrapEnviron{name: "bar"}
         err = environs.Bootstrap(env, false, nil)
         c.Assert(err, IsNil)
         c.Assert(env.bootstrapCount, Equals, 1)
 
         bootstrapCert, bootstrapKey := parseCertAndKey(c, env.stateServerPEM)
 
-        caName := checkTLSConnection(c, certificate(testing.CACertPEM), bootstrapCert, bootstrapKey)
+        caName := checkTLSConnection(c, certificate(testing.CACert), bootstrapCert, bootstrapKey)
         c.Assert(caName, Equals, testing.CACertX509.Subject.CommonName)
 }
 
 func (s *bootstrapSuite) TestBootstrapUploadTools(c *C) {
         env := &bootstrapEnviron{name: "foo"}
         err := environs.Bootstrap(env, false, testServerPEM)
         c.Assert(err, IsNil)
         c.Assert(env.bootstrapCount, Equals, 1)
         c.Assert(env.uploadTools, Equals, false)
 
         env = &bootstrapEnviron{name: "foo"}
         err = environs.Bootstrap(env, true, testServerPEM)
         c.Assert(err, IsNil)
         c.Assert(env.bootstrapCount, Equals, 1)
         c.Assert(env.uploadTools, Equals, true)
 }
 
 func (s *bootstrapSuite) TestBootstrapWithCertArgument(c *C) {
         env := &bootstrapEnviron{name: "bar"}
         err := environs.Bootstrap(env, false, testServerPEM)
         c.Assert(err, IsNil)
         c.Assert(env.bootstrapCount, Equals, 1)
 
         bootstrapCert, bootstrapKey := parseCertAndKey(c, env.stateServerPEM)
 
-        caName := checkTLSConnection(c, certificate(testing.CACertPEM), bootstrapCert, bootstrapKey)
+        caName := checkTLSConnection(c, certificate(testing.CACert), bootstrapCert, bootstrapKey)
         c.Assert(caName, Equals, testing.CACertX509.Subject.CommonName)
 }
 
 var invalidCertTests = []struct {
         pem string
         err string
 }{{
         `xxxx`,
         "bad CA PEM: CA PEM holds no certificate",
 }, {
-        testing.CACertPEM,
+        testing.CACert,
         "bad CA PEM: CA PEM holds no private key",
 }, {
-        testing.CAKeyPEM,
+        testing.CAKey,
         "bad CA PEM: CA PEM holds no certificate",
 }, {
         `-----BEGIN CERTIFICATE-----
 MIIBnTCCAUmgAwIBAgIBADALBgkqhkiG9w0BAQUwJjENMAsGA1UEChMEanVqdTEV
 MBMGA1UEAxMManVqdSB0ZXN0aW5nMB4XDTEyMTExNDE0Mzg1NFoXDTIyMTExNDE0
 NDM1NFowJjENMAsGA1UEChMEanVqdTEVMBMGA1UEAxMManVqdSB0ZXN0aW5n
 -----END CERTIFICATE-----
-` + testing.CAKeyPEM,
+` + testing.CAKey,
         `bad CA PEM: ASN\.1.*`,
 }, {
         `-----BEGIN RSA PRIVATE KEY-----
 MIIBOwIBAAJBAII46mf1pYpwqvYZAa3KDAPs91817Uj0FiI8CprYjfcXn7o+oV1+
 -----END RSA PRIVATE KEY-----
-` + testing.CACertPEM,
+` + testing.CACert,
         "bad CA PEM: crypto/tls: .*",
 }, {
         `-----BEGIN CERTIFICATE-----
 MIIBmjCCAUagAwIBAgIBADALBgkqhkiG9w0BAQUwJjENMAsGA1UEChMEanVqdTEV
 MBMGA1UEAxMManVqdSB0ZXN0aW5nMB4XDTEyMTExNDE3MTU1NloXDTIyMTExNDE3
 MjA1NlowJjENMAsGA1UEChMEanVqdTEVMBMGA1UEAxMManVqdSB0ZXN0aW5nMFow
 CwYJKoZIhvcNAQEBA0sAMEgCQQC96/CsTTY1Va8et6QYNXwrssAi36asFlV/fksG
 hqRucidiz/+xHvhs9EiqEu7NGxeVAkcfIhXu6/BDlobtj2v5AgMBAAGjYzBhMA4G
 A1UdDwEB/wQEAwIABDAPBgNVHRMBAf8EBTADAgEBMB0GA1UdDgQWBBRqbxkIW4R0
 vmmkUoYuWg9sDob4jzAfBgNVHSMEGDAWgBRqbxkIW4R0vmmkUoYuWg9sDob4jzAL
@@ skipping 197 matching lines @@
                 }
         }
         c.Assert(certBlocks, HasLen, 1)
         c.Assert(otherBlocks, HasLen, 1)
         cert = certificate(pem.EncodeToMemory(certBlocks[0]))
         tlsCert, err := tls.X509KeyPair(cert, pem.EncodeToMemory(otherBlocks[0]))
         c.Assert(err, IsNil)
 
         return cert, tlsCert.PrivateKey.(*rsa.PrivateKey)
 }