state: add CACert to Info.

environs/ec2/local_test.go

 package ec2_test
 
 import (
         "launchpad.net/goamz/aws"
         amzec2 "launchpad.net/goamz/ec2"
         "launchpad.net/goamz/ec2/ec2test"
         "launchpad.net/goamz/s3"
         "launchpad.net/goamz/s3/s3test"
         . "launchpad.net/gocheck"
         "launchpad.net/goyaml"
@@ skipping 16 matching lines @@
         attrs := map[string]interface{}{
                 "name":            "sample",
                 "type":            "ec2",
                 "region":          "test",
                 "control-bucket":  "test-bucket",
                 "public-bucket":   "public-tools",
                 "admin-secret":    "local-secret",
                 "access-key":      "x",
                 "secret-key":      "x",
                 "authorized-keys": "foo",
-                "ca-cert":         testing.CACertPEM,
-                "ca-private-key":  testing.CAKeyPEM,
+                "ca-cert":         testing.CACert,
+                "ca-private-key":  testing.CAKey,
         }
 
         Suite(&localServerSuite{
                 Tests: jujutest.Tests{
                         Config: attrs,
                 },
         })
         Suite(&localLiveSuite{
                 LiveTests: LiveTests{
                         LiveTests: jujutest.LiveTests{
@@ skipping 140 matching lines @@
 func (t *localServerSuite) TearDownTest(c *C) {
         t.Tests.TearDownTest(c)
         t.srv.stopServer(c)
         t.LoggingSuite.TearDownTest(c)
 }
 
 func (t *localServerSuite) TestBootstrapInstanceUserDataAndState(c *C) {
         policy := t.env.AssignmentPolicy()
         c.Assert(policy, Equals, state.AssignUnused)
 
-        err := environs.Bootstrap(t.env, true, []byte(testing.CACertPEM+testing.CAKeyPEM))
+        err := environs.Bootstrap(t.env, true, []byte(testing.CACert+testing.CAKey))
         c.Assert(err, IsNil)
 
         // check that the state holds the id of the bootstrap machine.
         state, err := ec2.LoadState(t.env)
         c.Assert(err, IsNil)
         c.Assert(state.StateInstances, HasLen, 1)
 
         insts, err := t.env.Instances(state.StateInstances)
         c.Assert(err, IsNil)
         c.Assert(insts, HasLen, 1)
@@ skipping 99 matching lines @@
                         found = true
                 }
         }
         switch {
         case match && !found:
                 c.Errorf("package %q not found in %v", pkg, pkgs)
         case !match && found:
                 c.Errorf("%q found but not expected in %v", pkg, pkgs)
         }
 }