Merge lp://staging/~rogpeppe/juju-core/configuration-alternative into lp://staging/~juju/juju-core/trunk
Status: | Work in progress |
---|---|
Proposed branch: | lp://staging/~rogpeppe/juju-core/configuration-alternative |
Merge into: | lp://staging/~juju/juju-core/trunk |
Diff against target: |
968 lines (+410/-94) 18 files modified
cmd/juju/cmd_test.go (+3/-0) cmd/juju/deploy_test.go (+1/-0) cmd/juju/main_test.go (+1/-0) environs/config/auth.go (+3/-16) environs/config/auth_test.go (+15/-8) environs/config/config.go (+122/-0) environs/config/export_test.go (+5/-0) environs/config_test.go (+3/-0) environs/dummy/environs.go (+79/-13) environs/ec2/config.go (+73/-16) environs/ec2/config_test.go (+35/-28) environs/ec2/ec2.go (+8/-4) environs/ec2/export_test.go (+0/-4) environs/interface.go (+27/-1) environs/jujutest/livetests.go (+29/-0) environs/tools_test.go (+4/-3) juju/conn_test.go (+1/-0) state/ssh_test.go (+1/-1) |
To merge this branch: | bzr merge lp://staging/~rogpeppe/juju-core/configuration-alternative |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
The Go Language Gophers | Pending | ||
Review via email: mp+114870@code.staging.launchpad.net |
Description of the change
environs: add configuration attributes and access
This is an alternative possibility to https:/
FOR DISCUSSION ONLY - WORK IN PROGRESS
Unmerged revisions
- 305. By Roger Peppe
-
environs/config: authorizedKeys -> readAuthorizedKeys
- 304. By Roger Peppe
-
wip
- 303. By Roger Peppe
-
remove quotes in yaml
- 302. By Roger Peppe
-
go fmt
- 301. By Roger Peppe
-
all tests pass
- 300. By Roger Peppe
-
gofmt
- 299. By Roger Peppe
-
add config stuff
- 298. By Roger Peppe
-
environs: add methods for opening and closing ports.
Also add a dummy implementation, and clean up dummy op
send semantics slightly.R=niemeyer
CC=
https://codereview. appspot. com/6349097 - 297. By Dave Cheney
-
all: rename service => worker
As discussed in the 03/07/2012 team meeting, among a poor field of
candidates, worker(s) was the prefered name for the code that runs
inside an agent. eg, the Provisioner worker runs inside the
Provisioning agent.note: also fixed a gofmt issue in state/ which had been bugging me.
R=niemeyer
CC=
https://codereview. appspot. com/6345084 - 296. By Roger Peppe
-
charm: avoid crash when reading charms with simple relation strings.
Fixes bug #1015700
R=niemeyer
CC=
https://codereview. appspot. com/6344105
Much nicer approach in general, more than happy to toss mine out; but
definitely needs more tests for config creation and changes involving
irritating details like empty strings (which AFAICT will be the only way
to re-read default key paths and AWS auth), along with the other stuff I
mention below. But, really nice all the same.
https:/ /codereview. appspot. com/6343107/ diff/1/ cmd/juju/ cmd_test. go cmd_test. go (right):
File cmd/juju/
https:/ /codereview. appspot. com/6343107/ diff/1/ cmd/juju/ cmd_test. go#newcode52 cmd_test. go:52: authorized-keys: keys
cmd/juju/
I'd make the dummy provider insert default values for authorized-keys
and default-series, no sense dirtying up the tests except when we care
about those settings.
https:/ /codereview. appspot. com/6343107/ diff/1/ cmd/juju/ deploy_ test.go deploy_ test.go (right):
File cmd/juju/
https:/ /codereview. appspot. com/6343107/ diff/1/ cmd/juju/ deploy_ test.go# newcode25 deploy_ test.go: 25: authorized-keys: "keys"
cmd/juju/
similarly
https:/ /codereview. appspot. com/6343107/ diff/1/ environs/ config/ auth_test. go config/ auth_test. go (right):
File environs/
https:/ /codereview. appspot. com/6343107/ diff/1/ environs/ config/ auth_test. go#newcode1 config/ auth_test. go:1: package config_test
environs/
This test was broken, because it wasn't being run, and I don't see the
necessary fixes, so I suspect it's still not being run.
https:/ /codereview. appspot. com/6343107/ diff/1/ environs/ config/ config. go config/ config. go (right):
File environs/
https:/ /codereview. appspot. com/6343107/ diff/1/ environs/ config/ config. go#newcode9 config/ config. go:9: authorizedKeys string
environs/
needs defaultSeries
https:/ /codereview. appspot. com/6343107/ diff/1/ environs/ config/ config. go#newcode22 config/ config. go:22: "broken",
environs/
don't think this should be here
https:/ /codereview. appspot. com/6343107/ diff/1/ environs/ config/ export_ test.go config/ export_ test.go (right):
File environs/
https:/ /codereview. appspot. com/6343107/ diff/1/ environs/ config/ export_ test.go# newcode3 config/ export_ test.go: 3: func AuthorizedKeys(path string)
environs/
(string, error) {
please, ReadAuthorizedKeys
https:/ /codereview. appspot. com/6343107/ diff/1/ environs/ dummy/environs. go dummy/environs. go (right):
File environs/
https:/ /codereview. appspot. com/6343107/ diff/1/ environs/ dummy/environs. go#newcode222 dummy/environs. go:222: "default-series": schema.String(),
environs/
default-series is needed by everything; it's required by the deploy
command.
https:/ /codereview. appspot. com/6343107/ diff/1/ environs/ dummy/environs. go#newcode226 dummy/environs. go:226: "default-series",
environs/
This feels kinda icky. We *do* require default-series, just not on the
way in. Maybe we could call this inputChecker or something?
https:/ /codereview. appspot. com/6343107/ diff/1/ environs/ ec2/config. go ec2/config. go (right):
File environs/
https:/ /codereview. appspot. com/6343107/ diff/1/ environs/ ec2/config. go#newcode20 ec2/config. go:20: defaultSeries string
environs/
should be common, again... getting default-series out, for use by
deploy, is the whole point of all of this :)
https:/ /codereview. appspot. com/6343107/ diff/1/ environs/ interface. go interface. go (left):
File environs/
https:/ /codereview. appspot. com/63431...