Merge lp:~dave-cheney/juju-core/go-juju-update-secrets into lp:~juju/juju-core/trunk

[Dave Cheney]

juju: update secrets when calling conn.State()

Calls to conn.State() push the secrets to the state
behind the scenes.

https://codereview.appspot.com/6452044/

[Gustavo Niemeyer (niemeyer)]

https://codereview.appspot.com/6452044/diff/11001/juju/conn.go
File juju/conn.go (right):

https://codereview.appspot.com/6452044/diff/11001/juju/conn.go#newcode92
juju/conn.go:92: env.Update(secrets)
As we discussed live, we want to only do this if there are actually no
secrets in state yet.

https://codereview.appspot.com/6452044/

[Gustavo Niemeyer (niemeyer)]

LGTM

https://codereview.appspot.com/6452044/

=== modified file 'juju/conn.go'
--- juju/conn.go	2012-07-23 13:35:59 +0000
+++ juju/conn.go	2012-07-26 16:56:19 +0000
@@ -1,7 +1,9 @@
 package juju
 
 import (
+	"fmt"
 	"launchpad.net/juju-core/environs"
+	"launchpad.net/juju-core/log"
 	"launchpad.net/juju-core/state"
 	"regexp"
 	"sync"
@@ -69,10 +71,37 @@
 			return nil, err
 		}
 		c.state = st
+		if err := c.updateSecrets(); err != nil {
+			c.state = nil
+			return nil, fmt.Errorf("unable to push secrets: %v", err)
+		}
 	}
 	return c.state, nil
 }
 
+// updateSecrets updates the sensitive parts of the environment 
+// from the local configuration.
+func (c *Conn) updateSecrets() error {
+	cfg := c.Environ.Config()
+	env, err := c.state.EnvironConfig()
+	if err != nil {
+		return err
+	}
+	// This is wrong. This will _always_ overwrite the secrets
+	// in the state with the local secrets. To fix this properly
+	// we need to ensure that the config, minus secrets, is always
+	// pushed on bootstrap, then we can fill in the secrets here.
+	env.Update(cfg.AllAttrs())
+	n, err := env.Write()
+	if err != nil {
+		return err
+	}
+	if len(n) > 0 {
+		log.Debugf("Updating %d secret(s) in environment %q", len(n), c.Environ.Name())
+	}
+	return nil
+}
+
 // Close terminates the connection to the environment and releases
 // any associated resources.
 func (c *Conn) Close() error {

=== modified file 'juju/conn_test.go'
--- juju/conn_test.go	2012-07-24 17:36:58 +0000
+++ juju/conn_test.go	2012-07-26 16:56:19 +0000
@@ -3,24 +3,37 @@
 import (
 	"io/ioutil"
 	. "launchpad.net/gocheck"
-	_ "launchpad.net/juju-core/environs/dummy"
+	"launchpad.net/juju-core/environs/dummy"
 	"launchpad.net/juju-core/juju"
-	"launchpad.net/juju-core/testing"
+	"launchpad.net/juju-core/state/testing"
+	coretesting "launchpad.net/juju-core/testing"
 	"os"
 	"path/filepath"
 	stdtesting "testing"
 )
 
 func Test(t *stdtesting.T) {
-	testing.ZkTestPackage(t)
+	coretesting.ZkTestPackage(t)
 }
 
 type ConnSuite struct {
-	testing.ZkSuite
+	coretesting.LoggingSuite
+	testing.StateSuite
 }
 
 var _ = Suite(&ConnSuite{})
 
+func (cs *ConnSuite) SetUpTest(c *C) {
+	cs.LoggingSuite.SetUpTest(c)
+	cs.StateSuite.SetUpTest(c)
+}
+
+func (cs *ConnSuite) TearDownTest(c *C) {
+	dummy.Reset()
+	cs.StateSuite.TearDownTest(c)
+	cs.LoggingSuite.TearDownTest(c)
+}
+
 func (*ConnSuite) TestNewConn(c *C) {
 	home := c.MkDir()
 	defer os.Setenv("HOME", os.Getenv("HOME"))
@@ -85,6 +98,35 @@
 	c.Assert(err, ErrorMatches, "dummy environment not bootstrapped")
 }
 
+func (cs *ConnSuite) TestConnStateSecretsSideEffect(c *C) {
+	env, err := cs.State.EnvironConfig()
+	c.Assert(err, IsNil)
+	// verify we have no secret in the environ config
+	_, ok := env.Get("secret")
+	c.Assert(ok, Equals, false)
+	attrs := map[string]interface{}{
+		"name":            "erewhemos",
+		"type":            "dummy",
+		"zookeeper":       true,
+		"authorized-keys": "i-am-a-key",
+	}
+	conn, err := juju.NewConnFromAttrs(attrs)
+	c.Assert(err, IsNil)
+	defer conn.Close()
+	err = conn.Bootstrap(false)
+	c.Assert(err, IsNil)
+	// fetch a state connection via the conn, which will 
+	// push the secrets.
+	_, err = conn.State()
+	c.Assert(err, IsNil)
+	err = env.Read()
+	c.Assert(err, IsNil)
+	// check that the secret has been populated
+	secret, ok := env.Get("secret")
+	c.Assert(ok, Equals, true)
+	c.Assert(secret, Equals, "pork")
+}
+
 func (*ConnSuite) TestValidRegexps(c *C) {
 	assertService := func(s string, expect bool) {
 		c.Assert(juju.ValidService.MatchString(s), Equals, expect)