state: add CACert to Info.

environs/cloudinit/cloudinit_test.go

 package cloudinit_test
 
 import (
         "encoding/base64"
         . "launchpad.net/gocheck"
         "launchpad.net/goyaml"
         "launchpad.net/juju-core/environs/cloudinit"
         "launchpad.net/juju-core/environs/config"
         "launchpad.net/juju-core/state"
         "launchpad.net/juju-core/testing"
         "launchpad.net/juju-core/version"
         "regexp"
         "strings"
 )
 
 // Use local suite since this file lives in the ec2 package
 // for testing internals.
 type cloudinitSuite struct{}
 
 var _ = Suite(cloudinitSuite{})
 
 var envConfig = mustNewConfig(map[string]interface{}{
         "type":            "ec2",
         "name":            "foo",
         "default-series":  "series",
         "authorized-keys": "keys",
-        "ca-cert":         testing.CACertPEM,
+        "ca-cert":         testing.CACert,
 })
 
 func mustNewConfig(m map[string]interface{}) *config.Config {
         cfg, err := config.New(m)
         if err != nil {
                 panic(err)
         }
         return cfg
 }
 
 // Each test gives a cloudinit config - we check the
 // output to see if it looks correct.
 var cloudinitTests = []cloudinit.MachineConfig{
         {
                 InstanceIdAccessor: "$instance_id",
                 MachineId:          0,
                 ProviderType:       "ec2",
                 AuthorizedKeys:     "sshkey1",
                 Tools:              newSimpleTools("1.2.3-linux-amd64"),
                 StateServer:        true,
-                StateServerPEM:     serverPEM,
+                StateServerCert:    serverCert,
+                StateServerKey:     serverKey,
                 StateInfo: &state.Info{
                         Password: "arble",
                 },
                 Config:  envConfig,
                 DataDir: "/var/lib/juju",
         },
         {
                 MachineId:      99,
                 ProviderType:   "ec2",
                 AuthorizedKeys: "sshkey1",
@@ skipping 193 matching lines @@
         {"missing environment configuration", func(cfg *cloudinit.MachineConfig) {
                 cfg.Config = nil
         }},
         {"missing state info", func(cfg *cloudinit.MachineConfig) {
                 cfg.StateInfo = nil
         }},
         {"missing state hosts", func(cfg *cloudinit.MachineConfig) {
                 cfg.StateServer = false
                 cfg.StateInfo = &state.Info{EntityName: "machine-99"}
         }},
-        {"missing state server PEM", func(cfg *cloudinit.MachineConfig) {
-                cfg.StateServerPEM = []byte{}
+        {"missing state server certificate", func(cfg *cloudinit.MachineConfig) {
+                cfg.StateServerCert = []byte{}
+        }},
+        {"missing state server private key", func(cfg *cloudinit.MachineConfig) {
+                cfg.StateServerKey = []byte{}
         }},
         {"missing var directory", func(cfg *cloudinit.MachineConfig) {
                 cfg.DataDir = ""
         }},
         {"missing tools", func(cfg *cloudinit.MachineConfig) {
                 cfg.Tools = nil
         }},
         {"missing tools URL", func(cfg *cloudinit.MachineConfig) {
                 cfg.Tools = &state.Tools{}
         }},
@@ skipping 23 matching lines @@
         {"password has disallowed characters", func(cfg *cloudinit.MachineConfig) {
                 cfg.StateInfo.Password = "\n"
         }},
 }
 
 // TestCloudInitVerify checks that required fields are appropriately
 // checked for by NewCloudInit.
 func (cloudinitSuite) TestCloudInitVerify(c *C) {
         cfg := &cloudinit.MachineConfig{
                 StateServer:        true,
-                StateServerPEM:     serverPEM,
+                StateServerCert:    serverCert,
+                StateServerKey:     serverKey,
                 InstanceIdAccessor: "$instance_id",
                 ProviderType:       "ec2",
                 MachineId:          99,
                 Tools:              newSimpleTools("9.9.9-linux-arble"),
                 AuthorizedKeys:     "sshkey1",
                 StateInfo: &state.Info{
                         Addrs: []string{"host"},
                 },
                 Config:  envConfig,
                 DataDir: "/var/lib/juju",
         }
         // check that the base configuration does not give an error
         _, err := cloudinit.New(cfg)
         c.Assert(err, IsNil)
 
         for i, test := range verifyTests {
                 c.Logf("test %d. %s", i, test.err)
                 cfg1 := *cfg
                 test.mutate(&cfg1)
                 t, err := cloudinit.New(&cfg1)
                 c.Assert(err, ErrorMatches, "invalid machine configuration: "+test.err)
                 c.Assert(t, IsNil)
         }
 }
 
-var serverPEM = []byte(`
+var serverCert = []byte(`
 -----BEGIN CERTIFICATE-----
 MIIBdzCCASOgAwIBAgIBADALBgkqhkiG9w0BAQUwHjENMAsGA1UEChMEanVqdTEN
 MAsGA1UEAxMEcm9vdDAeFw0xMjExMDgxNjIyMzRaFw0xMzExMDgxNjI3MzRaMBwx
 DDAKBgNVBAoTA2htbTEMMAoGA1UEAxMDYW55MFowCwYJKoZIhvcNAQEBA0sAMEgC
 QQCACqz6JPwM7nbxAWub+APpnNB7myckWJ6nnsPKi9SipP1hyhfzkp8RGMJ5Uv7y
 8CSTtJ8kg/ibka1VV8LvP9tnAgMBAAGjUjBQMA4GA1UdDwEB/wQEAwIAsDAdBgNV
 HQ4EFgQU6G1ERaHCgfAv+yoDMFVpDbLOmIQwHwYDVR0jBBgwFoAUP/mfUdwOlHfk
 fR+gLQjslxf64w0wCwYJKoZIhvcNAQEFA0EAbn0MaxWVgGYBomeLYfDdb8vCq/5/
 G/2iCUQCXsVrBparMLFnor/iKOkJB5n3z3rtu70rFt+DpX6L8uBR3LB3+A==
 -----END CERTIFICATE-----
+`)
+
+var serverKey = []byte(`
 -----BEGIN RSA PRIVATE KEY-----
 MIIBPAIBAAJBAIAKrPok/AzudvEBa5v4A+mc0HubJyRYnqeew8qL1KKk/WHKF/OS
 nxEYwnlS/vLwJJO0nySD+JuRrVVXwu8/22cCAwEAAQJBAJsk1F0wTRuaIhJ5xxqw
 FIWPFep/n5jhrDOsIs6cSaRbfIBy3rAl956pf/MHKvf/IXh7KlG9p36IW49hjQHK
 7HkCIQD2CqyV1ppNPFSoCI8mSwO8IZppU3i2V4MhpwnqHz3H0wIhAIU5XIlhLJW8
 TNOaFMEia/TuYofdwJnYvi9t0v4UKBWdAiEA76AtvjEoTpi3in/ri0v78zp2/KXD
 JzPMDvZ0fYS30ukCIA1stlJxpFiCXQuFn0nG+jH4Q52FTv8xxBhrbLOFvHRRAiEA
 2Vc9NN09ty+HZgxpwqIA1fHVuYJY9GMPG1LnTnZ9INg=
 -----END RSA PRIVATE KEY-----
 `[1:])