|
environs no longer imports state
AIUI, the intent was always that environs should not require any knowledge
of the state package to function, so hopefully this is uncontroversial. The
necessary changes were just moving state.Info to environs.StateInfo (which
seems reasonable, because Environs are the sole source for StateInfos); and
moving state.AssignmentPolicy as well, which I'm a little less sure about
(but can, I think, be justified for the same reasons).
Now the dependency is broken, I can change State.EnvironConfig to return an
actual environs.EnvironConfig in a followup.
https://code.launchpad.net/~fwereade/juju-core/break-environs-state-dependency/+merge/113702
Requires: https://code.launchpad.net/~fwereade/juju-core/strict-parse-environ/+merge/113661
(do not edit description out of merge proposal)
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+98 lines, -93 lines) |
Patch |
|
A |
[revision details]
|
View
|
1
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
|
M |
cmd/jujud/agent.go
|
View
|
|
4 chunks |
+5 lines, -5 lines |
0 comments
|
Download
|
|
M |
cmd/jujud/initzk.go
|
View
|
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
|
M |
environs/dummy/environs.go
|
View
|
|
5 chunks |
+8 lines, -8 lines |
0 comments
|
Download
|
|
M |
environs/ec2/cloudinit.go
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
environs/ec2/cloudinit_test.go
|
View
|
|
4 chunks |
+5 lines, -5 lines |
0 comments
|
Download
|
|
M |
environs/ec2/ec2.go
|
View
|
|
5 chunks |
+7 lines, -8 lines |
0 comments
|
Download
|
|
M |
environs/ec2/local_test.go
|
View
|
1
|
2 chunks |
+1 line, -2 lines |
0 comments
|
Download
|
|
M |
environs/interface.go
|
View
|
|
5 chunks |
+32 lines, -6 lines |
0 comments
|
Download
|
|
M |
environs/jujutest/test.go
|
View
|
|
1 chunk |
+1 line, -2 lines |
0 comments
|
Download
|
|
M |
service/machiner/machiner.go
|
View
|
|
2 chunks |
+2 lines, -1 line |
0 comments
|
Download
|
|
M |
service/provisioner/provisioner.go
|
View
|
|
3 chunks |
+3 lines, -3 lines |
0 comments
|
Download
|
|
M |
state/assign_test.go
|
View
|
|
5 chunks |
+6 lines, -5 lines |
0 comments
|
Download
|
|
M |
state/open.go
|
View
|
|
3 chunks |
+4 lines, -18 lines |
0 comments
|
Download
|
|
M |
state/state.go
|
View
|
|
4 chunks |
+15 lines, -14 lines |
0 comments
|
Download
|
|
M |
state/testing/testing.go
|
View
|
|
2 chunks |
+3 lines, -2 lines |
0 comments
|
Download
|
|
M |
state/unit.go
|
View
|
|
1 chunk |
+0 lines, -11 lines |
0 comments
|
Download
|
Total messages: 4
|