environs/config: make CA cert optional

juju/conn_test.go

 package juju_test
 
 import (
         "io/ioutil"
         . "launchpad.net/gocheck"
         "launchpad.net/juju-core/charm"
         "launchpad.net/juju-core/environs"
         "launchpad.net/juju-core/environs/dummy"
         "launchpad.net/juju-core/juju"
         "launchpad.net/juju-core/state"
@@ skipping 20 matching lines @@
 }
 
 func (*NewConnSuite) TestNewConnWithoutAdminSecret(c *C) {
         attrs := map[string]interface{}{
                 "name":            "erewhemos",
                 "type":            "dummy",
                 "state-server":    true,
                 "authorized-keys": "i-am-a-key",
                 "secret":          "pork",
                 "admin-secret":    "really",
+                "ca-cert":         coretesting.CACertPEM,
+                "ca-private-key":  "",
         }
         env, err := environs.NewFromAttrs(attrs)
         c.Assert(err, IsNil)
         err = juju.Bootstrap(env, false, []byte(coretesting.CACertPEM+coretesting.CAKeyPEM))
         c.Assert(err, IsNil)
 
         delete(attrs, "admin-secret")
         env1, err := environs.NewFromAttrs(attrs)
         c.Assert(err, IsNil)
         conn, err := juju.NewConn(env1)
         c.Check(conn, IsNil)
         c.Assert(err, ErrorMatches, "cannot connect without admin-secret")
 }
 
 func (*NewConnSuite) TestNewConnFromName(c *C) {
         home := c.MkDir()
         defer os.Setenv("HOME", os.Getenv("HOME"))
         os.Setenv("HOME", home)
         conn, err := juju.NewConnFromName("")
         c.Assert(conn, IsNil)
         c.Assert(err, ErrorMatches, ".*: no such file or directory")
 
         if err := os.Mkdir(filepath.Join(home, ".juju"), 0755); err != nil {
-                c.Log("Could not create directory structure")
-                c.Fail()
+                c.Fatal("Could not create directory structure")
         }
         envs := filepath.Join(home, ".juju", "environments.yaml")
         err = ioutil.WriteFile(envs, []byte(`
 default:
     erewhemos
 environments:
     erewhemos:
         type: dummy
         state-server: true
         authorized-keys: i-am-a-key
         admin-secret: conn-from-name-secret
 `), 0644)
-        if err != nil {
-                c.Log("Could not create environments.yaml")
-                c.Fail()
-        }
+
+        err = ioutil.WriteFile(filepath.Join(home, ".juju", "erewhemos-cert.pem"), []byte(coretesting.CACertPEM), 0600)
+        c.Assert(err, IsNil)
 
         // Just run through a few operations on the dummy provider and verify that
         // they behave as expected.
         conn, err = juju.NewConnFromName("")
         c.Assert(err, ErrorMatches, "dummy environment not bootstrapped")
 
         environ, err := environs.NewFromName("")
         c.Assert(err, IsNil)
         err = juju.Bootstrap(environ, false, []byte(coretesting.CACertPEM+coretesting.CAKeyPEM))
         c.Assert(err, IsNil)
@@ skipping 17 matching lines @@
 }
 
 func (cs *NewConnSuite) TestConnStateSecretsSideEffect(c *C) {
         attrs := map[string]interface{}{
                 "name":            "erewhemos",
                 "type":            "dummy",
                 "state-server":    true,
                 "authorized-keys": "i-am-a-key",
                 "secret":          "pork",
                 "admin-secret":    "side-effect secret",
+                "ca-cert":         coretesting.CACertPEM,
         }
         env, err := environs.NewFromAttrs(attrs)
         c.Assert(err, IsNil)
         err = juju.Bootstrap(env, false, []byte(coretesting.CACertPEM+coretesting.CAKeyPEM))
         c.Assert(err, IsNil)
         info, err := env.StateInfo()
         c.Assert(err, IsNil)
         info.Password = trivial.PasswordHash("side-effect secret")
         st, err := state.Open(info)
         c.Assert(err, IsNil)
@@ skipping 18 matching lines @@
 }
 
 func (cs *NewConnSuite) TestConnStateDoesNotUpdateExistingSecrets(c *C) {
         attrs := map[string]interface{}{
                 "name":            "erewhemos",
                 "type":            "dummy",
                 "state-server":    true,
                 "authorized-keys": "i-am-a-key",
                 "secret":          "pork",
                 "admin-secret":    "some secret",
+                "ca-cert":         coretesting.CACertPEM,
         }
         env, err := environs.NewFromAttrs(attrs)
         c.Assert(err, IsNil)
         err = juju.Bootstrap(env, false, []byte(coretesting.CACertPEM+coretesting.CAKeyPEM))
         c.Assert(err, IsNil)
 
         // Make a new Conn, which will push the secrets.
         conn, err := juju.NewConn(env)
         c.Assert(err, IsNil)
         defer conn.Close()
@@ skipping 17 matching lines @@
 }
 
 func (cs *NewConnSuite) TestConnWithPassword(c *C) {
         env, err := environs.NewFromAttrs(map[string]interface{}{
                 "name":            "erewhemos",
                 "type":            "dummy",
                 "state-server":    true,
                 "authorized-keys": "i-am-a-key",
                 "secret":          "squirrel",
                 "admin-secret":    "nutkin",
+                "ca-cert":         coretesting.CACertPEM,
         })
         c.Assert(err, IsNil)
         err = juju.Bootstrap(env, false, []byte(coretesting.CACertPEM+coretesting.CAKeyPEM))
         c.Assert(err, IsNil)
 
         // Check that Bootstrap has correctly used a hash
         // of the admin password.
         info, err := env.StateInfo()
         c.Assert(err, IsNil)
         info.Password = trivial.PasswordHash("nutkin")
@@ skipping 35 matching lines @@
 
 func (s *ConnSuite) SetUpTest(c *C) {
         s.LoggingSuite.SetUpTest(c)
         s.MgoSuite.SetUpTest(c)
         attrs := map[string]interface{}{
                 "name":            "erewhemos",
                 "type":            "dummy",
                 "state-server":    true,
                 "authorized-keys": "i-am-a-key",
                 "admin-secret":    "deploy-test-secret",
+                "ca-cert":         coretesting.CACertPEM,
         }
         environ, err := environs.NewFromAttrs(attrs)
         c.Assert(err, IsNil)
         err = juju.Bootstrap(environ, false, []byte(coretesting.CACertPEM+coretesting.CAKeyPEM))
         c.Assert(err, IsNil)
         s.conn, err = juju.NewConn(environ)
         c.Assert(err, IsNil)
         s.repo = &charm.LocalRepository{Path: c.MkDir()}
 }
 
@@ skipping 201 matching lines @@
         c.Assert(u.Resolved(), Equals, state.ResolvedNoHooks)
 
         err = u.ClearResolved()
         c.Assert(err, IsNil)
         err = s.conn.Resolved(u, true)
         c.Assert(err, IsNil)
         err = s.conn.Resolved(u, false)
         c.Assert(err, ErrorMatches, `cannot set resolved mode for unit "testriak/0": already resolved`)
         c.Assert(u.Resolved(), Equals, state.ResolvedRetryHooks)
 }