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

[Dave Cheney]

juju: add UpdateEnvironConfig

This is not a proposal. This is an aide for the discussion
about pushing the secrets.

https://codereview.appspot.com/6445045/

[Gustavo Niemeyer (niemeyer)]

https://codereview.appspot.com/6445045/diff/1/environs/open.go
File environs/open.go (right):

https://codereview.appspot.com/6445045/diff/1/environs/open.go#newcode22
environs/open.go:22: // Config returns the *config.Config associated
with the environ
// Config returns the environment configuration with the given name.

https://codereview.appspot.com/6445045/diff/1/environs/open.go#newcode30
environs/open.go:30: }
p, ok := providers[config.Type()]
if !ok {
     return nil, fmt.Errorf("no registered provider for %q",
config.Type())
}
return p.Validate(e.config, nil)

https://codereview.appspot.com/6445045/

[Gustavo Niemeyer (niemeyer)]

https://codereview.appspot.com/6445045/

[lp:~dave-cheney/juju-core/go-juju-update-environment]

328. By Dave Cheney on 2012-07-25

responding to review feedback

329. By Dave Cheney on 2012-07-25

gofmt

Unmerged revisions

329. By Dave Cheney on 2012-07-25

gofmt

328. By Dave Cheney on 2012-07-25

responding to review feedback

327. By Dave Cheney on 2012-07-25

proposal

326. By Gustavo Niemeyer on 2012-07-24

store: fix tests

R=rog
CC=
https://codereview.appspot.com/6419075

325. By William Reade on 2012-07-24

initial HookQueue implementation

Does not yet support saving/loading/reconciling state, but should correctly
handle all known situations in-memory, assuming a sane stream of added
RelationUnitsChange events.

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

324. By Roger Peppe on 2012-07-24

juju: add NewConnFromAttrs.

It's useful for testing Conns, apart from anything else.

R=TheMue, niemeyer
CC=
https://codereview.appspot.com/6422058

323. By Dave Cheney on 2012-07-24

cmd/juju: status: gather basic machine properties

This proposal adds the ability to gather basic machine
properties.

% juju status
machines:
  "0":
    dns-name: ec2-50-16-84-143.compute-1.amazonaws.com
    instance-id: i-0ea58c76
services: {}

nb. The key of the machines map is a string, not an int, which
is an incompatability with the current pythonic output. This
will be addressed shortly.

R=fwereade, niemeyer
CC=
https://codereview.appspot.com/6419069

322. By Gustavo Niemeyer on 2012-07-24

store: separate bzr stderr stream to avoid garbage

R=dfc
CC=
https://codereview.appspot.com/6431060

321. By William Reade on 2012-07-23

consistency of usage of state.Relations

ie:

(*State) AddRelation(...state.RelationEndpoint) (*Relation, error)
(*State) Relation(...state.RelationEndpoint) (*Relation, error)
(*State) RemoveRelation(*Relation) error

...and, also, RemoveService now:

* removes relations
* checks errors

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

320. By William Reade on 2012-07-23

Add RelationUnit type

This is kinda like the original RelationUnit proposed a few days ago, but
exposes its various bits of functionality separately rather than being a
magical watch-and-join chimera.

Notably, RelationUnitsWatcher is now exported, so the internal tests have
been dropped.

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

=== modified file 'environs/open.go'
--- environs/open.go	2012-07-20 02:49:03 +0000
+++ environs/open.go	2012-07-25 11:01:19 +0000
@@ -14,6 +14,15 @@
 			return nil, fmt.Errorf("no default environment found")
 		}
 	}
+	config, err := envs.Config(name)
+	if err != nil {
+		return nil, err
+	}
+	return New(config)
+}
+
+// Config returns the environment configuration with the given name.
+func (envs *Environs) Config(name string) (*config.Config, error) {
 	e, ok := envs.environs[name]
 	if !ok {
 		return nil, fmt.Errorf("unknown environment %q", name)
@@ -21,7 +30,11 @@
 	if e.err != nil {
 		return nil, e.err
 	}
-	return New(e.config)
+	p, ok := providers[e.config.Type()]
+	if !ok {
+		return nil, fmt.Errorf("no registered provider for %q", e.config.Type())
+	}
+	return p.Validate(e.config, nil)
 }
 
 // NewFromAttrs returns a new environment based on the provided configuration

=== modified file 'juju/conn.go'
--- juju/conn.go	2012-07-23 13:35:59 +0000
+++ juju/conn.go	2012-07-25 11:01:19 +0000
@@ -56,6 +56,7 @@
 
 // State returns the environment state associated with c. Closing the
 // obtained state will have undefined consequences; Close c instead.
+// If required, the environment configuration will also be updated.
 func (c *Conn) State() (*state.State, error) {
 	c.mu.Lock()
 	defer c.mu.Unlock()
@@ -69,10 +70,35 @@
 			return nil, err
 		}
 		c.state = st
+		if err := c.updateEnvironConfig(); err != nil {
+			return nil, err
+		}
 	}
 	return c.state, nil
 }
 
+// updateEnvironConfig updates the environment configuration in the state 
+// from the local configuration.
+func (c *Conn) updateEnvironConfig() error {
+	environs, err := environs.ReadEnvirons("")
+	if err != nil {
+		return err
+	}
+	config, err := environs.Config(c.Environ.Name())
+	if err != nil {
+		return err
+	}
+	env, err := c.state.EnvironConfig()
+	if err != nil {
+		return err
+	}
+	env.Update(config.AllAttrs())
+	if _, err := env.Write(); err != nil {
+		return err
+	}
+	return nil
+}
+
 // Close terminates the connection to the environment and releases
 // any associated resources.
 func (c *Conn) Close() error {