Merge lp:~dave-cheney/juju-core/082-conn-update-secrets-only-if-needed into lp:~juju/juju-core/trunk

[Dave Cheney]

juju: update unknown config attrs once

Additional UnknownAttrs from the local environment
will only be applied if they do not already exist in
the state.

https://codereview.appspot.com/6503056/

[lp:~dave-cheney/juju-core/082-conn-update-secrets-only-if-needed]

453. By Dave Cheney on 2012-08-31

Import packages required for testing

Unmerged revisions

453. By Dave Cheney on 2012-08-31

Import packages required for testing

452. By Dave Cheney on 2012-08-31

merge from prereq

451. By Dave Cheney on 2012-08-31

wip

450. By Dave Cheney on 2012-08-30

only update non existing UnknownAttrs

449. By Dave Cheney on 2012-08-30

merge from trunk

448. By Dave Cheney on 2012-08-30

wip

447. By Dave Cheney on 2012-08-29

environs/dummy: add delay

This proposal implements a delay in most dummy operations. The delay
can be set test wide by setting JUJU_DUMMY_DELAY to a time.Duration
parsable value.

R=niemeyer
CC=
https://codereview.appspot.com/6482081

446. By Dave Cheney on 2012-08-29

environs/ec2: log open/close port details

https://bugs.launchpad.net/juju-core/+bug/1042073

Added logging of security group name to successful
open/close port operation.

R=niemeyer
CC=
https://codereview.appspot.com/6490049

445. By Dave Cheney on 2012-08-29

environs/cloudinit: deploy mongo debs

Install mongo debs alongside zookeeper ones.

R=niemeyer
CC=
https://codereview.appspot.com/6501054

444. By Dave Cheney on 2012-08-29

environs/cloudinit: ZooKeeper -> StateServer

This proposal is part of a set to add support for deploying
an environment on MongoDB in parallel with ZooKeeper.

R=niemeyer
CC=
https://codereview.appspot.com/6497051

=== modified file 'environs/cloudinit/cloudinit.go'
--- environs/cloudinit/cloudinit.go	2012-08-31 02:59:18 +0000
+++ environs/cloudinit/cloudinit.go	2012-08-31 02:59:18 +0000
@@ -7,7 +7,6 @@
 	"launchpad.net/juju-core/cloudinit"
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/config"
-	"launchpad.net/juju-core/log"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/upstart"
 	"path"
@@ -119,9 +118,7 @@
 	)
 
 	debugFlag := ""
-	if log.Debug {
 		debugFlag = " --debug"
-	}
 
 	if cfg.StateServer {
 		// zookeeper scripts

=== modified file 'juju/conn.go'
--- juju/conn.go	2012-08-30 13:21:00 +0000
+++ juju/conn.go	2012-08-31 02:59:18 +0000
@@ -82,11 +82,31 @@
 // from the local configuration.
 func (c *Conn) updateSecrets() error {
 	cfg := c.Environ.Config()
+<<<<<<< TREE
 	// 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.
 	return c.state.SetEnvironConfig(cfg)
+=======
+	env, err := c.state.EnvironConfig()
+	if err != nil {
+		return err
+	}
+	for k, v := range cfg.UnknownAttrs() {
+		if _, exists := env.Get(k); !exists {
+			env.Set(k, v)
+		}
+	}
+	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
+>>>>>>> MERGE-SOURCE
 }
 
 // Close terminates the connection to the environment and releases

=== modified file 'juju/conn_test.go'
--- juju/conn_test.go	2012-08-30 13:21:00 +0000
+++ juju/conn_test.go	2012-08-31 02:59:18 +0000
@@ -92,7 +92,7 @@
 	c.Assert(err, ErrorMatches, "dummy environment not bootstrapped")
 }
 
-func (cs *ConnSuite) TestConnStateSecretsSideEffect(c *C) {
+func (*ConnSuite) TestConnStateSecretsSideEffect(c *C) {
 	env, err := environs.NewFromAttrs(map[string]interface{}{
 		"name":            "erewhemos",
 		"type":            "dummy",
@@ -129,6 +129,29 @@
 	c.Assert(cfg.UnknownAttrs()["secret"], Equals, "pork")
 }
 
+func (cs *ConnSuite) TestConnStateDoesNotUpdateExistingSecrets(c *C) {
+	cs.TestConnStateSecretsSideEffect(c)
+	conn, err := juju.NewConnFromAttrs(map[string]interface{}{
+		"name":            "erewhemos",
+		"type":            "dummy",
+		"zookeeper":       true,
+		"authorized-keys": "i-am-a-key",
+		"secret":          "squirrel",
+	})
+	c.Assert(err, IsNil)
+	defer conn.Close()
+	st, err := conn.State()
+	c.Assert(err, IsNil)
+	cfg, err := st.EnvironConfig()
+	c.Assert(err, IsNil)
+	err = cfg.Read()
+	c.Assert(err, IsNil)
+	// check that the secret has not changed
+	secret, ok := cfg.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)

=== added file 'testing/imports.go'
--- testing/imports.go	1970-01-01 00:00:00 +0000
+++ testing/imports.go	2012-08-31 02:59:18 +0000
@@ -0,0 +1,9 @@
+package testing
+
+import (
+	// Import packages only needed for testing.
+	// This ensures all the prereqs will be installed 
+	// correctly by go get.
+	_ "launchpad.net/gocheck"
+	_ "launchpad.net/lpad"
+)