Merge lp:~thumper/juju-core/juju-errors into lp:~go-bot/juju-core/trunk
- juju-errors
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Tim Penhey |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2731 |
Proposed branch: | lp:~thumper/juju-core/juju-errors |
Merge into: | lp:~go-bot/juju-core/trunk |
Diff against target: |
3793 lines (+271/-683) 156 files modified
agent/agent.go (+14/-14) agent/tools/toolsdir.go (+2/-2) cert/cert.go (+3/-4) cmd/juju/bootstrap_test.go (+1/-1) cmd/juju/common.go (+2/-1) cmd/juju/debuglog.go (+1/-1) cmd/juju/debuglog_test.go (+1/-1) cmd/juju/deploy_test.go (+1/-1) cmd/juju/destroyenvironment_test.go (+1/-1) cmd/juju/removemachine_test.go (+1/-1) cmd/jujud/agent.go (+1/-1) cmd/jujud/bootstrap_test.go (+1/-1) cmd/jujud/machine.go (+1/-1) cmd/jujud/machine_test.go (+1/-1) constraints/constraints.go (+2/-2) container/kvm/container.go (+2/-1) container/kvm/kvm.go (+1/-1) container/lxc/instance.go (+1/-1) dependencies.tsv (+2/-1) environs/bootstrap/state.go (+2/-2) environs/bootstrap/synctools.go (+2/-1) environs/cloudinit.go (+2/-3) environs/cloudinit/cloudinit.go (+3/-4) environs/config.go (+1/-1) environs/config/config.go (+2/-2) environs/configstore/disk.go (+5/-6) environs/configstore/disk_test.go (+1/-1) environs/configstore/mem.go (+1/-1) environs/emptystorage.go (+2/-1) environs/emptystorage_test.go (+1/-1) environs/filestorage/filestorage.go (+4/-3) environs/filestorage/filestorage_test.go (+3/-3) environs/httpstorage/storage.go (+2/-3) environs/httpstorage/storage_test.go (+1/-1) environs/imagemetadata/generate.go (+2/-1) environs/jujutest/livetests.go (+1/-1) environs/jujutest/tests.go (+1/-1) environs/open.go (+2/-3) environs/open_test.go (+1/-1) environs/simplestreams/datasource.go (+2/-1) environs/simplestreams/simplestreams.go (+1/-1) environs/sshstorage/storage.go (+2/-3) environs/sshstorage/storage_test.go (+2/-2) environs/tools/simplestreams.go (+2/-1) environs/tools/tools.go (+1/-1) environs/tools/tools_test.go (+1/-1) errors/errors.go (+0/-210) errors/errors_test.go (+0/-209) juju/api.go (+2/-1) juju/apiconn_test.go (+1/-1) juju/conn.go (+1/-1) juju/conn_test.go (+1/-1) provider/azure/certfile.go (+1/-1) provider/azure/environ.go (+1/-1) provider/azure/instance.go (+1/-1) provider/azure/instancetype.go (+1/-1) provider/azure/storage.go (+1/-1) provider/azure/storage_test.go (+1/-1) provider/common/destroy_test.go (+1/-1) provider/dummy/storage.go (+2/-1) provider/ec2/ec2.go (+1/-1) provider/ec2/storage.go (+1/-1) provider/joyent/environ_instance.go (+1/-1) provider/joyent/storage.go (+3/-3) provider/joyent/storage_test.go (+3/-3) provider/local/environ.go (+2/-3) provider/local/instance.go (+2/-1) provider/maas/environ.go (+1/-1) provider/maas/environ_whitebox_test.go (+1/-1) provider/maas/storage.go (+1/-1) provider/maas/storage_test.go (+1/-1) provider/manual/environ.go (+2/-3) provider/openstack/provider.go (+2/-2) provider/openstack/storage.go (+2/-2) state/addmachine.go (+1/-1) state/annotator.go (+1/-2) state/api/agent/machine_test.go (+1/-1) state/api/client.go (+1/-1) state/api/machiner/machiner_test.go (+1/-1) state/api/provisioner/provisioner_test.go (+1/-1) state/api/uniter/unit_test.go (+1/-1) state/api/upgrader/unitupgrader_test.go (+1/-1) state/api/upgrader/upgrader_test.go (+1/-1) state/apiserver/admin.go (+2/-1) state/apiserver/charmrevisionupdater/updater.go (+1/-1) state/apiserver/charmrevisionupdater/updater_test.go (+1/-1) state/apiserver/charms.go (+25/-25) state/apiserver/client/api_test.go (+1/-1) state/apiserver/client/client.go (+12/-13) state/apiserver/client/client_test.go (+1/-1) state/apiserver/client/destroy_test.go (+2/-2) state/apiserver/client/status.go (+2/-1) state/apiserver/common/errors.go (+2/-1) state/apiserver/common/errors_test.go (+1/-1) state/apiserver/common/password_test.go (+1/-1) state/apiserver/deployer/deployer_test.go (+1/-1) state/apiserver/firewaller/firewaller_test.go (+1/-1) state/apiserver/keymanager/keymanager.go (+1/-1) state/apiserver/keyupdater/authorisedkeys.go (+2/-1) state/apiserver/machine/machiner.go (+2/-1) state/apiserver/provisioner/provisioner_test.go (+1/-1) state/apiserver/uniter/uniter.go (+2/-1) state/apiserver/uniter/uniter_test.go (+1/-1) state/apiserver/upgrader/unitupgrader_test.go (+1/-1) state/apiserver/upgrader/upgrader_test.go (+1/-1) state/charm_test.go (+1/-1) state/cleanup.go (+1/-2) state/cleanup_test.go (+1/-1) state/configvalidator_test.go (+2/-1) state/conn_test.go (+1/-1) state/constraints.go (+1/-1) state/environ.go (+1/-1) state/environcapability_test.go (+1/-1) state/machine.go (+1/-1) state/machine_test.go (+1/-1) state/megawatcher.go (+1/-1) state/minimumunits.go (+3/-6) state/open.go (+1/-1) state/policy.go (+2/-1) state/prechecker_test.go (+1/-1) state/relation.go (+1/-1) state/relation_test.go (+1/-1) state/relationunit.go (+1/-1) state/relationunit_test.go (+1/-1) state/service.go (+1/-1) state/service_test.go (+1/-1) state/settings.go (+1/-2) state/settings_test.go (+1/-1) state/state.go (+1/-1) state/state_test.go (+1/-1) state/status.go (+1/-1) state/tools_test.go (+1/-1) state/unit.go (+1/-1) state/unit_test.go (+1/-1) state/user.go (+1/-1) state/watcher.go (+1/-1) worker/authenticationworker/worker.go (+1/-1) worker/deployer/deployer_test.go (+1/-1) worker/firewaller/firewaller.go (+6/-6) worker/instancepoller/aggregate.go (+1/-1) worker/instancepoller/aggregate_test.go (+3/-2) worker/instancepoller/machine_test.go (+1/-1) worker/instancepoller/updater.go (+1/-1) worker/peergrouper/mock_test.go (+1/-1) worker/peergrouper/worker.go (+1/-1) worker/provisioner/kvm-broker_test.go (+1/-1) worker/provisioner/lxc-broker_test.go (+1/-1) worker/provisioner/provisioner.go (+1/-1) worker/provisioner/provisioner_test.go (+1/-1) worker/rsyslog/worker.go (+7/-7) worker/uniter/charm/bundles.go (+2/-1) worker/uniter/relation/relation.go (+2/-1) worker/uniter/relationer_test.go (+1/-1) worker/uniter/state.go (+3/-3) worker/uniter/uniter_test.go (+1/-1) worker/upgrader/upgrader_test.go (+1/-1) |
To merge this branch: | bzr merge lp:~thumper/juju-core/juju-errors |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju Engineering | Pending | ||
Review via email: mp+219608@code.launchpad.net |
Commit message
Extract errors package to github.
Also introduces a dependency on github.
and removes the github.
Adds additional functions for simple tracing and
annotations of errors.
Description of the change
Extract errors package to github.
Also introduces a dependency on github.
and removes the github.
Adds additional functions for simple tracing and
annotations of errors.
Tim Penhey (thumper) wrote : | # |
Dave Cheney (dave-cheney) wrote : | # |
mien gott
On Thu, May 15, 2014 at 7:57 AM, Tim Penhey <email address hidden> wrote:
> Reviewers: mp+219608_
>
> Message:
> Please take a look.
>
> Description:
> Extract errors package to github.
>
> Also introduces a dependency on github.
> and removes the github.
>
> Adds additional functions for simple tracing and
> annotations of errors.
>
> https:/
>
> (do not edit description out of merge proposal)
>
>
> Please review this at https:/
>
> Affected files (+254, -658 lines):
> A [revision details]
> M agent/agent.go
> M agent/tools/
> M cert/cert.go
> M cmd/juju/
> M cmd/juju/common.go
> M cmd/juju/
> M cmd/juju/
> M cmd/juju/
> M cmd/juju/
> M cmd/juju/
> M cmd/jujud/agent.go
> M cmd/jujud/
> M cmd/jujud/
> M cmd/jujud/
> M constraints/
> M container/
> M container/
> M container/
> M dependencies.tsv
> M environs/
> M environs/
> M environs/
> M environs/
> M environs/config.go
> M environs/
> M environs/
> M environs/
> M environs/
> M environs/
> M environs/
> M environs/
> M environs/
> M environs/
> M environs/
> M environs/
> M environs/
> M environs/
> M environs/open.go
> M environs/
> M environs/
> M environs/
> M environs/
> M environs/
> M environs/
> M environs/
> M environs/
> D errors/errors.go
> D errors/
> M juju/api.go
> M juju/apiconn_
> M juju/conn.go
> M juju/conn_test.go
> M provider/
> M provider/
> M provider/
> M provider/
> M provider/
> M provider/
> M provider/
> M provider/
> M provider/ec2/ec2.go
> M provider/
> M provider/
> M provider/
> M provider/
> M provider/
> M provider/
> M provider/
> M provider/
> M provider/
> M provider/
> M provider/
> M provider/
> M provider/
> M s...
Andrew Wilkins (axwalk) wrote : | # |
LGTM with a minor renaming
https:/
File provider/
https:/
provider/
s/coreerrors/
https:/
File state/apiserver
https:/
state/apiserver
"github.
ditto
(and anywhere else coreerrors exists)
Go Bot (go-bot) wrote : | # |
The attempt to merge lp:~thumper/juju-core/juju-errors into lp:juju-core failed. Below is the output from the failed tests.
godeps: cannot parse "dependencies.tsv": cannot find directory for "github.
mongod: no process found
Dave Cheney (dave-cheney) wrote : | # |
LGTM. I have the same comment as axw about renaming the juju/errors
import. Can that be avoided -- it's totally cool to defer that to a
later branch and leave this as the mechanical translation.
Preview Diff
1 | === modified file 'agent/agent.go' |
2 | --- agent/agent.go 2014-04-23 08:50:28 +0000 |
3 | +++ agent/agent.go 2014-05-15 02:28:23 +0000 |
4 | @@ -15,7 +15,7 @@ |
5 | "strconv" |
6 | "strings" |
7 | |
8 | - "github.com/errgo/errgo" |
9 | + "github.com/juju/errors" |
10 | "github.com/juju/loggo" |
11 | |
12 | "launchpad.net/juju-core/instance" |
13 | @@ -247,23 +247,23 @@ |
14 | // machine or unit agent. |
15 | func NewAgentConfig(configParams AgentConfigParams) (ConfigSetterWriter, error) { |
16 | if configParams.DataDir == "" { |
17 | - return nil, errgo.Trace(requiredError("data directory")) |
18 | + return nil, errors.Trace(requiredError("data directory")) |
19 | } |
20 | logDir := DefaultLogDir |
21 | if configParams.LogDir != "" { |
22 | logDir = configParams.LogDir |
23 | } |
24 | if configParams.Tag == "" { |
25 | - return nil, errgo.Trace(requiredError("entity tag")) |
26 | + return nil, errors.Trace(requiredError("entity tag")) |
27 | } |
28 | if configParams.UpgradedToVersion == version.Zero { |
29 | - return nil, errgo.Trace(requiredError("upgradedToVersion")) |
30 | + return nil, errors.Trace(requiredError("upgradedToVersion")) |
31 | } |
32 | if configParams.Password == "" { |
33 | - return nil, errgo.Trace(requiredError("password")) |
34 | + return nil, errors.Trace(requiredError("password")) |
35 | } |
36 | if len(configParams.CACert) == 0 { |
37 | - return nil, errgo.Trace(requiredError("CA certificate")) |
38 | + return nil, errors.Trace(requiredError("CA certificate")) |
39 | } |
40 | // Note that the password parts of the state and api information are |
41 | // blank. This is by design. |
42 | @@ -302,16 +302,16 @@ |
43 | // a machine running the state server. |
44 | func NewStateMachineConfig(configParams AgentConfigParams, serverInfo params.StateServingInfo) (ConfigSetterWriter, error) { |
45 | if serverInfo.Cert == "" { |
46 | - return nil, errgo.Trace(requiredError("state server cert")) |
47 | + return nil, errors.Trace(requiredError("state server cert")) |
48 | } |
49 | if serverInfo.PrivateKey == "" { |
50 | - return nil, errgo.Trace(requiredError("state server key")) |
51 | + return nil, errors.Trace(requiredError("state server key")) |
52 | } |
53 | if serverInfo.StatePort == 0 { |
54 | - return nil, errgo.Trace(requiredError("state port")) |
55 | + return nil, errors.Trace(requiredError("state port")) |
56 | } |
57 | if serverInfo.APIPort == 0 { |
58 | - return nil, errgo.Trace(requiredError("api port")) |
59 | + return nil, errors.Trace(requiredError("api port")) |
60 | } |
61 | config, err := NewAgentConfig(configParams) |
62 | if err != nil { |
63 | @@ -535,7 +535,7 @@ |
64 | |
65 | func (c *configInternal) APIAddresses() ([]string, error) { |
66 | if c.apiDetails == nil { |
67 | - return []string{}, errgo.New("No apidetails in config") |
68 | + return []string{}, errors.New("No apidetails in config") |
69 | } |
70 | return append([]string{}, c.apiDetails.addresses...), nil |
71 | } |
72 | @@ -554,7 +554,7 @@ |
73 | |
74 | func (c *configInternal) check() error { |
75 | if c.stateDetails == nil && c.apiDetails == nil { |
76 | - return errgo.Trace(requiredError("state or API addresses")) |
77 | + return errors.Trace(requiredError("state or API addresses")) |
78 | } |
79 | if c.stateDetails != nil { |
80 | if err := checkAddrs(c.stateDetails.addresses, "state server address"); err != nil { |
81 | @@ -573,11 +573,11 @@ |
82 | |
83 | func checkAddrs(addrs []string, what string) error { |
84 | if len(addrs) == 0 { |
85 | - return errgo.Trace(requiredError(what)) |
86 | + return errors.Trace(requiredError(what)) |
87 | } |
88 | for _, a := range addrs { |
89 | if !validAddr.MatchString(a) { |
90 | - return errgo.New("invalid %s %q", what, a) |
91 | + return errors.Errorf("invalid %s %q", what, a) |
92 | } |
93 | } |
94 | return nil |
95 | |
96 | === modified file 'agent/tools/toolsdir.go' |
97 | --- agent/tools/toolsdir.go 2014-03-14 01:16:20 +0000 |
98 | +++ agent/tools/toolsdir.go 2014-05-15 02:28:23 +0000 |
99 | @@ -15,7 +15,7 @@ |
100 | "path" |
101 | "strings" |
102 | |
103 | - "github.com/errgo/errgo" |
104 | + "github.com/juju/errors" |
105 | |
106 | coretools "launchpad.net/juju-core/tools" |
107 | "launchpad.net/juju-core/version" |
108 | @@ -101,7 +101,7 @@ |
109 | } |
110 | name := path.Join(dir, hdr.Name) |
111 | if err := writeFile(name, os.FileMode(hdr.Mode&0777), tr); err != nil { |
112 | - return errgo.Annotatef(err, "tar extract %q failed", name) |
113 | + return errors.Annotatef(err, "tar extract %q failed", name) |
114 | } |
115 | } |
116 | toolsMetadataData, err := json.Marshal(tools) |
117 | |
118 | === modified file 'cert/cert.go' |
119 | --- cert/cert.go 2014-04-30 23:18:40 +0000 |
120 | +++ cert/cert.go 2014-05-15 02:28:23 +0000 |
121 | @@ -11,13 +11,12 @@ |
122 | "crypto/x509" |
123 | "crypto/x509/pkix" |
124 | "encoding/pem" |
125 | - "errors" |
126 | "fmt" |
127 | "math/big" |
128 | "net" |
129 | "time" |
130 | |
131 | - "github.com/errgo/errgo" |
132 | + "github.com/juju/errors" |
133 | ) |
134 | |
135 | var KeyBits = 1024 |
136 | @@ -64,11 +63,11 @@ |
137 | func Verify(srvCertPEM, caCertPEM string, when time.Time) error { |
138 | caCert, err := ParseCert(caCertPEM) |
139 | if err != nil { |
140 | - return errgo.Annotate(err, "cannot parse CA certificate") |
141 | + return errors.Annotate(err, "cannot parse CA certificate") |
142 | } |
143 | srvCert, err := ParseCert(srvCertPEM) |
144 | if err != nil { |
145 | - return errgo.Annotate(err, "cannot parse server certificate") |
146 | + return errors.Annotate(err, "cannot parse server certificate") |
147 | } |
148 | pool := x509.NewCertPool() |
149 | pool.AddCert(caCert) |
150 | |
151 | === modified file 'cmd/juju/bootstrap_test.go' |
152 | --- cmd/juju/bootstrap_test.go 2014-05-12 05:23:59 +0000 |
153 | +++ cmd/juju/bootstrap_test.go 2014-05-15 02:28:23 +0000 |
154 | @@ -7,6 +7,7 @@ |
155 | "fmt" |
156 | "strings" |
157 | |
158 | + "github.com/juju/errors" |
159 | "github.com/juju/loggo" |
160 | jc "github.com/juju/testing/checkers" |
161 | gc "launchpad.net/gocheck" |
162 | @@ -26,7 +27,6 @@ |
163 | envtesting "launchpad.net/juju-core/environs/testing" |
164 | envtools "launchpad.net/juju-core/environs/tools" |
165 | ttesting "launchpad.net/juju-core/environs/tools/testing" |
166 | - "launchpad.net/juju-core/errors" |
167 | "launchpad.net/juju-core/juju/arch" |
168 | "launchpad.net/juju-core/provider/dummy" |
169 | coretesting "launchpad.net/juju-core/testing" |
170 | |
171 | === modified file 'cmd/juju/common.go' |
172 | --- cmd/juju/common.go 2014-04-14 12:36:13 +0000 |
173 | +++ cmd/juju/common.go 2014-05-15 02:28:23 +0000 |
174 | @@ -6,12 +6,13 @@ |
175 | import ( |
176 | "fmt" |
177 | |
178 | + "github.com/juju/errors" |
179 | + |
180 | "launchpad.net/juju-core/charm" |
181 | "launchpad.net/juju-core/cmd" |
182 | "launchpad.net/juju-core/environs" |
183 | "launchpad.net/juju-core/environs/config" |
184 | "launchpad.net/juju-core/environs/configstore" |
185 | - "launchpad.net/juju-core/errors" |
186 | "launchpad.net/juju-core/state/api" |
187 | ) |
188 | |
189 | |
190 | === modified file 'cmd/juju/debuglog.go' |
191 | --- cmd/juju/debuglog.go 2014-05-12 05:23:59 +0000 |
192 | +++ cmd/juju/debuglog.go 2014-05-15 02:28:23 +0000 |
193 | @@ -7,12 +7,12 @@ |
194 | "fmt" |
195 | "io" |
196 | |
197 | + "github.com/juju/errors" |
198 | "github.com/juju/loggo" |
199 | "launchpad.net/gnuflag" |
200 | |
201 | "launchpad.net/juju-core/cmd" |
202 | "launchpad.net/juju-core/cmd/envcmd" |
203 | - "launchpad.net/juju-core/errors" |
204 | "launchpad.net/juju-core/juju" |
205 | "launchpad.net/juju-core/state/api" |
206 | ) |
207 | |
208 | === modified file 'cmd/juju/debuglog_test.go' |
209 | --- cmd/juju/debuglog_test.go 2014-05-12 05:23:59 +0000 |
210 | +++ cmd/juju/debuglog_test.go 2014-05-15 02:28:23 +0000 |
211 | @@ -9,13 +9,13 @@ |
212 | "io/ioutil" |
213 | "strings" |
214 | |
215 | + "github.com/juju/errors" |
216 | "github.com/juju/loggo" |
217 | jc "github.com/juju/testing/checkers" |
218 | gc "launchpad.net/gocheck" |
219 | |
220 | "launchpad.net/juju-core/cmd" |
221 | "launchpad.net/juju-core/cmd/envcmd" |
222 | - "launchpad.net/juju-core/errors" |
223 | "launchpad.net/juju-core/state/api" |
224 | "launchpad.net/juju-core/testing" |
225 | ) |
226 | |
227 | === modified file 'cmd/juju/deploy_test.go' |
228 | --- cmd/juju/deploy_test.go 2014-05-12 04:28:39 +0000 |
229 | +++ cmd/juju/deploy_test.go 2014-05-15 02:28:23 +0000 |
230 | @@ -6,13 +6,13 @@ |
231 | import ( |
232 | "strings" |
233 | |
234 | + "github.com/juju/errors" |
235 | jc "github.com/juju/testing/checkers" |
236 | gc "launchpad.net/gocheck" |
237 | |
238 | "launchpad.net/juju-core/charm" |
239 | "launchpad.net/juju-core/cmd/envcmd" |
240 | "launchpad.net/juju-core/constraints" |
241 | - "launchpad.net/juju-core/errors" |
242 | "launchpad.net/juju-core/instance" |
243 | "launchpad.net/juju-core/juju/osenv" |
244 | "launchpad.net/juju-core/juju/testing" |
245 | |
246 | === modified file 'cmd/juju/destroyenvironment_test.go' |
247 | --- cmd/juju/destroyenvironment_test.go 2014-04-14 12:36:13 +0000 |
248 | +++ cmd/juju/destroyenvironment_test.go 2014-05-15 02:28:23 +0000 |
249 | @@ -6,13 +6,13 @@ |
250 | import ( |
251 | "bytes" |
252 | |
253 | + "github.com/juju/errors" |
254 | jc "github.com/juju/testing/checkers" |
255 | gc "launchpad.net/gocheck" |
256 | |
257 | "launchpad.net/juju-core/cmd" |
258 | "launchpad.net/juju-core/environs" |
259 | "launchpad.net/juju-core/environs/configstore" |
260 | - "launchpad.net/juju-core/errors" |
261 | "launchpad.net/juju-core/instance" |
262 | "launchpad.net/juju-core/juju/testing" |
263 | "launchpad.net/juju-core/provider/dummy" |
264 | |
265 | === modified file 'cmd/juju/removemachine_test.go' |
266 | --- cmd/juju/removemachine_test.go 2014-05-12 05:23:59 +0000 |
267 | +++ cmd/juju/removemachine_test.go 2014-05-15 02:28:23 +0000 |
268 | @@ -4,11 +4,11 @@ |
269 | package main |
270 | |
271 | import ( |
272 | + "github.com/juju/errors" |
273 | jc "github.com/juju/testing/checkers" |
274 | gc "launchpad.net/gocheck" |
275 | |
276 | "launchpad.net/juju-core/cmd/envcmd" |
277 | - "launchpad.net/juju-core/errors" |
278 | jujutesting "launchpad.net/juju-core/juju/testing" |
279 | "launchpad.net/juju-core/state" |
280 | "launchpad.net/juju-core/testing" |
281 | |
282 | === modified file 'cmd/jujud/agent.go' |
283 | --- cmd/jujud/agent.go 2014-05-13 23:18:30 +0000 |
284 | +++ cmd/jujud/agent.go 2014-05-15 02:28:23 +0000 |
285 | @@ -10,11 +10,11 @@ |
286 | "sync" |
287 | "time" |
288 | |
289 | + "github.com/juju/errors" |
290 | "launchpad.net/gnuflag" |
291 | |
292 | "launchpad.net/juju-core/agent" |
293 | "launchpad.net/juju-core/cmd" |
294 | - "launchpad.net/juju-core/errors" |
295 | "launchpad.net/juju-core/instance" |
296 | "launchpad.net/juju-core/state" |
297 | "launchpad.net/juju-core/state/api" |
298 | |
299 | === modified file 'cmd/jujud/bootstrap_test.go' |
300 | --- cmd/jujud/bootstrap_test.go 2014-05-08 07:04:54 +0000 |
301 | +++ cmd/jujud/bootstrap_test.go 2014-05-15 02:28:23 +0000 |
302 | @@ -9,6 +9,7 @@ |
303 | "io" |
304 | "io/ioutil" |
305 | |
306 | + "github.com/juju/errors" |
307 | jc "github.com/juju/testing/checkers" |
308 | gc "launchpad.net/gocheck" |
309 | "launchpad.net/goyaml" |
310 | @@ -20,7 +21,6 @@ |
311 | "launchpad.net/juju-core/environs/config" |
312 | "launchpad.net/juju-core/environs/configstore" |
313 | envtesting "launchpad.net/juju-core/environs/testing" |
314 | - "launchpad.net/juju-core/errors" |
315 | "launchpad.net/juju-core/instance" |
316 | jujutesting "launchpad.net/juju-core/juju/testing" |
317 | "launchpad.net/juju-core/provider/dummy" |
318 | |
319 | === modified file 'cmd/jujud/machine.go' |
320 | --- cmd/jujud/machine.go 2014-05-13 23:18:30 +0000 |
321 | +++ cmd/jujud/machine.go 2014-05-15 02:28:23 +0000 |
322 | @@ -11,6 +11,7 @@ |
323 | "runtime" |
324 | "time" |
325 | |
326 | + "github.com/juju/errors" |
327 | "github.com/juju/loggo" |
328 | "labix.org/v2/mgo" |
329 | "launchpad.net/gnuflag" |
330 | @@ -22,7 +23,6 @@ |
331 | "launchpad.net/juju-core/cmd" |
332 | "launchpad.net/juju-core/container/kvm" |
333 | "launchpad.net/juju-core/environs" |
334 | - "launchpad.net/juju-core/errors" |
335 | "launchpad.net/juju-core/instance" |
336 | "launchpad.net/juju-core/names" |
337 | "launchpad.net/juju-core/provider" |
338 | |
339 | === modified file 'cmd/jujud/machine_test.go' |
340 | --- cmd/jujud/machine_test.go 2014-04-18 04:39:58 +0000 |
341 | +++ cmd/jujud/machine_test.go 2014-05-15 02:28:23 +0000 |
342 | @@ -12,6 +12,7 @@ |
343 | "sync" |
344 | "time" |
345 | |
346 | + "github.com/juju/errors" |
347 | "github.com/juju/testing" |
348 | jc "github.com/juju/testing/checkers" |
349 | gc "launchpad.net/gocheck" |
350 | @@ -23,7 +24,6 @@ |
351 | lxctesting "launchpad.net/juju-core/container/lxc/testing" |
352 | "launchpad.net/juju-core/environs/config" |
353 | envtesting "launchpad.net/juju-core/environs/testing" |
354 | - "launchpad.net/juju-core/errors" |
355 | "launchpad.net/juju-core/instance" |
356 | "launchpad.net/juju-core/juju" |
357 | "launchpad.net/juju-core/juju/osenv" |
358 | |
359 | === modified file 'constraints/constraints.go' |
360 | --- constraints/constraints.go 2014-04-24 11:52:09 +0000 |
361 | +++ constraints/constraints.go 2014-05-15 02:28:23 +0000 |
362 | @@ -10,7 +10,7 @@ |
363 | "strconv" |
364 | "strings" |
365 | |
366 | - "github.com/errgo/errgo" |
367 | + "github.com/juju/errors" |
368 | |
369 | "launchpad.net/juju-core/instance" |
370 | "launchpad.net/juju-core/juju/arch" |
371 | @@ -274,7 +274,7 @@ |
372 | return fmt.Errorf("unknown constraint %q", name) |
373 | } |
374 | if err != nil { |
375 | - return errgo.Annotatef(err, "bad %q constraint", name) |
376 | + return errors.Annotatef(err, "bad %q constraint", name) |
377 | } |
378 | return nil |
379 | } |
380 | |
381 | === modified file 'container/kvm/container.go' |
382 | --- container/kvm/container.go 2014-04-17 03:41:32 +0000 |
383 | +++ container/kvm/container.go 2014-05-15 02:28:23 +0000 |
384 | @@ -6,8 +6,9 @@ |
385 | import ( |
386 | "fmt" |
387 | |
388 | + "github.com/juju/errors" |
389 | + |
390 | "launchpad.net/juju-core/container" |
391 | - "launchpad.net/juju-core/errors" |
392 | ) |
393 | |
394 | type kvmContainer struct { |
395 | |
396 | === modified file 'container/kvm/kvm.go' |
397 | --- container/kvm/kvm.go 2014-05-13 11:37:40 +0000 |
398 | +++ container/kvm/kvm.go 2014-05-15 02:28:23 +0000 |
399 | @@ -8,13 +8,13 @@ |
400 | "os/exec" |
401 | "strings" |
402 | |
403 | + "github.com/juju/errors" |
404 | "github.com/juju/loggo" |
405 | |
406 | "launchpad.net/juju-core/agent" |
407 | "launchpad.net/juju-core/constraints" |
408 | "launchpad.net/juju-core/container" |
409 | "launchpad.net/juju-core/environs/cloudinit" |
410 | - "launchpad.net/juju-core/errors" |
411 | "launchpad.net/juju-core/instance" |
412 | "launchpad.net/juju-core/names" |
413 | "launchpad.net/juju-core/version" |
414 | |
415 | === modified file 'container/lxc/instance.go' |
416 | --- container/lxc/instance.go 2014-04-14 12:36:13 +0000 |
417 | +++ container/lxc/instance.go 2014-05-15 02:28:23 +0000 |
418 | @@ -6,9 +6,9 @@ |
419 | import ( |
420 | "fmt" |
421 | |
422 | + "github.com/juju/errors" |
423 | "launchpad.net/golxc" |
424 | |
425 | - "launchpad.net/juju-core/errors" |
426 | "launchpad.net/juju-core/instance" |
427 | ) |
428 | |
429 | |
430 | === modified file 'dependencies.tsv' |
431 | --- dependencies.tsv 2014-05-13 11:37:40 +0000 |
432 | +++ dependencies.tsv 2014-05-15 02:28:23 +0000 |
433 | @@ -1,10 +1,11 @@ |
434 | code.google.com/p/go.crypto hg 6478cc9340cbbe6c04511280c5007722269108e9 184 |
435 | code.google.com/p/go.net hg c17ad62118ea511e1051721b429779fa40bddc74 116 |
436 | -github.com/errgo/errgo git 93d72bf813883d1054cae1c001d3a46603f7f559 |
437 | github.com/joyent/gocommon git 98b151a080efe19bcde223d2d3b04389963d2347 |
438 | github.com/joyent/gomanta git ff785814c0ebb4050420a2f1d47895b35b8808f2 |
439 | github.com/joyent/gosdc git 10bbe92c5d98c8b38a0b7f62ee042c7252150efc |
440 | github.com/joyent/gosign git 476720af5427223da5420afbbadf620bfb760345 |
441 | +github.com/juju/errgo git 96d8f88c102000c1e7150b957c7c493911519338 |
442 | +github.com/juju/errors git 075df0417dbcc39d24ee18248d2f8d6e3eed598b |
443 | github.com/juju/loggo git fa3acf9ab9ed09aea29030558528e24a254d27af |
444 | github.com/juju/ratelimit git 0025ab75db6c6eaa4ffff0240c2c9e617ad1a0eb |
445 | github.com/juju/testing git 9c0e0686136637876ae659e9056897575236e11f |
446 | |
447 | === modified file 'environs/bootstrap/state.go' |
448 | --- environs/bootstrap/state.go 2014-04-14 12:36:13 +0000 |
449 | +++ environs/bootstrap/state.go 2014-05-15 02:28:23 +0000 |
450 | @@ -9,11 +9,11 @@ |
451 | "io" |
452 | "io/ioutil" |
453 | |
454 | + "github.com/juju/errors" |
455 | "launchpad.net/goyaml" |
456 | |
457 | "launchpad.net/juju-core/environs" |
458 | "launchpad.net/juju-core/environs/storage" |
459 | - coreerrors "launchpad.net/juju-core/errors" |
460 | "launchpad.net/juju-core/instance" |
461 | ) |
462 | |
463 | @@ -65,7 +65,7 @@ |
464 | func LoadState(stor storage.StorageReader) (*BootstrapState, error) { |
465 | r, err := storage.Get(stor, StateFile) |
466 | if err != nil { |
467 | - if coreerrors.IsNotFound(err) { |
468 | + if errors.IsNotFound(err) { |
469 | return nil, environs.ErrNotBootstrapped |
470 | } |
471 | return nil, err |
472 | |
473 | === modified file 'environs/bootstrap/synctools.go' |
474 | --- environs/bootstrap/synctools.go 2014-05-13 23:18:30 +0000 |
475 | +++ environs/bootstrap/synctools.go 2014-05-15 02:28:23 +0000 |
476 | @@ -7,11 +7,12 @@ |
477 | "fmt" |
478 | "os" |
479 | |
480 | + "github.com/juju/errors" |
481 | + |
482 | "launchpad.net/juju-core/environs" |
483 | "launchpad.net/juju-core/environs/config" |
484 | "launchpad.net/juju-core/environs/sync" |
485 | envtools "launchpad.net/juju-core/environs/tools" |
486 | - "launchpad.net/juju-core/errors" |
487 | "launchpad.net/juju-core/juju/arch" |
488 | coretools "launchpad.net/juju-core/tools" |
489 | "launchpad.net/juju-core/utils/set" |
490 | |
491 | === modified file 'environs/cloudinit.go' |
492 | --- environs/cloudinit.go 2014-04-23 08:50:28 +0000 |
493 | +++ environs/cloudinit.go 2014-05-15 02:28:23 +0000 |
494 | @@ -6,14 +6,13 @@ |
495 | import ( |
496 | "fmt" |
497 | |
498 | - "github.com/errgo/errgo" |
499 | + "github.com/juju/errors" |
500 | |
501 | "launchpad.net/juju-core/agent" |
502 | coreCloudinit "launchpad.net/juju-core/cloudinit" |
503 | "launchpad.net/juju-core/constraints" |
504 | "launchpad.net/juju-core/environs/cloudinit" |
505 | "launchpad.net/juju-core/environs/config" |
506 | - "launchpad.net/juju-core/errors" |
507 | "launchpad.net/juju-core/juju/osenv" |
508 | "launchpad.net/juju-core/names" |
509 | "launchpad.net/juju-core/state" |
510 | @@ -141,7 +140,7 @@ |
511 | // These really are directly relevant to running a state server. |
512 | cert, key, err := cfg.GenerateStateServerCertAndKey() |
513 | if err != nil { |
514 | - return errgo.Annotate(err, "cannot generate state server certificate") |
515 | + return errors.Annotate(err, "cannot generate state server certificate") |
516 | } |
517 | |
518 | srvInfo := params.StateServingInfo{ |
519 | |
520 | === modified file 'environs/cloudinit/cloudinit.go' |
521 | --- environs/cloudinit/cloudinit.go 2014-04-23 08:50:28 +0000 |
522 | +++ environs/cloudinit/cloudinit.go 2014-05-15 02:28:23 +0000 |
523 | @@ -10,7 +10,7 @@ |
524 | "path" |
525 | "strings" |
526 | |
527 | - "github.com/errgo/errgo" |
528 | + "github.com/juju/errors" |
529 | "launchpad.net/goyaml" |
530 | |
531 | "launchpad.net/juju-core/agent" |
532 | @@ -18,7 +18,6 @@ |
533 | "launchpad.net/juju-core/cloudinit" |
534 | "launchpad.net/juju-core/constraints" |
535 | "launchpad.net/juju-core/environs/config" |
536 | - "launchpad.net/juju-core/errors" |
537 | "launchpad.net/juju-core/instance" |
538 | "launchpad.net/juju-core/juju/osenv" |
539 | "launchpad.net/juju-core/names" |
540 | @@ -405,7 +404,7 @@ |
541 | acfg.SetValue(agent.AgentServiceName, cfg.MachineAgentServiceName) |
542 | cmds, err := acfg.WriteCommands() |
543 | if err != nil { |
544 | - return nil, errgo.Annotate(err, "failed to write commands") |
545 | + return nil, errors.Annotate(err, "failed to write commands") |
546 | } |
547 | c.AddScripts(cmds...) |
548 | return acfg, nil |
549 | @@ -423,7 +422,7 @@ |
550 | conf := upstart.MachineAgentUpstartService(name, toolsDir, cfg.DataDir, cfg.LogDir, tag, machineId, nil) |
551 | cmds, err := conf.InstallCommands() |
552 | if err != nil { |
553 | - return errgo.Annotatef(err, "cannot make cloud-init upstart script for the %s agent", tag) |
554 | + return errors.Annotatef(err, "cannot make cloud-init upstart script for the %s agent", tag) |
555 | } |
556 | c.AddRunCmd(cloudinit.LogProgressCmd("Starting Juju machine agent (%s)", name)) |
557 | c.AddScripts(cmds...) |
558 | |
559 | === modified file 'environs/config.go' |
560 | --- environs/config.go 2014-03-07 23:03:04 +0000 |
561 | +++ environs/config.go 2014-05-15 02:28:23 +0000 |
562 | @@ -9,11 +9,11 @@ |
563 | "os" |
564 | "path/filepath" |
565 | |
566 | + "github.com/juju/errors" |
567 | "github.com/juju/loggo" |
568 | "launchpad.net/goyaml" |
569 | |
570 | "launchpad.net/juju-core/environs/config" |
571 | - "launchpad.net/juju-core/errors" |
572 | "launchpad.net/juju-core/juju/osenv" |
573 | ) |
574 | |
575 | |
576 | === modified file 'environs/config/config.go' |
577 | --- environs/config/config.go 2014-05-09 13:24:50 +0000 |
578 | +++ environs/config/config.go 2014-05-15 02:28:23 +0000 |
579 | @@ -13,7 +13,7 @@ |
580 | "strings" |
581 | "time" |
582 | |
583 | - "github.com/errgo/errgo" |
584 | + "github.com/juju/errors" |
585 | "github.com/juju/loggo" |
586 | |
587 | "launchpad.net/juju-core/cert" |
588 | @@ -320,7 +320,7 @@ |
589 | caKey, caKeyOK := cfg.CAPrivateKey() |
590 | if caCertOK || caKeyOK { |
591 | if err := verifyKeyPair(caCert, caKey); err != nil { |
592 | - return errgo.Annotate(err, "bad CA certificate/key in configuration") |
593 | + return errors.Annotate(err, "bad CA certificate/key in configuration") |
594 | } |
595 | } |
596 | |
597 | |
598 | === modified file 'environs/configstore/disk.go' |
599 | --- environs/configstore/disk.go 2014-04-30 23:18:40 +0000 |
600 | +++ environs/configstore/disk.go 2014-05-15 02:28:23 +0000 |
601 | @@ -9,11 +9,10 @@ |
602 | "os" |
603 | "path/filepath" |
604 | |
605 | - "github.com/errgo/errgo" |
606 | + "github.com/juju/errors" |
607 | "github.com/juju/loggo" |
608 | "launchpad.net/goyaml" |
609 | |
610 | - "launchpad.net/juju-core/errors" |
611 | "launchpad.net/juju-core/juju/osenv" |
612 | "launchpad.net/juju-core/utils" |
613 | ) |
614 | @@ -173,14 +172,14 @@ |
615 | func (info *environInfo) Write() error { |
616 | data, err := goyaml.Marshal(info.EnvInfo) |
617 | if err != nil { |
618 | - return errgo.Annotate(err, "cannot marshal environment info") |
619 | + return errors.Annotate(err, "cannot marshal environment info") |
620 | } |
621 | // Create a temporary file and rename it, so that the data |
622 | // changes atomically. |
623 | parent, _ := filepath.Split(info.path) |
624 | tmpFile, err := ioutil.TempFile(parent, "") |
625 | if err != nil { |
626 | - return errgo.Annotate(err, "cannot create temporary file") |
627 | + return errors.Annotate(err, "cannot create temporary file") |
628 | } |
629 | _, err = tmpFile.Write(data) |
630 | // N.B. We need to close the file before renaming it |
631 | @@ -188,11 +187,11 @@ |
632 | // error. |
633 | tmpFile.Close() |
634 | if err != nil { |
635 | - return errgo.Annotate(err, "cannot write temporary file") |
636 | + return errors.Annotate(err, "cannot write temporary file") |
637 | } |
638 | if err := utils.ReplaceFile(tmpFile.Name(), info.path); err != nil { |
639 | os.Remove(tmpFile.Name()) |
640 | - return errgo.Annotate(err, "cannot rename new environment info file") |
641 | + return errors.Annotate(err, "cannot rename new environment info file") |
642 | } |
643 | info.initialized = true |
644 | return nil |
645 | |
646 | === modified file 'environs/configstore/disk_test.go' |
647 | --- environs/configstore/disk_test.go 2014-04-14 12:36:13 +0000 |
648 | +++ environs/configstore/disk_test.go 2014-05-15 02:28:23 +0000 |
649 | @@ -12,11 +12,11 @@ |
650 | "strings" |
651 | "syscall" |
652 | |
653 | + "github.com/juju/errors" |
654 | jc "github.com/juju/testing/checkers" |
655 | gc "launchpad.net/gocheck" |
656 | |
657 | "launchpad.net/juju-core/environs/configstore" |
658 | - "launchpad.net/juju-core/errors" |
659 | "launchpad.net/juju-core/testing/testbase" |
660 | ) |
661 | |
662 | |
663 | === modified file 'environs/configstore/mem.go' |
664 | --- environs/configstore/mem.go 2014-03-27 17:05:00 +0000 |
665 | +++ environs/configstore/mem.go 2014-05-15 02:28:23 +0000 |
666 | @@ -7,7 +7,7 @@ |
667 | "fmt" |
668 | "sync" |
669 | |
670 | - "launchpad.net/juju-core/errors" |
671 | + "github.com/juju/errors" |
672 | ) |
673 | |
674 | type memStore struct { |
675 | |
676 | === modified file 'environs/emptystorage.go' |
677 | --- environs/emptystorage.go 2013-10-03 01:28:51 +0000 |
678 | +++ environs/emptystorage.go 2014-05-15 02:28:23 +0000 |
679 | @@ -7,8 +7,9 @@ |
680 | "fmt" |
681 | "io" |
682 | |
683 | + "github.com/juju/errors" |
684 | + |
685 | "launchpad.net/juju-core/environs/storage" |
686 | - "launchpad.net/juju-core/errors" |
687 | "launchpad.net/juju-core/utils" |
688 | ) |
689 | |
690 | |
691 | === modified file 'environs/emptystorage_test.go' |
692 | --- environs/emptystorage_test.go 2014-02-13 02:46:58 +0000 |
693 | +++ environs/emptystorage_test.go 2014-05-15 02:28:23 +0000 |
694 | @@ -6,12 +6,12 @@ |
695 | import ( |
696 | "io/ioutil" |
697 | |
698 | + "github.com/juju/errors" |
699 | gc "launchpad.net/gocheck" |
700 | |
701 | "launchpad.net/juju-core/environs" |
702 | "launchpad.net/juju-core/environs/configstore" |
703 | "launchpad.net/juju-core/environs/storage" |
704 | - "launchpad.net/juju-core/errors" |
705 | "launchpad.net/juju-core/provider/dummy" |
706 | "launchpad.net/juju-core/testing" |
707 | "launchpad.net/juju-core/testing/testbase" |
708 | |
709 | === modified file 'environs/filestorage/filestorage.go' |
710 | --- environs/filestorage/filestorage.go 2014-04-30 23:18:40 +0000 |
711 | +++ environs/filestorage/filestorage.go 2014-05-15 02:28:23 +0000 |
712 | @@ -12,8 +12,9 @@ |
713 | "sort" |
714 | "strings" |
715 | |
716 | + "github.com/juju/errors" |
717 | + |
718 | "launchpad.net/juju-core/environs/storage" |
719 | - coreerrors "launchpad.net/juju-core/errors" |
720 | "launchpad.net/juju-core/utils" |
721 | ) |
722 | |
723 | @@ -60,11 +61,11 @@ |
724 | fi, err := os.Stat(filename) |
725 | if err != nil { |
726 | if os.IsNotExist(err) { |
727 | - err = coreerrors.NewNotFound(err, "") |
728 | + err = errors.NewNotFound(err, "") |
729 | } |
730 | return nil, err |
731 | } else if fi.IsDir() { |
732 | - return nil, coreerrors.NotFoundf("no such file with name %q", name) |
733 | + return nil, errors.NotFoundf("no such file with name %q", name) |
734 | } |
735 | file, err := os.Open(filename) |
736 | if err != nil { |
737 | |
738 | === modified file 'environs/filestorage/filestorage_test.go' |
739 | --- environs/filestorage/filestorage_test.go 2014-04-14 12:36:13 +0000 |
740 | +++ environs/filestorage/filestorage_test.go 2014-05-15 02:28:23 +0000 |
741 | @@ -15,12 +15,12 @@ |
742 | "strings" |
743 | "testing" |
744 | |
745 | + "github.com/juju/errors" |
746 | jc "github.com/juju/testing/checkers" |
747 | gc "launchpad.net/gocheck" |
748 | |
749 | "launchpad.net/juju-core/environs/filestorage" |
750 | "launchpad.net/juju-core/environs/storage" |
751 | - coreerrors "launchpad.net/juju-core/errors" |
752 | "launchpad.net/juju-core/juju/osenv" |
753 | ) |
754 | |
755 | @@ -132,12 +132,12 @@ |
756 | |
757 | // Get on a non-existant path returns errors.NotFound |
758 | _, err = s.reader.Get("nowhere") |
759 | - c.Assert(err, jc.Satisfies, coreerrors.IsNotFound) |
760 | + c.Assert(err, jc.Satisfies, errors.IsNotFound) |
761 | |
762 | // Get on a directory returns errors.NotFound |
763 | s.createFile(c, "dir/file") |
764 | _, err = s.reader.Get("dir") |
765 | - c.Assert(err, jc.Satisfies, coreerrors.IsNotFound) |
766 | + c.Assert(err, jc.Satisfies, errors.IsNotFound) |
767 | } |
768 | |
769 | func (s *filestorageSuite) TestGetRefusesTemp(c *gc.C) { |
770 | |
771 | === modified file 'environs/httpstorage/storage.go' |
772 | --- environs/httpstorage/storage.go 2014-04-30 23:18:40 +0000 |
773 | +++ environs/httpstorage/storage.go 2014-05-15 02:28:23 +0000 |
774 | @@ -6,7 +6,6 @@ |
775 | import ( |
776 | "crypto/tls" |
777 | "crypto/x509" |
778 | - "errors" |
779 | "fmt" |
780 | "io" |
781 | "io/ioutil" |
782 | @@ -16,10 +15,10 @@ |
783 | "strings" |
784 | "sync" |
785 | |
786 | + "github.com/juju/errors" |
787 | "github.com/juju/loggo" |
788 | |
789 | "launchpad.net/juju-core/environs/storage" |
790 | - coreerrors "launchpad.net/juju-core/errors" |
791 | "launchpad.net/juju-core/utils" |
792 | ) |
793 | |
794 | @@ -96,7 +95,7 @@ |
795 | return nil, err |
796 | } |
797 | if resp.StatusCode != http.StatusOK { |
798 | - return nil, coreerrors.NotFoundf("file %q", name) |
799 | + return nil, errors.NotFoundf("file %q", name) |
800 | } |
801 | return resp.Body, nil |
802 | } |
803 | |
804 | === modified file 'environs/httpstorage/storage_test.go' |
805 | --- environs/httpstorage/storage_test.go 2014-04-14 12:36:13 +0000 |
806 | +++ environs/httpstorage/storage_test.go 2014-05-15 02:28:23 +0000 |
807 | @@ -11,12 +11,12 @@ |
808 | "net/http" |
809 | "path/filepath" |
810 | |
811 | + "github.com/juju/errors" |
812 | jc "github.com/juju/testing/checkers" |
813 | gc "launchpad.net/gocheck" |
814 | |
815 | "launchpad.net/juju-core/environs/httpstorage" |
816 | "launchpad.net/juju-core/environs/storage" |
817 | - "launchpad.net/juju-core/errors" |
818 | coretesting "launchpad.net/juju-core/testing" |
819 | ) |
820 | |
821 | |
822 | === modified file 'environs/imagemetadata/generate.go' |
823 | --- environs/imagemetadata/generate.go 2014-05-13 23:18:30 +0000 |
824 | +++ environs/imagemetadata/generate.go 2014-05-15 02:28:23 +0000 |
825 | @@ -9,9 +9,10 @@ |
826 | "path/filepath" |
827 | "time" |
828 | |
829 | + "github.com/juju/errors" |
830 | + |
831 | "launchpad.net/juju-core/environs/simplestreams" |
832 | "launchpad.net/juju-core/environs/storage" |
833 | - "launchpad.net/juju-core/errors" |
834 | "launchpad.net/juju-core/version/ubuntu" |
835 | ) |
836 | |
837 | |
838 | === modified file 'environs/jujutest/livetests.go' |
839 | --- environs/jujutest/livetests.go 2014-05-14 02:59:53 +0000 |
840 | +++ environs/jujutest/livetests.go 2014-05-15 02:28:23 +0000 |
841 | @@ -11,6 +11,7 @@ |
842 | "strings" |
843 | "time" |
844 | |
845 | + "github.com/juju/errors" |
846 | jc "github.com/juju/testing/checkers" |
847 | gc "launchpad.net/gocheck" |
848 | |
849 | @@ -24,7 +25,6 @@ |
850 | "launchpad.net/juju-core/environs/sync" |
851 | envtesting "launchpad.net/juju-core/environs/testing" |
852 | envtools "launchpad.net/juju-core/environs/tools" |
853 | - "launchpad.net/juju-core/errors" |
854 | "launchpad.net/juju-core/instance" |
855 | "launchpad.net/juju-core/juju" |
856 | "launchpad.net/juju-core/juju/testing" |
857 | |
858 | === modified file 'environs/jujutest/tests.go' |
859 | --- environs/jujutest/tests.go 2014-05-14 02:59:53 +0000 |
860 | +++ environs/jujutest/tests.go 2014-05-15 02:28:23 +0000 |
861 | @@ -9,6 +9,7 @@ |
862 | "net/http" |
863 | "sort" |
864 | |
865 | + "github.com/juju/errors" |
866 | jc "github.com/juju/testing/checkers" |
867 | gc "launchpad.net/gocheck" |
868 | |
869 | @@ -18,7 +19,6 @@ |
870 | "launchpad.net/juju-core/environs/configstore" |
871 | "launchpad.net/juju-core/environs/storage" |
872 | envtesting "launchpad.net/juju-core/environs/testing" |
873 | - "launchpad.net/juju-core/errors" |
874 | "launchpad.net/juju-core/instance" |
875 | "launchpad.net/juju-core/juju/testing" |
876 | coretesting "launchpad.net/juju-core/testing" |
877 | |
878 | === modified file 'environs/open.go' |
879 | --- environs/open.go 2014-04-14 12:36:13 +0000 |
880 | +++ environs/open.go 2014-05-15 02:28:23 +0000 |
881 | @@ -9,13 +9,12 @@ |
882 | "strings" |
883 | "time" |
884 | |
885 | - "github.com/errgo/errgo" |
886 | + "github.com/juju/errors" |
887 | |
888 | "launchpad.net/juju-core/cert" |
889 | "launchpad.net/juju-core/environs/config" |
890 | "launchpad.net/juju-core/environs/configstore" |
891 | "launchpad.net/juju-core/environs/storage" |
892 | - "launchpad.net/juju-core/errors" |
893 | ) |
894 | |
895 | // File named `VerificationFilename` in the storage will contain |
896 | @@ -274,7 +273,7 @@ |
897 | return err |
898 | } |
899 | if err := info.Destroy(); err != nil { |
900 | - return errgo.Annotate(err, "cannot destroy environment configuration information") |
901 | + return errors.Annotate(err, "cannot destroy environment configuration information") |
902 | } |
903 | return nil |
904 | } |
905 | |
906 | === modified file 'environs/open_test.go' |
907 | --- environs/open_test.go 2014-04-24 02:27:38 +0000 |
908 | +++ environs/open_test.go 2014-05-15 02:28:23 +0000 |
909 | @@ -6,6 +6,7 @@ |
910 | import ( |
911 | "strings" |
912 | |
913 | + "github.com/juju/errors" |
914 | jc "github.com/juju/testing/checkers" |
915 | gc "launchpad.net/gocheck" |
916 | |
917 | @@ -15,7 +16,6 @@ |
918 | "launchpad.net/juju-core/environs/config" |
919 | "launchpad.net/juju-core/environs/configstore" |
920 | envtesting "launchpad.net/juju-core/environs/testing" |
921 | - "launchpad.net/juju-core/errors" |
922 | "launchpad.net/juju-core/provider/dummy" |
923 | "launchpad.net/juju-core/testing" |
924 | "launchpad.net/juju-core/testing/testbase" |
925 | |
926 | === modified file 'environs/simplestreams/datasource.go' |
927 | --- environs/simplestreams/datasource.go 2014-03-21 03:27:16 +0000 |
928 | +++ environs/simplestreams/datasource.go 2014-05-15 02:28:23 +0000 |
929 | @@ -9,7 +9,8 @@ |
930 | "net/http" |
931 | "strings" |
932 | |
933 | - "launchpad.net/juju-core/errors" |
934 | + "github.com/juju/errors" |
935 | + |
936 | "launchpad.net/juju-core/utils" |
937 | ) |
938 | |
939 | |
940 | === modified file 'environs/simplestreams/simplestreams.go' |
941 | --- environs/simplestreams/simplestreams.go 2014-05-13 23:18:30 +0000 |
942 | +++ environs/simplestreams/simplestreams.go 2014-05-15 02:28:23 +0000 |
943 | @@ -18,9 +18,9 @@ |
944 | "sort" |
945 | "strings" |
946 | |
947 | + "github.com/juju/errors" |
948 | "github.com/juju/loggo" |
949 | |
950 | - "launchpad.net/juju-core/errors" |
951 | "launchpad.net/juju-core/utils" |
952 | ) |
953 | |
954 | |
955 | === modified file 'environs/sshstorage/storage.go' |
956 | --- environs/sshstorage/storage.go 2014-04-14 12:36:13 +0000 |
957 | +++ environs/sshstorage/storage.go 2014-05-15 02:28:23 +0000 |
958 | @@ -7,7 +7,6 @@ |
959 | "bufio" |
960 | "bytes" |
961 | "encoding/base64" |
962 | - "errors" |
963 | "fmt" |
964 | "io" |
965 | "io/ioutil" |
966 | @@ -16,9 +15,9 @@ |
967 | "strconv" |
968 | "strings" |
969 | |
970 | + "github.com/juju/errors" |
971 | "github.com/juju/loggo" |
972 | |
973 | - coreerrors "launchpad.net/juju-core/errors" |
974 | "launchpad.net/juju-core/utils" |
975 | "launchpad.net/juju-core/utils/ssh" |
976 | ) |
977 | @@ -253,7 +252,7 @@ |
978 | if err != nil { |
979 | err := err.(SSHStorageError) |
980 | if strings.Contains(err.Output, "No such file") { |
981 | - return nil, coreerrors.NewNotFound(err, "") |
982 | + return nil, errors.NewNotFound(err, "") |
983 | } |
984 | return nil, err |
985 | } |
986 | |
987 | === modified file 'environs/sshstorage/storage_test.go' |
988 | --- environs/sshstorage/storage_test.go 2014-04-14 12:36:13 +0000 |
989 | +++ environs/sshstorage/storage_test.go 2014-05-15 02:28:23 +0000 |
990 | @@ -16,12 +16,12 @@ |
991 | "strings" |
992 | "time" |
993 | |
994 | + "github.com/juju/errors" |
995 | "github.com/juju/testing" |
996 | jc "github.com/juju/testing/checkers" |
997 | gc "launchpad.net/gocheck" |
998 | |
999 | "launchpad.net/juju-core/environs/storage" |
1000 | - coreerrors "launchpad.net/juju-core/errors" |
1001 | "launchpad.net/juju-core/testing/testbase" |
1002 | "launchpad.net/juju-core/utils" |
1003 | "launchpad.net/juju-core/utils/ssh" |
1004 | @@ -164,7 +164,7 @@ |
1005 | c.Assert(out, gc.DeepEquals, data) |
1006 | } |
1007 | _, err = storage.Get(stor, "notthere") |
1008 | - c.Assert(err, jc.Satisfies, coreerrors.IsNotFound) |
1009 | + c.Assert(err, jc.Satisfies, errors.IsNotFound) |
1010 | } |
1011 | |
1012 | func (s *storageSuite) TestWriteFailure(c *gc.C) { |
1013 | |
1014 | === modified file 'environs/tools/simplestreams.go' |
1015 | --- environs/tools/simplestreams.go 2014-05-13 23:18:30 +0000 |
1016 | +++ environs/tools/simplestreams.go 2014-05-15 02:28:23 +0000 |
1017 | @@ -17,9 +17,10 @@ |
1018 | "strings" |
1019 | "time" |
1020 | |
1021 | + "github.com/juju/errors" |
1022 | + |
1023 | "launchpad.net/juju-core/environs/simplestreams" |
1024 | "launchpad.net/juju-core/environs/storage" |
1025 | - "launchpad.net/juju-core/errors" |
1026 | coretools "launchpad.net/juju-core/tools" |
1027 | "launchpad.net/juju-core/utils/set" |
1028 | "launchpad.net/juju-core/version" |
1029 | |
1030 | === modified file 'environs/tools/tools.go' |
1031 | --- environs/tools/tools.go 2014-05-13 23:18:30 +0000 |
1032 | +++ environs/tools/tools.go 2014-05-15 02:28:23 +0000 |
1033 | @@ -6,11 +6,11 @@ |
1034 | import ( |
1035 | "fmt" |
1036 | |
1037 | + "github.com/juju/errors" |
1038 | "github.com/juju/loggo" |
1039 | |
1040 | "launchpad.net/juju-core/environs" |
1041 | "launchpad.net/juju-core/environs/simplestreams" |
1042 | - "launchpad.net/juju-core/errors" |
1043 | "launchpad.net/juju-core/juju/arch" |
1044 | coretools "launchpad.net/juju-core/tools" |
1045 | "launchpad.net/juju-core/version" |
1046 | |
1047 | === modified file 'environs/tools/tools_test.go' |
1048 | --- environs/tools/tools_test.go 2014-04-14 12:36:13 +0000 |
1049 | +++ environs/tools/tools_test.go 2014-05-15 02:28:23 +0000 |
1050 | @@ -8,6 +8,7 @@ |
1051 | "os" |
1052 | "path/filepath" |
1053 | |
1054 | + "github.com/juju/errors" |
1055 | "github.com/juju/loggo" |
1056 | jc "github.com/juju/testing/checkers" |
1057 | gc "launchpad.net/gocheck" |
1058 | @@ -18,7 +19,6 @@ |
1059 | envtesting "launchpad.net/juju-core/environs/testing" |
1060 | envtools "launchpad.net/juju-core/environs/tools" |
1061 | ttesting "launchpad.net/juju-core/environs/tools/testing" |
1062 | - "launchpad.net/juju-core/errors" |
1063 | "launchpad.net/juju-core/provider/dummy" |
1064 | "launchpad.net/juju-core/testing" |
1065 | "launchpad.net/juju-core/testing/testbase" |
1066 | |
1067 | === removed directory 'errors' |
1068 | === removed file 'errors/errors.go' |
1069 | --- errors/errors.go 2014-04-17 12:53:23 +0000 |
1070 | +++ errors/errors.go 1970-01-01 00:00:00 +0000 |
1071 | @@ -1,210 +0,0 @@ |
1072 | -// Copyright 2013 Canonical Ltd. |
1073 | -// Licensed under the AGPLv3, see LICENCE file for details. |
1074 | - |
1075 | -package errors |
1076 | - |
1077 | -import ( |
1078 | - "fmt" |
1079 | - |
1080 | - "github.com/juju/loggo" |
1081 | -) |
1082 | - |
1083 | -// wrapper defines a way to encapsulate an error inside another error. |
1084 | -type wrapper struct { |
1085 | - // Err is the underlying error. |
1086 | - err error |
1087 | - |
1088 | - // Msg is the annotation (prefix) of Err. |
1089 | - msg string |
1090 | -} |
1091 | - |
1092 | -// newer is implemented by error types that can add a context message |
1093 | -// while preserving their type. |
1094 | -type newer interface { |
1095 | - new(msg string) error |
1096 | -} |
1097 | - |
1098 | -// Error implements the error interface. |
1099 | -func (e *wrapper) Error() string { |
1100 | - if e.msg != "" || e.err == nil { |
1101 | - if e.err != nil { |
1102 | - return fmt.Sprintf("%s: %v", e.msg, e.err.Error()) |
1103 | - } |
1104 | - return e.msg |
1105 | - } |
1106 | - return e.err.Error() |
1107 | -} |
1108 | - |
1109 | -// wrap is a helper to construct an *wrapper. |
1110 | -func wrap(err error, format, suffix string, args ...interface{}) wrapper { |
1111 | - return wrapper{err, fmt.Sprintf(format+suffix, args...)} |
1112 | -} |
1113 | - |
1114 | -// Contextf prefixes any error stored in err with text formatted |
1115 | -// according to the format specifier. If err does not contain an |
1116 | -// error, Contextf does nothing. All errors created with functions |
1117 | -// from this package are preserved when wrapping. |
1118 | -func Contextf(err *error, format string, args ...interface{}) { |
1119 | - if *err == nil { |
1120 | - return |
1121 | - } |
1122 | - msg := fmt.Sprintf(format, args...) |
1123 | - errNewer, ok := (*err).(newer) |
1124 | - if ok { |
1125 | - *err = errNewer.new(msg) |
1126 | - return |
1127 | - } |
1128 | - *err = fmt.Errorf("%s: %v", msg, *err) |
1129 | -} |
1130 | - |
1131 | -// Maskf masks the given error (when it is not nil) with the given |
1132 | -// format string and arguments (like fmt.Sprintf), returning a new |
1133 | -// error. If *err is nil, Maskf does nothing. |
1134 | -func Maskf(err *error, format string, args ...interface{}) { |
1135 | - if *err == nil { |
1136 | - return |
1137 | - } |
1138 | - *err = fmt.Errorf("%s: %v", fmt.Sprintf(format, args...), *err) |
1139 | -} |
1140 | - |
1141 | -// notFound represents an error when something has not been found. |
1142 | -type notFound struct { |
1143 | - wrapper |
1144 | -} |
1145 | - |
1146 | -func (e *notFound) new(msg string) error { |
1147 | - return NewNotFound(e, msg) |
1148 | -} |
1149 | - |
1150 | -// NotFoundf returns an error which satisfies IsNotFound(). |
1151 | -func NotFoundf(format string, args ...interface{}) error { |
1152 | - return ¬Found{wrap(nil, format, " not found", args...)} |
1153 | -} |
1154 | - |
1155 | -// NewNotFound returns an error which wraps err that satisfies |
1156 | -// IsNotFound(). |
1157 | -func NewNotFound(err error, msg string) error { |
1158 | - return ¬Found{wrap(err, msg, "")} |
1159 | -} |
1160 | - |
1161 | -// IsNotFound reports whether err was created with NotFoundf() or |
1162 | -// NewNotFound(). |
1163 | -func IsNotFound(err error) bool { |
1164 | - _, ok := err.(*notFound) |
1165 | - return ok |
1166 | -} |
1167 | - |
1168 | -// unauthorized represents an error when an operation is unauthorized. |
1169 | -type unauthorized struct { |
1170 | - wrapper |
1171 | -} |
1172 | - |
1173 | -func (e *unauthorized) new(msg string) error { |
1174 | - return NewUnauthorized(e, msg) |
1175 | -} |
1176 | - |
1177 | -// Unauthorizedf returns an error which satisfies IsUnauthorized(). |
1178 | -func Unauthorizedf(format string, args ...interface{}) error { |
1179 | - return &unauthorized{wrap(nil, format, "", args...)} |
1180 | -} |
1181 | - |
1182 | -// NewUnauthorized returns an error which wraps err and satisfies |
1183 | -// IsUnauthorized(). |
1184 | -func NewUnauthorized(err error, msg string) error { |
1185 | - return &unauthorized{wrap(err, msg, "")} |
1186 | -} |
1187 | - |
1188 | -// IsUnauthorized reports whether err was created with Unauthorizedf() or |
1189 | -// NewUnauthorized(). |
1190 | -func IsUnauthorized(err error) bool { |
1191 | - _, ok := err.(*unauthorized) |
1192 | - return ok |
1193 | -} |
1194 | - |
1195 | -// notImplemented represents an error when something is not |
1196 | -// implemented. |
1197 | -type notImplemented struct { |
1198 | - wrapper |
1199 | -} |
1200 | - |
1201 | -func (e *notImplemented) new(msg string) error { |
1202 | - return NewNotImplemented(e, msg) |
1203 | -} |
1204 | - |
1205 | -// NotImplementedf returns an error which satisfies IsNotImplemented(). |
1206 | -func NotImplementedf(format string, args ...interface{}) error { |
1207 | - return ¬Implemented{wrap(nil, format, " not implemented", args...)} |
1208 | -} |
1209 | - |
1210 | -// NewNotImplemented returns an error which wraps err and satisfies |
1211 | -// IsNotImplemented(). |
1212 | -func NewNotImplemented(err error, msg string) error { |
1213 | - return ¬Implemented{wrap(err, msg, "")} |
1214 | -} |
1215 | - |
1216 | -// IsNotImplemented reports whether err was created with |
1217 | -// NotImplementedf() or NewNotImplemented(). |
1218 | -func IsNotImplemented(err error) bool { |
1219 | - _, ok := err.(*notImplemented) |
1220 | - return ok |
1221 | -} |
1222 | - |
1223 | -// alreadyExists represents and error when something already exists. |
1224 | -type alreadyExists struct { |
1225 | - wrapper |
1226 | -} |
1227 | - |
1228 | -func (e *alreadyExists) new(msg string) error { |
1229 | - return NewAlreadyExists(e, msg) |
1230 | -} |
1231 | - |
1232 | -// AlreadyExistsf returns an error which satisfies IsAlreadyExists(). |
1233 | -func AlreadyExistsf(format string, args ...interface{}) error { |
1234 | - return &alreadyExists{wrap(nil, format, " already exists", args...)} |
1235 | -} |
1236 | - |
1237 | -// NewAlreadyExists returns an error which wraps err and satisfies |
1238 | -// IsAlreadyExists(). |
1239 | -func NewAlreadyExists(err error, msg string) error { |
1240 | - return &alreadyExists{wrap(err, msg, "")} |
1241 | -} |
1242 | - |
1243 | -// IsAlreadyExists reports whether the error was created with |
1244 | -// AlreadyExistsf() or NewAlreadyExists(). |
1245 | -func IsAlreadyExists(err error) bool { |
1246 | - _, ok := err.(*alreadyExists) |
1247 | - return ok |
1248 | -} |
1249 | - |
1250 | -// notSupported represents an error when something is not supported. |
1251 | -type notSupported struct { |
1252 | - wrapper |
1253 | -} |
1254 | - |
1255 | -func (e *notSupported) new(msg string) error { |
1256 | - return NewNotSupported(e, msg) |
1257 | -} |
1258 | - |
1259 | -// NotSupportedf returns an error which satisfies IsNotSupported(). |
1260 | -func NotSupportedf(format string, args ...interface{}) error { |
1261 | - return ¬Supported{wrap(nil, format, " not supported", args...)} |
1262 | -} |
1263 | - |
1264 | -// NewNotSupported returns an error which wraps err and satisfies |
1265 | -// IsNotSupported(). |
1266 | -func NewNotSupported(err error, msg string) error { |
1267 | - return ¬Supported{wrap(err, msg, "")} |
1268 | -} |
1269 | - |
1270 | -// IsNotSupported reports whether the error was created with |
1271 | -// NotSupportedf() or NewNotSupported(). |
1272 | -func IsNotSupported(err error) bool { |
1273 | - _, ok := err.(*notSupported) |
1274 | - return ok |
1275 | -} |
1276 | - |
1277 | -// LoggedErrorf logs the error and return an error with the same text. |
1278 | -func LoggedErrorf(logger loggo.Logger, format string, a ...interface{}) error { |
1279 | - logger.Logf(loggo.ERROR, format, a...) |
1280 | - return fmt.Errorf(format, a...) |
1281 | -} |
1282 | |
1283 | === removed file 'errors/errors_test.go' |
1284 | --- errors/errors_test.go 2014-04-17 14:59:02 +0000 |
1285 | +++ errors/errors_test.go 1970-01-01 00:00:00 +0000 |
1286 | @@ -1,209 +0,0 @@ |
1287 | -// Copyright 2013 Canonical Ltd. |
1288 | -// Licensed under the AGPLv3, see LICENCE file for details. |
1289 | - |
1290 | -package errors_test |
1291 | - |
1292 | -import ( |
1293 | - stderrors "errors" |
1294 | - "fmt" |
1295 | - "reflect" |
1296 | - "runtime" |
1297 | - "testing" |
1298 | - |
1299 | - jc "github.com/juju/testing/checkers" |
1300 | - gc "launchpad.net/gocheck" |
1301 | - |
1302 | - "launchpad.net/juju-core/errors" |
1303 | -) |
1304 | - |
1305 | -// errorInfo holds information about a single error type: a satisfier |
1306 | -// function, wrapping and variable arguments constructors and message |
1307 | -// suffix. |
1308 | -type errorInfo struct { |
1309 | - satisfier func(error) bool |
1310 | - argsConstructor func(string, ...interface{}) error |
1311 | - wrapConstructor func(error, string) error |
1312 | - suffix string |
1313 | -} |
1314 | - |
1315 | -// allErrors holds information for all defined errors. When adding new |
1316 | -// errors, add them here as well to include them in tests. |
1317 | -var allErrors = []*errorInfo{ |
1318 | - &errorInfo{errors.IsNotFound, errors.NotFoundf, errors.NewNotFound, " not found"}, |
1319 | - &errorInfo{errors.IsUnauthorized, errors.Unauthorizedf, errors.NewUnauthorized, ""}, |
1320 | - &errorInfo{errors.IsNotImplemented, errors.NotImplementedf, errors.NewNotImplemented, " not implemented"}, |
1321 | - &errorInfo{errors.IsAlreadyExists, errors.AlreadyExistsf, errors.NewAlreadyExists, " already exists"}, |
1322 | - &errorInfo{errors.IsNotSupported, errors.NotSupportedf, errors.NewNotSupported, " not supported"}, |
1323 | -} |
1324 | - |
1325 | -type errorsSuite struct{} |
1326 | - |
1327 | -var _ = gc.Suite(&errorsSuite{}) |
1328 | - |
1329 | -func Test(t *testing.T) { |
1330 | - gc.TestingT(t) |
1331 | -} |
1332 | - |
1333 | -func (t *errorInfo) satisfierName() string { |
1334 | - value := reflect.ValueOf(t.satisfier) |
1335 | - f := runtime.FuncForPC(value.Pointer()) |
1336 | - return f.Name() |
1337 | -} |
1338 | - |
1339 | -func (t *errorInfo) equal(t0 *errorInfo) bool { |
1340 | - if t0 == nil { |
1341 | - return false |
1342 | - } |
1343 | - return t.satisfierName() == t0.satisfierName() |
1344 | -} |
1345 | - |
1346 | -type errorTest struct { |
1347 | - err error |
1348 | - message string |
1349 | - errInfo *errorInfo |
1350 | -} |
1351 | - |
1352 | -func contextf(err error, format string, args ...interface{}) error { |
1353 | - errors.Contextf(&err, format, args...) |
1354 | - return err |
1355 | -} |
1356 | - |
1357 | -func maskf(err error, format string, args ...interface{}) error { |
1358 | - errors.Maskf(&err, format, args...) |
1359 | - return err |
1360 | -} |
1361 | - |
1362 | -func mustSatisfy(c *gc.C, err error, errInfo *errorInfo) { |
1363 | - if errInfo != nil { |
1364 | - msg := fmt.Sprintf("%#v must satisfy %v", err, errInfo.satisfierName()) |
1365 | - c.Check(err, jc.Satisfies, errInfo.satisfier, gc.Commentf(msg)) |
1366 | - } |
1367 | -} |
1368 | - |
1369 | -func mustNotSatisfy(c *gc.C, err error, errInfo *errorInfo) { |
1370 | - if errInfo != nil { |
1371 | - msg := fmt.Sprintf("%#v must not satisfy %v", err, errInfo.satisfierName()) |
1372 | - c.Check(err, gc.Not(jc.Satisfies), errInfo.satisfier, gc.Commentf(msg)) |
1373 | - } |
1374 | -} |
1375 | - |
1376 | -func checkErrorMatches(c *gc.C, err error, message string, errInfo *errorInfo) { |
1377 | - if message == "<nil>" { |
1378 | - c.Check(err, gc.IsNil) |
1379 | - c.Check(errInfo, gc.IsNil) |
1380 | - } else { |
1381 | - c.Check(err, gc.ErrorMatches, message) |
1382 | - } |
1383 | -} |
1384 | - |
1385 | -func runErrorTests(c *gc.C, errorTests []errorTest, checkMustSatisfy bool) { |
1386 | - for i, t := range errorTests { |
1387 | - c.Logf("test %d: %T: %v", i, t.err, t.err) |
1388 | - checkErrorMatches(c, t.err, t.message, t.errInfo) |
1389 | - if checkMustSatisfy { |
1390 | - mustSatisfy(c, t.err, t.errInfo) |
1391 | - } |
1392 | - |
1393 | - // Check all other satisfiers to make sure none match. |
1394 | - for _, otherErrInfo := range allErrors { |
1395 | - if checkMustSatisfy && otherErrInfo.equal(t.errInfo) { |
1396 | - continue |
1397 | - } |
1398 | - mustNotSatisfy(c, t.err, otherErrInfo) |
1399 | - } |
1400 | - } |
1401 | -} |
1402 | - |
1403 | -func (*errorsSuite) TestMaskf(c *gc.C) { |
1404 | - // Ensure Maskf masks all known errors and their satisfiers don't |
1405 | - // succeed. |
1406 | - errorTests := []errorTest{} |
1407 | - for _, errInfo := range allErrors { |
1408 | - errorTests = append(errorTests, []errorTest{{ |
1409 | - maskf(nil, "masked"), |
1410 | - "<nil>", |
1411 | - nil, |
1412 | - }, { |
1413 | - maskf(stderrors.New("blast"), "masked"), |
1414 | - "masked: blast", |
1415 | - nil, |
1416 | - }, { |
1417 | - maskf(errInfo.argsConstructor("foo %d", 42), "masked %d", 69), |
1418 | - "masked 69: foo 42" + errInfo.suffix, |
1419 | - errInfo, |
1420 | - }, { |
1421 | - maskf(errInfo.argsConstructor(""), "masked"), |
1422 | - "masked: " + errInfo.suffix, |
1423 | - errInfo, |
1424 | - }, { |
1425 | - maskf(errInfo.wrapConstructor(stderrors.New("pow!"), "woo"), "masked"), |
1426 | - "masked: woo: pow!", |
1427 | - errInfo, |
1428 | - }}...) |
1429 | - } |
1430 | - |
1431 | - runErrorTests(c, errorTests, false) |
1432 | -} |
1433 | - |
1434 | -func (*errorsSuite) TestContextf(c *gc.C) { |
1435 | - // Ensure Contextf masks only unknown error types, but passes through known ones. |
1436 | - errorTests := []errorTest{} |
1437 | - for _, errInfo := range allErrors { |
1438 | - errorTests = append(errorTests, []errorTest{{ |
1439 | - contextf(nil, "prefix"), |
1440 | - "<nil>", |
1441 | - nil, |
1442 | - }, { |
1443 | - contextf(stderrors.New("blast"), "prefix"), |
1444 | - "prefix: blast", |
1445 | - nil, |
1446 | - }, { |
1447 | - contextf(errInfo.argsConstructor("foo %d", 42), "prefix %d", 69), |
1448 | - "prefix 69: foo 42" + errInfo.suffix, |
1449 | - errInfo, |
1450 | - }, { |
1451 | - contextf(errInfo.argsConstructor(""), "prefix"), |
1452 | - "prefix: " + errInfo.suffix, |
1453 | - errInfo, |
1454 | - }, { |
1455 | - contextf(errInfo.wrapConstructor(stderrors.New("pow!"), "woo"), "prefix"), |
1456 | - "prefix: woo: pow!", |
1457 | - errInfo, |
1458 | - }}...) |
1459 | - } |
1460 | - |
1461 | - runErrorTests(c, errorTests, true) |
1462 | -} |
1463 | - |
1464 | -func (*errorsSuite) TestAllErrors(c *gc.C) { |
1465 | - errorTests := []errorTest{} |
1466 | - for _, errInfo := range allErrors { |
1467 | - errorTests = append(errorTests, []errorTest{{ |
1468 | - nil, |
1469 | - "<nil>", |
1470 | - nil, |
1471 | - }, { |
1472 | - errInfo.argsConstructor("foo %d", 42), |
1473 | - "foo 42" + errInfo.suffix, |
1474 | - errInfo, |
1475 | - }, { |
1476 | - errInfo.argsConstructor(""), |
1477 | - errInfo.suffix, |
1478 | - errInfo, |
1479 | - }, { |
1480 | - errInfo.wrapConstructor(stderrors.New("pow!"), "prefix"), |
1481 | - "prefix: pow!", |
1482 | - errInfo, |
1483 | - }, { |
1484 | - errInfo.wrapConstructor(stderrors.New("pow!"), ""), |
1485 | - "pow!", |
1486 | - errInfo, |
1487 | - }, { |
1488 | - errInfo.wrapConstructor(nil, "prefix"), |
1489 | - "prefix", |
1490 | - errInfo, |
1491 | - }}...) |
1492 | - } |
1493 | - |
1494 | - runErrorTests(c, errorTests, true) |
1495 | -} |
1496 | |
1497 | === modified file 'juju/api.go' |
1498 | --- juju/api.go 2014-04-25 14:10:09 +0000 |
1499 | +++ juju/api.go 2014-05-15 02:28:23 +0000 |
1500 | @@ -8,10 +8,11 @@ |
1501 | "io" |
1502 | "time" |
1503 | |
1504 | + "github.com/juju/errors" |
1505 | + |
1506 | "launchpad.net/juju-core/environs" |
1507 | "launchpad.net/juju-core/environs/config" |
1508 | "launchpad.net/juju-core/environs/configstore" |
1509 | - "launchpad.net/juju-core/errors" |
1510 | "launchpad.net/juju-core/instance" |
1511 | "launchpad.net/juju-core/names" |
1512 | "launchpad.net/juju-core/state/api" |
1513 | |
1514 | === modified file 'juju/apiconn_test.go' |
1515 | --- juju/apiconn_test.go 2014-04-25 13:57:06 +0000 |
1516 | +++ juju/apiconn_test.go 2014-05-15 02:28:23 +0000 |
1517 | @@ -8,6 +8,7 @@ |
1518 | "os" |
1519 | "time" |
1520 | |
1521 | + "github.com/juju/errors" |
1522 | jc "github.com/juju/testing/checkers" |
1523 | gc "launchpad.net/gocheck" |
1524 | |
1525 | @@ -16,7 +17,6 @@ |
1526 | "launchpad.net/juju-core/environs/config" |
1527 | "launchpad.net/juju-core/environs/configstore" |
1528 | envtesting "launchpad.net/juju-core/environs/testing" |
1529 | - "launchpad.net/juju-core/errors" |
1530 | "launchpad.net/juju-core/instance" |
1531 | "launchpad.net/juju-core/juju" |
1532 | "launchpad.net/juju-core/juju/osenv" |
1533 | |
1534 | === modified file 'juju/conn.go' |
1535 | --- juju/conn.go 2014-04-17 12:53:23 +0000 |
1536 | +++ juju/conn.go 2014-05-15 02:28:23 +0000 |
1537 | @@ -11,12 +11,12 @@ |
1538 | "os" |
1539 | "time" |
1540 | |
1541 | + "github.com/juju/errors" |
1542 | "github.com/juju/loggo" |
1543 | |
1544 | "launchpad.net/juju-core/charm" |
1545 | "launchpad.net/juju-core/environs" |
1546 | "launchpad.net/juju-core/environs/configstore" |
1547 | - "launchpad.net/juju-core/errors" |
1548 | "launchpad.net/juju-core/juju/osenv" |
1549 | "launchpad.net/juju-core/state" |
1550 | "launchpad.net/juju-core/utils" |
1551 | |
1552 | === modified file 'juju/conn_test.go' |
1553 | --- juju/conn_test.go 2014-04-24 02:27:38 +0000 |
1554 | +++ juju/conn_test.go 2014-05-15 02:28:23 +0000 |
1555 | @@ -12,6 +12,7 @@ |
1556 | "strings" |
1557 | stdtesting "testing" |
1558 | |
1559 | + "github.com/juju/errors" |
1560 | jc "github.com/juju/testing/checkers" |
1561 | gc "launchpad.net/gocheck" |
1562 | |
1563 | @@ -22,7 +23,6 @@ |
1564 | "launchpad.net/juju-core/environs/config" |
1565 | "launchpad.net/juju-core/environs/configstore" |
1566 | envtesting "launchpad.net/juju-core/environs/testing" |
1567 | - "launchpad.net/juju-core/errors" |
1568 | "launchpad.net/juju-core/instance" |
1569 | "launchpad.net/juju-core/juju" |
1570 | "launchpad.net/juju-core/juju/osenv" |
1571 | |
1572 | === modified file 'provider/azure/certfile.go' |
1573 | --- provider/azure/certfile.go 2014-04-17 12:47:50 +0000 |
1574 | +++ provider/azure/certfile.go 2014-05-15 02:28:23 +0000 |
1575 | @@ -7,7 +7,7 @@ |
1576 | "os" |
1577 | "path" |
1578 | |
1579 | - "launchpad.net/juju-core/errors" |
1580 | + "github.com/juju/errors" |
1581 | ) |
1582 | |
1583 | // tempCertFile is a temporary file containing an x509 certificate. |
1584 | |
1585 | === modified file 'provider/azure/environ.go' |
1586 | --- provider/azure/environ.go 2014-05-14 02:59:53 +0000 |
1587 | +++ provider/azure/environ.go 2014-05-15 02:28:23 +0000 |
1588 | @@ -12,6 +12,7 @@ |
1589 | "sync" |
1590 | "time" |
1591 | |
1592 | + "github.com/juju/errors" |
1593 | "launchpad.net/gwacl" |
1594 | |
1595 | "launchpad.net/juju-core/constraints" |
1596 | @@ -23,7 +24,6 @@ |
1597 | "launchpad.net/juju-core/environs/simplestreams" |
1598 | "launchpad.net/juju-core/environs/storage" |
1599 | envtools "launchpad.net/juju-core/environs/tools" |
1600 | - "launchpad.net/juju-core/errors" |
1601 | "launchpad.net/juju-core/instance" |
1602 | "launchpad.net/juju-core/provider/common" |
1603 | "launchpad.net/juju-core/state" |
1604 | |
1605 | === modified file 'provider/azure/instance.go' |
1606 | --- provider/azure/instance.go 2014-04-09 06:35:07 +0000 |
1607 | +++ provider/azure/instance.go 2014-05-15 02:28:23 +0000 |
1608 | @@ -8,9 +8,9 @@ |
1609 | "strings" |
1610 | "sync" |
1611 | |
1612 | + "github.com/juju/errors" |
1613 | "launchpad.net/gwacl" |
1614 | |
1615 | - "launchpad.net/juju-core/errors" |
1616 | "launchpad.net/juju-core/instance" |
1617 | "launchpad.net/juju-core/provider/common" |
1618 | "launchpad.net/juju-core/worker/firewaller" |
1619 | |
1620 | === modified file 'provider/azure/instancetype.go' |
1621 | --- provider/azure/instancetype.go 2014-04-14 12:36:13 +0000 |
1622 | +++ provider/azure/instancetype.go 2014-05-15 02:28:23 +0000 |
1623 | @@ -7,13 +7,13 @@ |
1624 | "fmt" |
1625 | "sort" |
1626 | |
1627 | + "github.com/juju/errors" |
1628 | "launchpad.net/gwacl" |
1629 | |
1630 | "launchpad.net/juju-core/constraints" |
1631 | "launchpad.net/juju-core/environs/imagemetadata" |
1632 | "launchpad.net/juju-core/environs/instances" |
1633 | "launchpad.net/juju-core/environs/simplestreams" |
1634 | - "launchpad.net/juju-core/errors" |
1635 | ) |
1636 | |
1637 | // preferredTypes is a list of machine types, in order of preference so that |
1638 | |
1639 | === modified file 'provider/azure/storage.go' |
1640 | --- provider/azure/storage.go 2014-04-30 01:16:45 +0000 |
1641 | +++ provider/azure/storage.go 2014-05-15 02:28:23 +0000 |
1642 | @@ -9,10 +9,10 @@ |
1643 | "sync" |
1644 | "time" |
1645 | |
1646 | + "github.com/juju/errors" |
1647 | "launchpad.net/gwacl" |
1648 | |
1649 | "launchpad.net/juju-core/environs/storage" |
1650 | - "launchpad.net/juju-core/errors" |
1651 | "launchpad.net/juju-core/utils" |
1652 | ) |
1653 | |
1654 | |
1655 | === modified file 'provider/azure/storage_test.go' |
1656 | --- provider/azure/storage_test.go 2014-04-14 12:36:13 +0000 |
1657 | +++ provider/azure/storage_test.go 2014-05-15 02:28:23 +0000 |
1658 | @@ -11,12 +11,12 @@ |
1659 | "net/url" |
1660 | "strings" |
1661 | |
1662 | + "github.com/juju/errors" |
1663 | jc "github.com/juju/testing/checkers" |
1664 | gc "launchpad.net/gocheck" |
1665 | "launchpad.net/gwacl" |
1666 | |
1667 | "launchpad.net/juju-core/environs/storage" |
1668 | - "launchpad.net/juju-core/errors" |
1669 | ) |
1670 | |
1671 | type storageSuite struct { |
1672 | |
1673 | === modified file 'provider/common/destroy_test.go' |
1674 | --- provider/common/destroy_test.go 2014-05-13 11:37:40 +0000 |
1675 | +++ provider/common/destroy_test.go 2014-05-15 02:28:23 +0000 |
1676 | @@ -7,11 +7,11 @@ |
1677 | "fmt" |
1678 | "strings" |
1679 | |
1680 | + "github.com/juju/errors" |
1681 | jc "github.com/juju/testing/checkers" |
1682 | gc "launchpad.net/gocheck" |
1683 | |
1684 | "launchpad.net/juju-core/environs" |
1685 | - "launchpad.net/juju-core/errors" |
1686 | "launchpad.net/juju-core/instance" |
1687 | "launchpad.net/juju-core/provider/common" |
1688 | "launchpad.net/juju-core/testing/testbase" |
1689 | |
1690 | === modified file 'provider/dummy/storage.go' |
1691 | --- provider/dummy/storage.go 2014-01-31 00:14:11 +0000 |
1692 | +++ provider/dummy/storage.go 2014-05-15 02:28:23 +0000 |
1693 | @@ -13,8 +13,9 @@ |
1694 | "strings" |
1695 | "time" |
1696 | |
1697 | + "github.com/juju/errors" |
1698 | + |
1699 | "launchpad.net/juju-core/environs/storage" |
1700 | - "launchpad.net/juju-core/errors" |
1701 | "launchpad.net/juju-core/utils" |
1702 | ) |
1703 | |
1704 | |
1705 | === modified file 'provider/ec2/ec2.go' |
1706 | --- provider/ec2/ec2.go 2014-05-14 02:59:53 +0000 |
1707 | +++ provider/ec2/ec2.go 2014-05-15 02:28:23 +0000 |
1708 | @@ -8,6 +8,7 @@ |
1709 | "sync" |
1710 | "time" |
1711 | |
1712 | + "github.com/juju/errors" |
1713 | "github.com/juju/loggo" |
1714 | "launchpad.net/goamz/aws" |
1715 | "launchpad.net/goamz/ec2" |
1716 | @@ -22,7 +23,6 @@ |
1717 | "launchpad.net/juju-core/environs/simplestreams" |
1718 | "launchpad.net/juju-core/environs/storage" |
1719 | envtools "launchpad.net/juju-core/environs/tools" |
1720 | - "launchpad.net/juju-core/errors" |
1721 | "launchpad.net/juju-core/instance" |
1722 | "launchpad.net/juju-core/juju/arch" |
1723 | "launchpad.net/juju-core/provider/common" |
1724 | |
1725 | === modified file 'provider/ec2/storage.go' |
1726 | --- provider/ec2/storage.go 2014-04-30 23:18:40 +0000 |
1727 | +++ provider/ec2/storage.go 2014-05-15 02:28:23 +0000 |
1728 | @@ -10,10 +10,10 @@ |
1729 | "sync" |
1730 | "time" |
1731 | |
1732 | + "github.com/juju/errors" |
1733 | "launchpad.net/goamz/s3" |
1734 | |
1735 | "launchpad.net/juju-core/environs/storage" |
1736 | - "launchpad.net/juju-core/errors" |
1737 | "launchpad.net/juju-core/utils" |
1738 | ) |
1739 | |
1740 | |
1741 | === modified file 'provider/joyent/environ_instance.go' |
1742 | --- provider/joyent/environ_instance.go 2014-05-14 02:59:53 +0000 |
1743 | +++ provider/joyent/environ_instance.go 2014-05-15 02:28:23 +0000 |
1744 | @@ -11,6 +11,7 @@ |
1745 | |
1746 | "github.com/joyent/gocommon/client" |
1747 | "github.com/joyent/gosdc/cloudapi" |
1748 | + "github.com/juju/errors" |
1749 | |
1750 | "launchpad.net/juju-core/constraints" |
1751 | "launchpad.net/juju-core/environs" |
1752 | @@ -18,7 +19,6 @@ |
1753 | "launchpad.net/juju-core/environs/instances" |
1754 | "launchpad.net/juju-core/environs/network" |
1755 | "launchpad.net/juju-core/environs/simplestreams" |
1756 | - "launchpad.net/juju-core/errors" |
1757 | "launchpad.net/juju-core/instance" |
1758 | "launchpad.net/juju-core/juju/arch" |
1759 | "launchpad.net/juju-core/names" |
1760 | |
1761 | === modified file 'provider/joyent/storage.go' |
1762 | --- provider/joyent/storage.go 2014-04-30 23:18:40 +0000 |
1763 | +++ provider/joyent/storage.go 2014-05-15 02:28:23 +0000 |
1764 | @@ -13,8 +13,8 @@ |
1765 | "sync" |
1766 | "time" |
1767 | |
1768 | + "github.com/juju/errors" |
1769 | "launchpad.net/juju-core/environs/storage" |
1770 | - coreerrors "launchpad.net/juju-core/errors" |
1771 | "launchpad.net/juju-core/utils" |
1772 | |
1773 | "github.com/joyent/gocommon/client" |
1774 | @@ -94,7 +94,7 @@ |
1775 | s.madeContainer = false |
1776 | } |
1777 | if je.IsResourceNotFound(err) { |
1778 | - return coreerrors.NewNotFound(err, fmt.Sprintf("cannot delete %s, not found", containerName)) |
1779 | + return errors.NewNotFound(err, fmt.Sprintf("cannot delete %s, not found", containerName)) |
1780 | } |
1781 | return err |
1782 | } |
1783 | @@ -155,7 +155,7 @@ |
1784 | func (s *JoyentStorage) Get(name string) (io.ReadCloser, error) { |
1785 | b, err := s.manta.GetObject(s.containerName, name) |
1786 | if err != nil { |
1787 | - return nil, coreerrors.NewNotFound(err, fmt.Sprintf("cannot find %s", name)) |
1788 | + return nil, errors.NewNotFound(err, fmt.Sprintf("cannot find %s", name)) |
1789 | } |
1790 | r := byteCloser{bytes.NewReader(b)} |
1791 | return r, nil |
1792 | |
1793 | === modified file 'provider/joyent/storage_test.go' |
1794 | --- provider/joyent/storage_test.go 2014-04-14 12:36:13 +0000 |
1795 | +++ provider/joyent/storage_test.go 2014-05-15 02:28:23 +0000 |
1796 | @@ -12,10 +12,10 @@ |
1797 | "strings" |
1798 | |
1799 | "github.com/joyent/gocommon/errors" |
1800 | + jujuerrors "github.com/juju/errors" |
1801 | jc "github.com/juju/testing/checkers" |
1802 | gc "launchpad.net/gocheck" |
1803 | |
1804 | - coreerrors "launchpad.net/juju-core/errors" |
1805 | "launchpad.net/juju-core/provider/joyent" |
1806 | jp "launchpad.net/juju-core/provider/joyent" |
1807 | ) |
1808 | @@ -117,7 +117,7 @@ |
1809 | |
1810 | _, err := mantaStorage.Get("noFile") |
1811 | c.Assert(err, gc.NotNil) |
1812 | - c.Assert(err, jc.Satisfies, coreerrors.IsNotFound) |
1813 | + c.Assert(err, jc.Satisfies, jujuerrors.IsNotFound) |
1814 | } |
1815 | |
1816 | func (s *storageSuite) TestPut(c *gc.C) { |
1817 | @@ -195,5 +195,5 @@ |
1818 | |
1819 | err := mantaStorage.DeleteContainer("noContainer") |
1820 | c.Assert(err, gc.NotNil) |
1821 | - c.Assert(err, jc.Satisfies, coreerrors.IsNotFound) |
1822 | + c.Assert(err, jc.Satisfies, jujuerrors.IsNotFound) |
1823 | } |
1824 | |
1825 | === modified file 'provider/local/environ.go' |
1826 | --- provider/local/environ.go 2014-05-14 02:59:53 +0000 |
1827 | +++ provider/local/environ.go 2014-05-15 02:28:23 +0000 |
1828 | @@ -15,7 +15,7 @@ |
1829 | "sync" |
1830 | "syscall" |
1831 | |
1832 | - "github.com/errgo/errgo" |
1833 | + "github.com/juju/errors" |
1834 | |
1835 | "launchpad.net/juju-core/agent" |
1836 | "launchpad.net/juju-core/agent/mongo" |
1837 | @@ -34,7 +34,6 @@ |
1838 | "launchpad.net/juju-core/environs/simplestreams" |
1839 | "launchpad.net/juju-core/environs/storage" |
1840 | envtools "launchpad.net/juju-core/environs/tools" |
1841 | - "launchpad.net/juju-core/errors" |
1842 | "launchpad.net/juju-core/instance" |
1843 | "launchpad.net/juju-core/juju/arch" |
1844 | "launchpad.net/juju-core/juju/osenv" |
1845 | @@ -476,7 +475,7 @@ |
1846 | // Exit status 1 means no processes were matched: |
1847 | // we don't consider this an error here. |
1848 | if err.ProcessState.Sys().(syscall.WaitStatus).ExitStatus() != 1 { |
1849 | - return errgo.Annotate(err, "failed to kill jujud") |
1850 | + return errors.Annotate(err, "failed to kill jujud") |
1851 | } |
1852 | } |
1853 | } |
1854 | |
1855 | === modified file 'provider/local/instance.go' |
1856 | --- provider/local/instance.go 2014-04-14 12:36:13 +0000 |
1857 | +++ provider/local/instance.go 2014-05-15 02:28:23 +0000 |
1858 | @@ -6,7 +6,8 @@ |
1859 | import ( |
1860 | "fmt" |
1861 | |
1862 | - "launchpad.net/juju-core/errors" |
1863 | + "github.com/juju/errors" |
1864 | + |
1865 | "launchpad.net/juju-core/instance" |
1866 | "launchpad.net/juju-core/provider/common" |
1867 | ) |
1868 | |
1869 | === modified file 'provider/maas/environ.go' |
1870 | --- provider/maas/environ.go 2014-05-14 02:59:53 +0000 |
1871 | +++ provider/maas/environ.go 2014-05-15 02:28:23 +0000 |
1872 | @@ -13,6 +13,7 @@ |
1873 | "sync" |
1874 | "time" |
1875 | |
1876 | + "github.com/juju/errors" |
1877 | "labix.org/v2/mgo/bson" |
1878 | "launchpad.net/gomaasapi" |
1879 | |
1880 | @@ -26,7 +27,6 @@ |
1881 | "launchpad.net/juju-core/environs/simplestreams" |
1882 | "launchpad.net/juju-core/environs/storage" |
1883 | envtools "launchpad.net/juju-core/environs/tools" |
1884 | - "launchpad.net/juju-core/errors" |
1885 | "launchpad.net/juju-core/instance" |
1886 | "launchpad.net/juju-core/provider/common" |
1887 | "launchpad.net/juju-core/state" |
1888 | |
1889 | === modified file 'provider/maas/environ_whitebox_test.go' |
1890 | --- provider/maas/environ_whitebox_test.go 2014-05-14 02:59:53 +0000 |
1891 | +++ provider/maas/environ_whitebox_test.go 2014-05-15 02:28:23 +0000 |
1892 | @@ -12,6 +12,7 @@ |
1893 | "strings" |
1894 | "text/template" |
1895 | |
1896 | + "github.com/juju/errors" |
1897 | jc "github.com/juju/testing/checkers" |
1898 | gc "launchpad.net/gocheck" |
1899 | "launchpad.net/gomaasapi" |
1900 | @@ -27,7 +28,6 @@ |
1901 | "launchpad.net/juju-core/environs/storage" |
1902 | envtesting "launchpad.net/juju-core/environs/testing" |
1903 | envtools "launchpad.net/juju-core/environs/tools" |
1904 | - "launchpad.net/juju-core/errors" |
1905 | "launchpad.net/juju-core/instance" |
1906 | "launchpad.net/juju-core/juju/testing" |
1907 | coretesting "launchpad.net/juju-core/testing" |
1908 | |
1909 | === modified file 'provider/maas/storage.go' |
1910 | --- provider/maas/storage.go 2014-04-30 23:18:40 +0000 |
1911 | +++ provider/maas/storage.go 2014-05-15 02:28:23 +0000 |
1912 | @@ -14,10 +14,10 @@ |
1913 | "strings" |
1914 | "sync" |
1915 | |
1916 | + "github.com/juju/errors" |
1917 | "launchpad.net/gomaasapi" |
1918 | |
1919 | "launchpad.net/juju-core/environs/storage" |
1920 | - "launchpad.net/juju-core/errors" |
1921 | "launchpad.net/juju-core/utils" |
1922 | ) |
1923 | |
1924 | |
1925 | === modified file 'provider/maas/storage_test.go' |
1926 | --- provider/maas/storage_test.go 2014-04-14 12:36:13 +0000 |
1927 | +++ provider/maas/storage_test.go 2014-05-15 02:28:23 +0000 |
1928 | @@ -12,12 +12,12 @@ |
1929 | "net/url" |
1930 | "sync" |
1931 | |
1932 | + "github.com/juju/errors" |
1933 | jc "github.com/juju/testing/checkers" |
1934 | gc "launchpad.net/gocheck" |
1935 | "launchpad.net/gomaasapi" |
1936 | |
1937 | "launchpad.net/juju-core/environs/storage" |
1938 | - "launchpad.net/juju-core/errors" |
1939 | ) |
1940 | |
1941 | type storageSuite struct { |
1942 | |
1943 | === modified file 'provider/manual/environ.go' |
1944 | --- provider/manual/environ.go 2014-05-14 02:59:53 +0000 |
1945 | +++ provider/manual/environ.go 2014-05-15 02:28:23 +0000 |
1946 | @@ -5,13 +5,13 @@ |
1947 | |
1948 | import ( |
1949 | "bytes" |
1950 | - "errors" |
1951 | "fmt" |
1952 | "net" |
1953 | "path" |
1954 | "strings" |
1955 | "sync" |
1956 | |
1957 | + "github.com/juju/errors" |
1958 | "github.com/juju/loggo" |
1959 | |
1960 | "launchpad.net/juju-core/agent" |
1961 | @@ -26,7 +26,6 @@ |
1962 | "launchpad.net/juju-core/environs/sshstorage" |
1963 | "launchpad.net/juju-core/environs/storage" |
1964 | envtools "launchpad.net/juju-core/environs/tools" |
1965 | - coreerrors "launchpad.net/juju-core/errors" |
1966 | "launchpad.net/juju-core/instance" |
1967 | "launchpad.net/juju-core/juju/arch" |
1968 | "launchpad.net/juju-core/provider/common" |
1969 | @@ -205,7 +204,7 @@ |
1970 | // given instance on the given network. This is not supported on the |
1971 | // manual provider. |
1972 | func (*manualEnviron) AllocateAddress(_ instance.Id, _ network.Id) (instance.Address, error) { |
1973 | - return instance.Address{}, coreerrors.NotSupportedf("AllocateAddress") |
1974 | + return instance.Address{}, errors.NotSupportedf("AllocateAddress") |
1975 | } |
1976 | |
1977 | var newSSHStorage = func(sshHost, storageDir, storageTmpdir string) (storage.Storage, error) { |
1978 | |
1979 | === modified file 'provider/openstack/provider.go' |
1980 | --- provider/openstack/provider.go 2014-05-14 02:59:53 +0000 |
1981 | +++ provider/openstack/provider.go 2014-05-15 02:28:23 +0000 |
1982 | @@ -14,6 +14,7 @@ |
1983 | "sync" |
1984 | "time" |
1985 | |
1986 | + jujuerrors "github.com/juju/errors" |
1987 | "github.com/juju/loggo" |
1988 | "launchpad.net/goose/client" |
1989 | gooseerrors "launchpad.net/goose/errors" |
1990 | @@ -30,7 +31,6 @@ |
1991 | "launchpad.net/juju-core/environs/simplestreams" |
1992 | "launchpad.net/juju-core/environs/storage" |
1993 | envtools "launchpad.net/juju-core/environs/tools" |
1994 | - coreerrors "launchpad.net/juju-core/errors" |
1995 | "launchpad.net/juju-core/instance" |
1996 | "launchpad.net/juju-core/juju/arch" |
1997 | "launchpad.net/juju-core/names" |
1998 | @@ -1005,7 +1005,7 @@ |
1999 | // given instance on the given network. This is not implemented on the |
2000 | // OpenStack provider yet. |
2001 | func (*environ) AllocateAddress(_ instance.Id, _ network.Id) (instance.Address, error) { |
2002 | - return instance.Address{}, coreerrors.NotImplementedf("AllocateAddress") |
2003 | + return instance.Address{}, jujuerrors.NotImplementedf("AllocateAddress") |
2004 | } |
2005 | |
2006 | func (e *environ) AllInstances() (insts []instance.Instance, err error) { |
2007 | |
2008 | === modified file 'provider/openstack/storage.go' |
2009 | --- provider/openstack/storage.go 2014-04-30 23:18:40 +0000 |
2010 | +++ provider/openstack/storage.go 2014-05-15 02:28:23 +0000 |
2011 | @@ -9,11 +9,11 @@ |
2012 | "sync" |
2013 | "time" |
2014 | |
2015 | + jujuerrors "github.com/juju/errors" |
2016 | gooseerrors "launchpad.net/goose/errors" |
2017 | "launchpad.net/goose/swift" |
2018 | |
2019 | "launchpad.net/juju-core/environs/storage" |
2020 | - coreerrors "launchpad.net/juju-core/errors" |
2021 | "launchpad.net/juju-core/utils" |
2022 | ) |
2023 | |
2024 | @@ -178,7 +178,7 @@ |
2025 | // container not being found. |
2026 | func maybeNotFound(err error) (error, bool) { |
2027 | if err != nil && gooseerrors.IsNotFound(err) { |
2028 | - return coreerrors.NewNotFound(err, ""), true |
2029 | + return jujuerrors.NewNotFound(err, ""), true |
2030 | } |
2031 | return err, false |
2032 | } |
2033 | |
2034 | === modified file 'state/addmachine.go' |
2035 | --- state/addmachine.go 2014-04-30 23:18:40 +0000 |
2036 | +++ state/addmachine.go 2014-05-15 02:28:23 +0000 |
2037 | @@ -7,11 +7,11 @@ |
2038 | "fmt" |
2039 | "strconv" |
2040 | |
2041 | + "github.com/juju/errors" |
2042 | "labix.org/v2/mgo/bson" |
2043 | "labix.org/v2/mgo/txn" |
2044 | |
2045 | "launchpad.net/juju-core/constraints" |
2046 | - "launchpad.net/juju-core/errors" |
2047 | "launchpad.net/juju-core/instance" |
2048 | "launchpad.net/juju-core/replicaset" |
2049 | "launchpad.net/juju-core/state/api/params" |
2050 | |
2051 | === modified file 'state/annotator.go' |
2052 | --- state/annotator.go 2014-04-17 12:47:50 +0000 |
2053 | +++ state/annotator.go 2014-05-15 02:28:23 +0000 |
2054 | @@ -7,11 +7,10 @@ |
2055 | "fmt" |
2056 | "strings" |
2057 | |
2058 | + "github.com/juju/errors" |
2059 | "labix.org/v2/mgo" |
2060 | "labix.org/v2/mgo/bson" |
2061 | "labix.org/v2/mgo/txn" |
2062 | - |
2063 | - "launchpad.net/juju-core/errors" |
2064 | ) |
2065 | |
2066 | // annotatorDoc represents the internal state of annotations for an Entity in |
2067 | |
2068 | === modified file 'state/api/agent/machine_test.go' |
2069 | --- state/api/agent/machine_test.go 2014-04-14 12:36:13 +0000 |
2070 | +++ state/api/agent/machine_test.go 2014-05-15 02:28:23 +0000 |
2071 | @@ -7,13 +7,13 @@ |
2072 | "fmt" |
2073 | stdtesting "testing" |
2074 | |
2075 | + "github.com/juju/errors" |
2076 | jc "github.com/juju/testing/checkers" |
2077 | "labix.org/v2/mgo" |
2078 | gc "launchpad.net/gocheck" |
2079 | |
2080 | "launchpad.net/juju-core/agent/mongo" |
2081 | "launchpad.net/juju-core/environs" |
2082 | - "launchpad.net/juju-core/errors" |
2083 | "launchpad.net/juju-core/juju/testing" |
2084 | "launchpad.net/juju-core/state" |
2085 | "launchpad.net/juju-core/state/api" |
2086 | |
2087 | === modified file 'state/api/client.go' |
2088 | --- state/api/client.go 2014-05-01 16:57:34 +0000 |
2089 | +++ state/api/client.go 2014-05-15 02:28:23 +0000 |
2090 | @@ -16,12 +16,12 @@ |
2091 | "time" |
2092 | |
2093 | "code.google.com/p/go.net/websocket" |
2094 | + "github.com/juju/errors" |
2095 | "github.com/juju/loggo" |
2096 | |
2097 | "launchpad.net/juju-core/charm" |
2098 | "launchpad.net/juju-core/constraints" |
2099 | "launchpad.net/juju-core/environs/network" |
2100 | - "launchpad.net/juju-core/errors" |
2101 | "launchpad.net/juju-core/instance" |
2102 | "launchpad.net/juju-core/state/api/params" |
2103 | "launchpad.net/juju-core/tools" |
2104 | |
2105 | === modified file 'state/api/machiner/machiner_test.go' |
2106 | --- state/api/machiner/machiner_test.go 2014-04-14 12:36:13 +0000 |
2107 | +++ state/api/machiner/machiner_test.go 2014-05-15 02:28:23 +0000 |
2108 | @@ -6,10 +6,10 @@ |
2109 | import ( |
2110 | stdtesting "testing" |
2111 | |
2112 | + "github.com/juju/errors" |
2113 | jc "github.com/juju/testing/checkers" |
2114 | gc "launchpad.net/gocheck" |
2115 | |
2116 | - "launchpad.net/juju-core/errors" |
2117 | "launchpad.net/juju-core/instance" |
2118 | "launchpad.net/juju-core/juju/testing" |
2119 | "launchpad.net/juju-core/state" |
2120 | |
2121 | === modified file 'state/api/provisioner/provisioner_test.go' |
2122 | --- state/api/provisioner/provisioner_test.go 2014-05-09 13:24:50 +0000 |
2123 | +++ state/api/provisioner/provisioner_test.go 2014-05-15 02:28:23 +0000 |
2124 | @@ -6,12 +6,12 @@ |
2125 | import ( |
2126 | stdtesting "testing" |
2127 | |
2128 | + "github.com/juju/errors" |
2129 | jc "github.com/juju/testing/checkers" |
2130 | gc "launchpad.net/gocheck" |
2131 | |
2132 | "launchpad.net/juju-core/constraints" |
2133 | "launchpad.net/juju-core/container" |
2134 | - "launchpad.net/juju-core/errors" |
2135 | "launchpad.net/juju-core/instance" |
2136 | "launchpad.net/juju-core/juju/testing" |
2137 | "launchpad.net/juju-core/names" |
2138 | |
2139 | === modified file 'state/api/uniter/unit_test.go' |
2140 | --- state/api/uniter/unit_test.go 2014-04-14 12:36:13 +0000 |
2141 | +++ state/api/uniter/unit_test.go 2014-05-15 02:28:23 +0000 |
2142 | @@ -6,11 +6,11 @@ |
2143 | import ( |
2144 | "sort" |
2145 | |
2146 | + "github.com/juju/errors" |
2147 | jc "github.com/juju/testing/checkers" |
2148 | gc "launchpad.net/gocheck" |
2149 | |
2150 | "launchpad.net/juju-core/charm" |
2151 | - "launchpad.net/juju-core/errors" |
2152 | "launchpad.net/juju-core/instance" |
2153 | "launchpad.net/juju-core/state" |
2154 | "launchpad.net/juju-core/state/api/params" |
2155 | |
2156 | === modified file 'state/api/upgrader/unitupgrader_test.go' |
2157 | --- state/api/upgrader/unitupgrader_test.go 2014-04-14 12:36:13 +0000 |
2158 | +++ state/api/upgrader/unitupgrader_test.go 2014-05-15 02:28:23 +0000 |
2159 | @@ -4,10 +4,10 @@ |
2160 | package upgrader_test |
2161 | |
2162 | import ( |
2163 | + "github.com/juju/errors" |
2164 | jc "github.com/juju/testing/checkers" |
2165 | gc "launchpad.net/gocheck" |
2166 | |
2167 | - "launchpad.net/juju-core/errors" |
2168 | jujutesting "launchpad.net/juju-core/juju/testing" |
2169 | "launchpad.net/juju-core/state" |
2170 | "launchpad.net/juju-core/state/api" |
2171 | |
2172 | === modified file 'state/api/upgrader/upgrader_test.go' |
2173 | --- state/api/upgrader/upgrader_test.go 2014-04-14 12:36:13 +0000 |
2174 | +++ state/api/upgrader/upgrader_test.go 2014-05-15 02:28:23 +0000 |
2175 | @@ -6,11 +6,11 @@ |
2176 | import ( |
2177 | stdtesting "testing" |
2178 | |
2179 | + "github.com/juju/errors" |
2180 | jc "github.com/juju/testing/checkers" |
2181 | gc "launchpad.net/gocheck" |
2182 | |
2183 | envtesting "launchpad.net/juju-core/environs/testing" |
2184 | - "launchpad.net/juju-core/errors" |
2185 | "launchpad.net/juju-core/juju/testing" |
2186 | "launchpad.net/juju-core/state" |
2187 | "launchpad.net/juju-core/state/api" |
2188 | |
2189 | === modified file 'state/apiserver/admin.go' |
2190 | --- state/apiserver/admin.go 2014-04-30 21:51:15 +0000 |
2191 | +++ state/apiserver/admin.go 2014-05-15 02:28:23 +0000 |
2192 | @@ -7,7 +7,8 @@ |
2193 | stderrors "errors" |
2194 | "sync" |
2195 | |
2196 | - "launchpad.net/juju-core/errors" |
2197 | + "github.com/juju/errors" |
2198 | + |
2199 | "launchpad.net/juju-core/names" |
2200 | "launchpad.net/juju-core/rpc" |
2201 | "launchpad.net/juju-core/state" |
2202 | |
2203 | === modified file 'state/apiserver/charmrevisionupdater/updater.go' |
2204 | --- state/apiserver/charmrevisionupdater/updater.go 2014-04-30 23:18:40 +0000 |
2205 | +++ state/apiserver/charmrevisionupdater/updater.go 2014-05-15 02:28:23 +0000 |
2206 | @@ -4,10 +4,10 @@ |
2207 | package charmrevisionupdater |
2208 | |
2209 | import ( |
2210 | + "github.com/juju/errors" |
2211 | "github.com/juju/loggo" |
2212 | |
2213 | "launchpad.net/juju-core/charm" |
2214 | - "launchpad.net/juju-core/errors" |
2215 | "launchpad.net/juju-core/state" |
2216 | "launchpad.net/juju-core/state/api/params" |
2217 | "launchpad.net/juju-core/state/apiserver/common" |
2218 | |
2219 | === modified file 'state/apiserver/charmrevisionupdater/updater_test.go' |
2220 | --- state/apiserver/charmrevisionupdater/updater_test.go 2014-04-17 12:53:23 +0000 |
2221 | +++ state/apiserver/charmrevisionupdater/updater_test.go 2014-05-15 02:28:23 +0000 |
2222 | @@ -4,11 +4,11 @@ |
2223 | package charmrevisionupdater_test |
2224 | |
2225 | import ( |
2226 | + "github.com/juju/errors" |
2227 | jc "github.com/juju/testing/checkers" |
2228 | gc "launchpad.net/gocheck" |
2229 | |
2230 | "launchpad.net/juju-core/charm" |
2231 | - "launchpad.net/juju-core/errors" |
2232 | jujutesting "launchpad.net/juju-core/juju/testing" |
2233 | "launchpad.net/juju-core/state" |
2234 | "launchpad.net/juju-core/state/apiserver/charmrevisionupdater" |
2235 | |
2236 | === modified file 'state/apiserver/charms.go' |
2237 | --- state/apiserver/charms.go 2014-04-07 05:11:48 +0000 |
2238 | +++ state/apiserver/charms.go 2014-05-15 02:28:23 +0000 |
2239 | @@ -21,7 +21,7 @@ |
2240 | "strconv" |
2241 | "strings" |
2242 | |
2243 | - "github.com/errgo/errgo" |
2244 | + "github.com/juju/errors" |
2245 | |
2246 | "launchpad.net/juju-core/charm" |
2247 | "launchpad.net/juju-core/environs" |
2248 | @@ -236,13 +236,13 @@ |
2249 | } |
2250 | zipr, err := zip.NewReader(f, fi.Size()) |
2251 | if err != nil { |
2252 | - return errgo.Annotate(err, "cannot open charm archive") |
2253 | + return errors.Annotate(err, "cannot open charm archive") |
2254 | } |
2255 | |
2256 | // Find out the root dir prefix from the archive. |
2257 | rootDir, err := h.findArchiveRootDir(zipr) |
2258 | if err != nil { |
2259 | - return errgo.Annotate(err, "cannot read charm archive") |
2260 | + return errors.Annotate(err, "cannot read charm archive") |
2261 | } |
2262 | if rootDir == "." { |
2263 | // Normal charm, just use charm.ReadBundle(). |
2264 | @@ -253,15 +253,15 @@ |
2265 | // dir and then read it as a charm dir. |
2266 | tempDir, err := ioutil.TempDir("", "charm-extract") |
2267 | if err != nil { |
2268 | - return errgo.Annotate(err, "cannot create temp directory") |
2269 | + return errors.Annotate(err, "cannot create temp directory") |
2270 | } |
2271 | defer os.RemoveAll(tempDir) |
2272 | if err := ziputil.Extract(zipr, tempDir, rootDir); err != nil { |
2273 | - return errgo.Annotate(err, "cannot extract charm archive") |
2274 | + return errors.Annotate(err, "cannot extract charm archive") |
2275 | } |
2276 | dir, err := charm.ReadDir(tempDir) |
2277 | if err != nil { |
2278 | - return errgo.Annotate(err, "cannot read extracted archive") |
2279 | + return errors.Annotate(err, "cannot read extracted archive") |
2280 | } |
2281 | |
2282 | // Now repackage the dir as a bundle at the original path. |
2283 | @@ -313,25 +313,25 @@ |
2284 | // dir and the repackaged archive. |
2285 | tempDir, err := ioutil.TempDir("", "charm-download") |
2286 | if err != nil { |
2287 | - return errgo.Annotate(err, "cannot create temp directory") |
2288 | + return errors.Annotate(err, "cannot create temp directory") |
2289 | } |
2290 | defer os.RemoveAll(tempDir) |
2291 | extractPath := filepath.Join(tempDir, "extracted") |
2292 | repackagedPath := filepath.Join(tempDir, "repackaged.zip") |
2293 | repackagedArchive, err := os.Create(repackagedPath) |
2294 | if err != nil { |
2295 | - return errgo.Annotate(err, "cannot repackage uploaded charm") |
2296 | + return errors.Annotate(err, "cannot repackage uploaded charm") |
2297 | } |
2298 | defer repackagedArchive.Close() |
2299 | |
2300 | // Expand and repack it with the revision specified by curl. |
2301 | archive.SetRevision(curl.Revision) |
2302 | if err := archive.ExpandTo(extractPath); err != nil { |
2303 | - return errgo.Annotate(err, "cannot extract uploaded charm") |
2304 | + return errors.Annotate(err, "cannot extract uploaded charm") |
2305 | } |
2306 | charmDir, err := charm.ReadDir(extractPath) |
2307 | if err != nil { |
2308 | - return errgo.Annotate(err, "cannot read extracted charm") |
2309 | + return errors.Annotate(err, "cannot read extracted charm") |
2310 | } |
2311 | |
2312 | // Bundle the charm and calculate its sha256 hash at the |
2313 | @@ -339,39 +339,39 @@ |
2314 | hash := sha256.New() |
2315 | err = charmDir.BundleTo(io.MultiWriter(hash, repackagedArchive)) |
2316 | if err != nil { |
2317 | - return errgo.Annotate(err, "cannot repackage uploaded charm") |
2318 | + return errors.Annotate(err, "cannot repackage uploaded charm") |
2319 | } |
2320 | bundleSHA256 := hex.EncodeToString(hash.Sum(nil)) |
2321 | size, err := repackagedArchive.Seek(0, 2) |
2322 | if err != nil { |
2323 | - return errgo.Annotate(err, "cannot get charm file size") |
2324 | + return errors.Annotate(err, "cannot get charm file size") |
2325 | } |
2326 | |
2327 | // Now upload to provider storage. |
2328 | if _, err := repackagedArchive.Seek(0, 0); err != nil { |
2329 | - return errgo.Annotate(err, "cannot rewind the charm file reader") |
2330 | + return errors.Annotate(err, "cannot rewind the charm file reader") |
2331 | } |
2332 | storage, err := environs.GetStorage(h.state) |
2333 | if err != nil { |
2334 | - return errgo.Annotate(err, "cannot access provider storage") |
2335 | + return errors.Annotate(err, "cannot access provider storage") |
2336 | } |
2337 | name := charm.Quote(curl.String()) |
2338 | if err := storage.Put(name, repackagedArchive, size); err != nil { |
2339 | - return errgo.Annotate(err, "cannot upload charm to provider storage") |
2340 | + return errors.Annotate(err, "cannot upload charm to provider storage") |
2341 | } |
2342 | storageURL, err := storage.URL(name) |
2343 | if err != nil { |
2344 | - return errgo.Annotate(err, "cannot get storage URL for charm") |
2345 | + return errors.Annotate(err, "cannot get storage URL for charm") |
2346 | } |
2347 | bundleURL, err := url.Parse(storageURL) |
2348 | if err != nil { |
2349 | - return errgo.Annotate(err, "cannot parse storage URL") |
2350 | + return errors.Annotate(err, "cannot parse storage URL") |
2351 | } |
2352 | |
2353 | // And finally, update state. |
2354 | _, err = h.state.UpdateUploadedCharm(archive, curl, bundleURL, bundleSHA256) |
2355 | if err != nil { |
2356 | - return errgo.Annotate(err, "cannot update uploaded charm in state") |
2357 | + return errors.Annotate(err, "cannot update uploaded charm in state") |
2358 | } |
2359 | return nil |
2360 | } |
2361 | @@ -416,18 +416,18 @@ |
2362 | // Get the provider storage. |
2363 | storage, err := environs.GetStorage(h.state) |
2364 | if err != nil { |
2365 | - return errgo.Annotate(err, "cannot access provider storage") |
2366 | + return errors.Annotate(err, "cannot access provider storage") |
2367 | } |
2368 | |
2369 | // Use the storage to retrieve and save the charm archive. |
2370 | reader, err := storage.Get(name) |
2371 | if err != nil { |
2372 | - return errgo.Annotate(err, "charm not found in the provider storage") |
2373 | + return errors.Annotate(err, "charm not found in the provider storage") |
2374 | } |
2375 | defer reader.Close() |
2376 | data, err := ioutil.ReadAll(reader) |
2377 | if err != nil { |
2378 | - return errgo.Annotate(err, "cannot read charm data") |
2379 | + return errors.Annotate(err, "cannot read charm data") |
2380 | } |
2381 | // In order to avoid races, the archive is saved in a temporary file which |
2382 | // is then atomically renamed. The temporary file is created in the |
2383 | @@ -435,19 +435,19 @@ |
2384 | // target live in the same file system. |
2385 | cacheDir := filepath.Dir(charmArchivePath) |
2386 | if err = os.MkdirAll(cacheDir, 0755); err != nil { |
2387 | - return errgo.Annotate(err, "cannot create the charms cache") |
2388 | + return errors.Annotate(err, "cannot create the charms cache") |
2389 | } |
2390 | tempCharmArchive, err := ioutil.TempFile(cacheDir, "charm") |
2391 | if err != nil { |
2392 | - return errgo.Annotate(err, "cannot create charm archive temp file") |
2393 | + return errors.Annotate(err, "cannot create charm archive temp file") |
2394 | } |
2395 | defer tempCharmArchive.Close() |
2396 | if err = ioutil.WriteFile(tempCharmArchive.Name(), data, 0644); err != nil { |
2397 | - return errgo.Annotate(err, "error processing charm archive download") |
2398 | + return errors.Annotate(err, "error processing charm archive download") |
2399 | } |
2400 | if err = os.Rename(tempCharmArchive.Name(), charmArchivePath); err != nil { |
2401 | defer os.Remove(tempCharmArchive.Name()) |
2402 | - return errgo.Annotate(err, "error renaming the charm archive") |
2403 | + return errors.Annotate(err, "error renaming the charm archive") |
2404 | } |
2405 | return nil |
2406 | } |
2407 | |
2408 | === modified file 'state/apiserver/client/api_test.go' |
2409 | --- state/apiserver/client/api_test.go 2014-05-01 16:14:47 +0000 |
2410 | +++ state/apiserver/client/api_test.go 2014-05-15 02:28:23 +0000 |
2411 | @@ -8,13 +8,13 @@ |
2412 | stdtesting "testing" |
2413 | "time" |
2414 | |
2415 | + "github.com/juju/errors" |
2416 | jc "github.com/juju/testing/checkers" |
2417 | gc "launchpad.net/gocheck" |
2418 | |
2419 | "launchpad.net/juju-core/constraints" |
2420 | "launchpad.net/juju-core/environs" |
2421 | "launchpad.net/juju-core/environs/config" |
2422 | - "launchpad.net/juju-core/errors" |
2423 | "launchpad.net/juju-core/instance" |
2424 | "launchpad.net/juju-core/juju/testing" |
2425 | "launchpad.net/juju-core/state" |
2426 | |
2427 | === modified file 'state/apiserver/client/client.go' |
2428 | --- state/apiserver/client/client.go 2014-04-30 23:18:40 +0000 |
2429 | +++ state/apiserver/client/client.go 2014-05-15 02:28:23 +0000 |
2430 | @@ -9,7 +9,7 @@ |
2431 | "os" |
2432 | "strings" |
2433 | |
2434 | - "github.com/errgo/errgo" |
2435 | + "github.com/juju/errors" |
2436 | "github.com/juju/loggo" |
2437 | |
2438 | "launchpad.net/juju-core/charm" |
2439 | @@ -17,7 +17,6 @@ |
2440 | "launchpad.net/juju-core/environs/config" |
2441 | "launchpad.net/juju-core/environs/manual" |
2442 | envtools "launchpad.net/juju-core/environs/tools" |
2443 | - "launchpad.net/juju-core/errors" |
2444 | "launchpad.net/juju-core/instance" |
2445 | "launchpad.net/juju-core/juju" |
2446 | "launchpad.net/juju-core/names" |
2447 | @@ -953,47 +952,47 @@ |
2448 | store := config.SpecializeCharmRepo(CharmStore, envConfig) |
2449 | downloadedCharm, err := store.Get(charmURL) |
2450 | if err != nil { |
2451 | - return errgo.Annotatef(err, "cannot download charm %q", charmURL.String()) |
2452 | + return errors.Annotatef(err, "cannot download charm %q", charmURL.String()) |
2453 | } |
2454 | |
2455 | // Open it and calculate the SHA256 hash. |
2456 | downloadedBundle, ok := downloadedCharm.(*charm.Bundle) |
2457 | if !ok { |
2458 | - return errgo.New("expected a charm archive, got %T", downloadedCharm) |
2459 | + return errors.Errorf("expected a charm archive, got %T", downloadedCharm) |
2460 | } |
2461 | archive, err := os.Open(downloadedBundle.Path) |
2462 | if err != nil { |
2463 | - return errgo.Annotate(err, "cannot read downloaded charm") |
2464 | + return errors.Annotate(err, "cannot read downloaded charm") |
2465 | } |
2466 | defer archive.Close() |
2467 | bundleSHA256, size, err := utils.ReadSHA256(archive) |
2468 | if err != nil { |
2469 | - return errgo.Annotate(err, "cannot calculate SHA256 hash of charm") |
2470 | + return errors.Annotate(err, "cannot calculate SHA256 hash of charm") |
2471 | } |
2472 | if _, err := archive.Seek(0, 0); err != nil { |
2473 | - return errgo.Annotate(err, "cannot rewind charm archive") |
2474 | + return errors.Annotate(err, "cannot rewind charm archive") |
2475 | } |
2476 | |
2477 | // Get the environment storage and upload the charm. |
2478 | env, err := environs.New(envConfig) |
2479 | if err != nil { |
2480 | - return errgo.Annotate(err, "cannot access environment") |
2481 | + return errors.Annotate(err, "cannot access environment") |
2482 | } |
2483 | storage := env.Storage() |
2484 | archiveName, err := CharmArchiveName(charmURL.Name, charmURL.Revision) |
2485 | if err != nil { |
2486 | - return errgo.Annotate(err, "cannot generate charm archive name") |
2487 | + return errors.Annotate(err, "cannot generate charm archive name") |
2488 | } |
2489 | if err := storage.Put(archiveName, archive, size); err != nil { |
2490 | - return errgo.Annotate(err, "cannot upload charm to provider storage") |
2491 | + return errors.Annotate(err, "cannot upload charm to provider storage") |
2492 | } |
2493 | storageURL, err := storage.URL(archiveName) |
2494 | if err != nil { |
2495 | - return errgo.Annotate(err, "cannot get storage URL for charm") |
2496 | + return errors.Annotate(err, "cannot get storage URL for charm") |
2497 | } |
2498 | bundleURL, err := url.Parse(storageURL) |
2499 | if err != nil { |
2500 | - return errgo.Annotate(err, "cannot parse storage URL") |
2501 | + return errors.Annotate(err, "cannot parse storage URL") |
2502 | } |
2503 | |
2504 | // Finally, update the charm data in state and mark it as no longer pending. |
2505 | @@ -1005,7 +1004,7 @@ |
2506 | // us. This means we have to delete what we just uploaded |
2507 | // to storage. |
2508 | if err := storage.Remove(archiveName); err != nil { |
2509 | - errgo.Annotate(err, "cannot remove duplicated charm from storage") |
2510 | + errors.Annotate(err, "cannot remove duplicated charm from storage") |
2511 | } |
2512 | return nil |
2513 | } |
2514 | |
2515 | === modified file 'state/apiserver/client/client_test.go' |
2516 | --- state/apiserver/client/client_test.go 2014-04-23 11:57:06 +0000 |
2517 | +++ state/apiserver/client/client_test.go 2014-05-15 02:28:23 +0000 |
2518 | @@ -11,6 +11,7 @@ |
2519 | "sync" |
2520 | "time" |
2521 | |
2522 | + "github.com/juju/errors" |
2523 | jc "github.com/juju/testing/checkers" |
2524 | gc "launchpad.net/gocheck" |
2525 | |
2526 | @@ -21,7 +22,6 @@ |
2527 | "launchpad.net/juju-core/environs/manual" |
2528 | envstorage "launchpad.net/juju-core/environs/storage" |
2529 | ttesting "launchpad.net/juju-core/environs/tools/testing" |
2530 | - "launchpad.net/juju-core/errors" |
2531 | "launchpad.net/juju-core/instance" |
2532 | "launchpad.net/juju-core/provider/dummy" |
2533 | "launchpad.net/juju-core/state" |
2534 | |
2535 | === modified file 'state/apiserver/client/destroy_test.go' |
2536 | --- state/apiserver/client/destroy_test.go 2014-04-14 12:36:13 +0000 |
2537 | +++ state/apiserver/client/destroy_test.go 2014-05-15 02:28:23 +0000 |
2538 | @@ -6,11 +6,11 @@ |
2539 | import ( |
2540 | "fmt" |
2541 | |
2542 | + "github.com/juju/errors" |
2543 | jc "github.com/juju/testing/checkers" |
2544 | gc "launchpad.net/gocheck" |
2545 | |
2546 | "launchpad.net/juju-core/environs" |
2547 | - coreerrors "launchpad.net/juju-core/errors" |
2548 | "launchpad.net/juju-core/instance" |
2549 | "launchpad.net/juju-core/juju/testing" |
2550 | "launchpad.net/juju-core/state" |
2551 | @@ -109,7 +109,7 @@ |
2552 | for _, s := range services { |
2553 | err = s.Refresh() |
2554 | if err != nil { |
2555 | - c.Assert(err, jc.Satisfies, coreerrors.IsNotFound) |
2556 | + c.Assert(err, jc.Satisfies, errors.IsNotFound) |
2557 | } else { |
2558 | c.Assert(s.Life(), gc.Not(gc.Equals), state.Alive) |
2559 | } |
2560 | |
2561 | === modified file 'state/apiserver/client/status.go' |
2562 | --- state/apiserver/client/status.go 2014-05-01 17:56:04 +0000 |
2563 | +++ state/apiserver/client/status.go 2014-05-15 02:28:23 +0000 |
2564 | @@ -9,8 +9,9 @@ |
2565 | "regexp" |
2566 | "strings" |
2567 | |
2568 | + "github.com/juju/errors" |
2569 | + |
2570 | "launchpad.net/juju-core/charm" |
2571 | - "launchpad.net/juju-core/errors" |
2572 | "launchpad.net/juju-core/instance" |
2573 | "launchpad.net/juju-core/juju" |
2574 | "launchpad.net/juju-core/state" |
2575 | |
2576 | === modified file 'state/apiserver/common/errors.go' |
2577 | --- state/apiserver/common/errors.go 2014-04-14 12:36:13 +0000 |
2578 | +++ state/apiserver/common/errors.go 2014-05-15 02:28:23 +0000 |
2579 | @@ -7,7 +7,8 @@ |
2580 | stderrors "errors" |
2581 | "fmt" |
2582 | |
2583 | - "launchpad.net/juju-core/errors" |
2584 | + "github.com/juju/errors" |
2585 | + |
2586 | "launchpad.net/juju-core/state" |
2587 | "launchpad.net/juju-core/state/api/params" |
2588 | ) |
2589 | |
2590 | === modified file 'state/apiserver/common/errors_test.go' |
2591 | --- state/apiserver/common/errors_test.go 2014-04-14 12:36:13 +0000 |
2592 | +++ state/apiserver/common/errors_test.go 2014-05-15 02:28:23 +0000 |
2593 | @@ -6,10 +6,10 @@ |
2594 | import ( |
2595 | stderrors "errors" |
2596 | |
2597 | + "github.com/juju/errors" |
2598 | jc "github.com/juju/testing/checkers" |
2599 | gc "launchpad.net/gocheck" |
2600 | |
2601 | - "launchpad.net/juju-core/errors" |
2602 | "launchpad.net/juju-core/state" |
2603 | "launchpad.net/juju-core/state/api/params" |
2604 | "launchpad.net/juju-core/state/apiserver/common" |
2605 | |
2606 | === modified file 'state/apiserver/common/password_test.go' |
2607 | --- state/apiserver/common/password_test.go 2014-03-13 13:42:50 +0000 |
2608 | +++ state/apiserver/common/password_test.go 2014-05-15 02:28:23 +0000 |
2609 | @@ -6,10 +6,10 @@ |
2610 | import ( |
2611 | "fmt" |
2612 | |
2613 | + "github.com/juju/errors" |
2614 | jc "github.com/juju/testing/checkers" |
2615 | gc "launchpad.net/gocheck" |
2616 | |
2617 | - "launchpad.net/juju-core/errors" |
2618 | "launchpad.net/juju-core/state" |
2619 | "launchpad.net/juju-core/state/api/params" |
2620 | "launchpad.net/juju-core/state/apiserver/common" |
2621 | |
2622 | === modified file 'state/apiserver/deployer/deployer_test.go' |
2623 | --- state/apiserver/deployer/deployer_test.go 2014-04-17 12:53:23 +0000 |
2624 | +++ state/apiserver/deployer/deployer_test.go 2014-05-15 02:28:23 +0000 |
2625 | @@ -7,10 +7,10 @@ |
2626 | "sort" |
2627 | stdtesting "testing" |
2628 | |
2629 | + "github.com/juju/errors" |
2630 | jc "github.com/juju/testing/checkers" |
2631 | gc "launchpad.net/gocheck" |
2632 | |
2633 | - "launchpad.net/juju-core/errors" |
2634 | "launchpad.net/juju-core/instance" |
2635 | "launchpad.net/juju-core/juju/testing" |
2636 | "launchpad.net/juju-core/names" |
2637 | |
2638 | === modified file 'state/apiserver/firewaller/firewaller_test.go' |
2639 | --- state/apiserver/firewaller/firewaller_test.go 2014-04-14 12:36:13 +0000 |
2640 | +++ state/apiserver/firewaller/firewaller_test.go 2014-05-15 02:28:23 +0000 |
2641 | @@ -6,10 +6,10 @@ |
2642 | import ( |
2643 | stdtesting "testing" |
2644 | |
2645 | + "github.com/juju/errors" |
2646 | jc "github.com/juju/testing/checkers" |
2647 | gc "launchpad.net/gocheck" |
2648 | |
2649 | - "launchpad.net/juju-core/errors" |
2650 | "launchpad.net/juju-core/instance" |
2651 | "launchpad.net/juju-core/juju/testing" |
2652 | "launchpad.net/juju-core/state" |
2653 | |
2654 | === modified file 'state/apiserver/keymanager/keymanager.go' |
2655 | --- state/apiserver/keymanager/keymanager.go 2014-04-30 23:18:40 +0000 |
2656 | +++ state/apiserver/keymanager/keymanager.go 2014-05-15 02:28:23 +0000 |
2657 | @@ -8,10 +8,10 @@ |
2658 | "fmt" |
2659 | "strings" |
2660 | |
2661 | + "github.com/juju/errors" |
2662 | "github.com/juju/loggo" |
2663 | |
2664 | "launchpad.net/juju-core/environs/config" |
2665 | - "launchpad.net/juju-core/errors" |
2666 | "launchpad.net/juju-core/names" |
2667 | "launchpad.net/juju-core/state" |
2668 | "launchpad.net/juju-core/state/api/params" |
2669 | |
2670 | === modified file 'state/apiserver/keyupdater/authorisedkeys.go' |
2671 | --- state/apiserver/keyupdater/authorisedkeys.go 2014-04-14 12:36:13 +0000 |
2672 | +++ state/apiserver/keyupdater/authorisedkeys.go 2014-05-15 02:28:23 +0000 |
2673 | @@ -4,7 +4,8 @@ |
2674 | package keyupdater |
2675 | |
2676 | import ( |
2677 | - "launchpad.net/juju-core/errors" |
2678 | + "github.com/juju/errors" |
2679 | + |
2680 | "launchpad.net/juju-core/state" |
2681 | "launchpad.net/juju-core/state/api/params" |
2682 | "launchpad.net/juju-core/state/apiserver/common" |
2683 | |
2684 | === modified file 'state/apiserver/machine/machiner.go' |
2685 | --- state/apiserver/machine/machiner.go 2014-04-14 12:36:13 +0000 |
2686 | +++ state/apiserver/machine/machiner.go 2014-05-15 02:28:23 +0000 |
2687 | @@ -6,7 +6,8 @@ |
2688 | package machine |
2689 | |
2690 | import ( |
2691 | - "launchpad.net/juju-core/errors" |
2692 | + "github.com/juju/errors" |
2693 | + |
2694 | "launchpad.net/juju-core/state" |
2695 | "launchpad.net/juju-core/state/api/params" |
2696 | "launchpad.net/juju-core/state/apiserver/common" |
2697 | |
2698 | === modified file 'state/apiserver/provisioner/provisioner_test.go' |
2699 | --- state/apiserver/provisioner/provisioner_test.go 2014-05-09 13:24:50 +0000 |
2700 | +++ state/apiserver/provisioner/provisioner_test.go 2014-05-15 02:28:23 +0000 |
2701 | @@ -7,12 +7,12 @@ |
2702 | "fmt" |
2703 | stdtesting "testing" |
2704 | |
2705 | + "github.com/juju/errors" |
2706 | jc "github.com/juju/testing/checkers" |
2707 | gc "launchpad.net/gocheck" |
2708 | |
2709 | "launchpad.net/juju-core/constraints" |
2710 | "launchpad.net/juju-core/container" |
2711 | - "launchpad.net/juju-core/errors" |
2712 | "launchpad.net/juju-core/instance" |
2713 | "launchpad.net/juju-core/juju/osenv" |
2714 | "launchpad.net/juju-core/juju/testing" |
2715 | |
2716 | === modified file 'state/apiserver/uniter/uniter.go' |
2717 | --- state/apiserver/uniter/uniter.go 2014-04-14 12:36:13 +0000 |
2718 | +++ state/apiserver/uniter/uniter.go 2014-05-15 02:28:23 +0000 |
2719 | @@ -8,8 +8,9 @@ |
2720 | import ( |
2721 | "fmt" |
2722 | |
2723 | + "github.com/juju/errors" |
2724 | + |
2725 | "launchpad.net/juju-core/charm" |
2726 | - "launchpad.net/juju-core/errors" |
2727 | "launchpad.net/juju-core/names" |
2728 | "launchpad.net/juju-core/state" |
2729 | "launchpad.net/juju-core/state/api/params" |
2730 | |
2731 | === modified file 'state/apiserver/uniter/uniter_test.go' |
2732 | --- state/apiserver/uniter/uniter_test.go 2014-04-17 12:53:23 +0000 |
2733 | +++ state/apiserver/uniter/uniter_test.go 2014-05-15 02:28:23 +0000 |
2734 | @@ -6,12 +6,12 @@ |
2735 | import ( |
2736 | stdtesting "testing" |
2737 | |
2738 | + "github.com/juju/errors" |
2739 | jc "github.com/juju/testing/checkers" |
2740 | gc "launchpad.net/gocheck" |
2741 | |
2742 | "launchpad.net/juju-core/charm" |
2743 | envtesting "launchpad.net/juju-core/environs/testing" |
2744 | - "launchpad.net/juju-core/errors" |
2745 | "launchpad.net/juju-core/instance" |
2746 | "launchpad.net/juju-core/juju/testing" |
2747 | "launchpad.net/juju-core/state" |
2748 | |
2749 | === modified file 'state/apiserver/upgrader/unitupgrader_test.go' |
2750 | --- state/apiserver/upgrader/unitupgrader_test.go 2014-04-14 12:36:13 +0000 |
2751 | +++ state/apiserver/upgrader/unitupgrader_test.go 2014-05-15 02:28:23 +0000 |
2752 | @@ -4,10 +4,10 @@ |
2753 | package upgrader_test |
2754 | |
2755 | import ( |
2756 | + "github.com/juju/errors" |
2757 | jc "github.com/juju/testing/checkers" |
2758 | gc "launchpad.net/gocheck" |
2759 | |
2760 | - "launchpad.net/juju-core/errors" |
2761 | jujutesting "launchpad.net/juju-core/juju/testing" |
2762 | "launchpad.net/juju-core/state" |
2763 | "launchpad.net/juju-core/state/api/params" |
2764 | |
2765 | === modified file 'state/apiserver/upgrader/upgrader_test.go' |
2766 | --- state/apiserver/upgrader/upgrader_test.go 2014-04-14 12:36:13 +0000 |
2767 | +++ state/apiserver/upgrader/upgrader_test.go 2014-05-15 02:28:23 +0000 |
2768 | @@ -4,11 +4,11 @@ |
2769 | package upgrader_test |
2770 | |
2771 | import ( |
2772 | + "github.com/juju/errors" |
2773 | jc "github.com/juju/testing/checkers" |
2774 | gc "launchpad.net/gocheck" |
2775 | |
2776 | envtesting "launchpad.net/juju-core/environs/testing" |
2777 | - "launchpad.net/juju-core/errors" |
2778 | jujutesting "launchpad.net/juju-core/juju/testing" |
2779 | "launchpad.net/juju-core/state" |
2780 | "launchpad.net/juju-core/state/api/params" |
2781 | |
2782 | === modified file 'state/charm_test.go' |
2783 | --- state/charm_test.go 2014-04-14 12:36:13 +0000 |
2784 | +++ state/charm_test.go 2014-05-15 02:28:23 +0000 |
2785 | @@ -7,11 +7,11 @@ |
2786 | "bytes" |
2787 | "net/url" |
2788 | |
2789 | + "github.com/juju/errors" |
2790 | jc "github.com/juju/testing/checkers" |
2791 | gc "launchpad.net/gocheck" |
2792 | |
2793 | "launchpad.net/juju-core/charm" |
2794 | - "launchpad.net/juju-core/errors" |
2795 | "launchpad.net/juju-core/state" |
2796 | "launchpad.net/juju-core/testing" |
2797 | ) |
2798 | |
2799 | === modified file 'state/cleanup.go' |
2800 | --- state/cleanup.go 2014-04-14 12:36:13 +0000 |
2801 | +++ state/cleanup.go 2014-05-15 02:28:23 +0000 |
2802 | @@ -3,10 +3,9 @@ |
2803 | import ( |
2804 | "fmt" |
2805 | |
2806 | + "github.com/juju/errors" |
2807 | "labix.org/v2/mgo/bson" |
2808 | "labix.org/v2/mgo/txn" |
2809 | - |
2810 | - "launchpad.net/juju-core/errors" |
2811 | ) |
2812 | |
2813 | // cleanupDoc represents a potentially large set of documents that should be |
2814 | |
2815 | === modified file 'state/cleanup_test.go' |
2816 | --- state/cleanup_test.go 2014-04-14 12:36:13 +0000 |
2817 | +++ state/cleanup_test.go 2014-05-15 02:28:23 +0000 |
2818 | @@ -3,11 +3,11 @@ |
2819 | import ( |
2820 | "fmt" |
2821 | |
2822 | + "github.com/juju/errors" |
2823 | jc "github.com/juju/testing/checkers" |
2824 | gc "launchpad.net/gocheck" |
2825 | |
2826 | "launchpad.net/juju-core/charm" |
2827 | - "launchpad.net/juju-core/errors" |
2828 | "launchpad.net/juju-core/instance" |
2829 | "launchpad.net/juju-core/state" |
2830 | ) |
2831 | |
2832 | === modified file 'state/configvalidator_test.go' |
2833 | --- state/configvalidator_test.go 2014-04-14 12:36:13 +0000 |
2834 | +++ state/configvalidator_test.go 2014-05-15 02:28:23 +0000 |
2835 | @@ -4,9 +4,10 @@ |
2836 | package state_test |
2837 | |
2838 | import ( |
2839 | + "github.com/juju/errors" |
2840 | gc "launchpad.net/gocheck" |
2841 | + |
2842 | "launchpad.net/juju-core/environs/config" |
2843 | - "launchpad.net/juju-core/errors" |
2844 | "launchpad.net/juju-core/state" |
2845 | coretesting "launchpad.net/juju-core/testing" |
2846 | ) |
2847 | |
2848 | === modified file 'state/conn_test.go' |
2849 | --- state/conn_test.go 2014-04-22 09:23:39 +0000 |
2850 | +++ state/conn_test.go 2014-05-15 02:28:23 +0000 |
2851 | @@ -6,12 +6,12 @@ |
2852 | import ( |
2853 | stdtesting "testing" |
2854 | |
2855 | + "github.com/juju/errors" |
2856 | "labix.org/v2/mgo" |
2857 | gc "launchpad.net/gocheck" |
2858 | |
2859 | "launchpad.net/juju-core/constraints" |
2860 | "launchpad.net/juju-core/environs/config" |
2861 | - "launchpad.net/juju-core/errors" |
2862 | "launchpad.net/juju-core/state" |
2863 | "launchpad.net/juju-core/testing" |
2864 | "launchpad.net/juju-core/testing/testbase" |
2865 | |
2866 | === modified file 'state/constraints.go' |
2867 | --- state/constraints.go 2014-04-17 03:10:18 +0000 |
2868 | +++ state/constraints.go 2014-05-15 02:28:23 +0000 |
2869 | @@ -6,12 +6,12 @@ |
2870 | import ( |
2871 | "fmt" |
2872 | |
2873 | + "github.com/juju/errors" |
2874 | "labix.org/v2/mgo" |
2875 | "labix.org/v2/mgo/bson" |
2876 | "labix.org/v2/mgo/txn" |
2877 | |
2878 | "launchpad.net/juju-core/constraints" |
2879 | - "launchpad.net/juju-core/errors" |
2880 | "launchpad.net/juju-core/instance" |
2881 | ) |
2882 | |
2883 | |
2884 | === modified file 'state/environ.go' |
2885 | --- state/environ.go 2014-04-01 00:58:29 +0000 |
2886 | +++ state/environ.go 2014-05-15 02:28:23 +0000 |
2887 | @@ -4,11 +4,11 @@ |
2888 | package state |
2889 | |
2890 | import ( |
2891 | + "github.com/juju/errors" |
2892 | "labix.org/v2/mgo" |
2893 | "labix.org/v2/mgo/bson" |
2894 | "labix.org/v2/mgo/txn" |
2895 | |
2896 | - "launchpad.net/juju-core/errors" |
2897 | "launchpad.net/juju-core/names" |
2898 | ) |
2899 | |
2900 | |
2901 | === modified file 'state/environcapability_test.go' |
2902 | --- state/environcapability_test.go 2014-04-14 12:36:13 +0000 |
2903 | +++ state/environcapability_test.go 2014-05-15 02:28:23 +0000 |
2904 | @@ -6,10 +6,10 @@ |
2905 | import ( |
2906 | "fmt" |
2907 | |
2908 | + "github.com/juju/errors" |
2909 | gc "launchpad.net/gocheck" |
2910 | |
2911 | "launchpad.net/juju-core/environs/config" |
2912 | - "launchpad.net/juju-core/errors" |
2913 | "launchpad.net/juju-core/instance" |
2914 | "launchpad.net/juju-core/state" |
2915 | ) |
2916 | |
2917 | === modified file 'state/machine.go' |
2918 | --- state/machine.go 2014-04-22 09:23:39 +0000 |
2919 | +++ state/machine.go 2014-05-15 02:28:23 +0000 |
2920 | @@ -9,12 +9,12 @@ |
2921 | "strings" |
2922 | "time" |
2923 | |
2924 | + "github.com/juju/errors" |
2925 | "labix.org/v2/mgo" |
2926 | "labix.org/v2/mgo/bson" |
2927 | "labix.org/v2/mgo/txn" |
2928 | |
2929 | "launchpad.net/juju-core/constraints" |
2930 | - "launchpad.net/juju-core/errors" |
2931 | "launchpad.net/juju-core/instance" |
2932 | "launchpad.net/juju-core/names" |
2933 | "launchpad.net/juju-core/state/api/params" |
2934 | |
2935 | === modified file 'state/machine_test.go' |
2936 | --- state/machine_test.go 2014-04-21 23:10:05 +0000 |
2937 | +++ state/machine_test.go 2014-05-15 02:28:23 +0000 |
2938 | @@ -7,6 +7,7 @@ |
2939 | "sort" |
2940 | "strings" |
2941 | |
2942 | + "github.com/juju/errors" |
2943 | "github.com/juju/loggo" |
2944 | jc "github.com/juju/testing/checkers" |
2945 | "labix.org/v2/mgo/bson" |
2946 | @@ -15,7 +16,6 @@ |
2947 | "launchpad.net/juju-core/constraints" |
2948 | "launchpad.net/juju-core/environs/config" |
2949 | "launchpad.net/juju-core/environs/network" |
2950 | - "launchpad.net/juju-core/errors" |
2951 | "launchpad.net/juju-core/instance" |
2952 | "launchpad.net/juju-core/state" |
2953 | "launchpad.net/juju-core/state/api/params" |
2954 | |
2955 | === modified file 'state/megawatcher.go' |
2956 | --- state/megawatcher.go 2014-04-14 12:36:13 +0000 |
2957 | +++ state/megawatcher.go 2014-05-15 02:28:23 +0000 |
2958 | @@ -8,9 +8,9 @@ |
2959 | "reflect" |
2960 | "strings" |
2961 | |
2962 | + "github.com/juju/errors" |
2963 | "labix.org/v2/mgo" |
2964 | |
2965 | - "launchpad.net/juju-core/errors" |
2966 | "launchpad.net/juju-core/state/api/params" |
2967 | "launchpad.net/juju-core/state/multiwatcher" |
2968 | "launchpad.net/juju-core/state/watcher" |
2969 | |
2970 | === modified file 'state/minimumunits.go' |
2971 | --- state/minimumunits.go 2014-04-17 12:47:50 +0000 |
2972 | +++ state/minimumunits.go 2014-05-15 02:28:23 +0000 |
2973 | @@ -4,12 +4,9 @@ |
2974 | package state |
2975 | |
2976 | import ( |
2977 | - "errors" |
2978 | - |
2979 | + "github.com/juju/errors" |
2980 | "labix.org/v2/mgo/bson" |
2981 | "labix.org/v2/mgo/txn" |
2982 | - |
2983 | - coreerrors "launchpad.net/juju-core/errors" |
2984 | ) |
2985 | |
2986 | // minUnitsDoc keeps track of relevant changes on the service's MinUnits field |
2987 | @@ -31,7 +28,7 @@ |
2988 | |
2989 | // SetMinUnits changes the number of minimum units required by the service. |
2990 | func (s *Service) SetMinUnits(minUnits int) (err error) { |
2991 | - defer coreerrors.Maskf(&err, "cannot set minimum units for service %q", s) |
2992 | + defer errors.Maskf(&err, "cannot set minimum units for service %q", s) |
2993 | defer func() { |
2994 | if err == nil { |
2995 | s.doc.MinUnits = minUnits |
2996 | @@ -127,7 +124,7 @@ |
2997 | // EnsureMinUnits adds new units if the service's MinUnits value is greater |
2998 | // than the number of alive units. |
2999 | func (s *Service) EnsureMinUnits() (err error) { |
3000 | - defer coreerrors.Maskf(&err, "cannot ensure minimum units for service %q", s) |
3001 | + defer errors.Maskf(&err, "cannot ensure minimum units for service %q", s) |
3002 | service := &Service{st: s.st, doc: s.doc} |
3003 | for { |
3004 | // Ensure the service is alive. |
3005 | |
3006 | === modified file 'state/open.go' |
3007 | --- state/open.go 2014-05-07 08:10:22 +0000 |
3008 | +++ state/open.go 2014-05-15 02:28:23 +0000 |
3009 | @@ -11,6 +11,7 @@ |
3010 | "net" |
3011 | "time" |
3012 | |
3013 | + "github.com/juju/errors" |
3014 | "labix.org/v2/mgo" |
3015 | "labix.org/v2/mgo/bson" |
3016 | "labix.org/v2/mgo/txn" |
3017 | @@ -18,7 +19,6 @@ |
3018 | "launchpad.net/juju-core/cert" |
3019 | "launchpad.net/juju-core/constraints" |
3020 | "launchpad.net/juju-core/environs/config" |
3021 | - "launchpad.net/juju-core/errors" |
3022 | "launchpad.net/juju-core/state/api/params" |
3023 | "launchpad.net/juju-core/state/presence" |
3024 | "launchpad.net/juju-core/state/watcher" |
3025 | |
3026 | === modified file 'state/policy.go' |
3027 | --- state/policy.go 2014-04-22 09:23:39 +0000 |
3028 | +++ state/policy.go 2014-05-15 02:28:23 +0000 |
3029 | @@ -6,9 +6,10 @@ |
3030 | import ( |
3031 | "fmt" |
3032 | |
3033 | + "github.com/juju/errors" |
3034 | + |
3035 | "launchpad.net/juju-core/constraints" |
3036 | "launchpad.net/juju-core/environs/config" |
3037 | - "launchpad.net/juju-core/errors" |
3038 | ) |
3039 | |
3040 | // Policy is an interface provided to State that may |
3041 | |
3042 | === modified file 'state/prechecker_test.go' |
3043 | --- state/prechecker_test.go 2014-04-22 09:23:39 +0000 |
3044 | +++ state/prechecker_test.go 2014-05-15 02:28:23 +0000 |
3045 | @@ -6,11 +6,11 @@ |
3046 | import ( |
3047 | "fmt" |
3048 | |
3049 | + "github.com/juju/errors" |
3050 | gc "launchpad.net/gocheck" |
3051 | |
3052 | "launchpad.net/juju-core/constraints" |
3053 | "launchpad.net/juju-core/environs/config" |
3054 | - "launchpad.net/juju-core/errors" |
3055 | "launchpad.net/juju-core/instance" |
3056 | "launchpad.net/juju-core/state" |
3057 | ) |
3058 | |
3059 | === modified file 'state/relation.go' |
3060 | --- state/relation.go 2014-04-17 12:47:50 +0000 |
3061 | +++ state/relation.go 2014-05-15 02:28:23 +0000 |
3062 | @@ -10,12 +10,12 @@ |
3063 | "strconv" |
3064 | "strings" |
3065 | |
3066 | + "github.com/juju/errors" |
3067 | "labix.org/v2/mgo" |
3068 | "labix.org/v2/mgo/bson" |
3069 | "labix.org/v2/mgo/txn" |
3070 | |
3071 | "launchpad.net/juju-core/charm" |
3072 | - "launchpad.net/juju-core/errors" |
3073 | "launchpad.net/juju-core/names" |
3074 | ) |
3075 | |
3076 | |
3077 | === modified file 'state/relation_test.go' |
3078 | --- state/relation_test.go 2014-04-14 12:36:13 +0000 |
3079 | +++ state/relation_test.go 2014-05-15 02:28:23 +0000 |
3080 | @@ -4,11 +4,11 @@ |
3081 | package state_test |
3082 | |
3083 | import ( |
3084 | + "github.com/juju/errors" |
3085 | jc "github.com/juju/testing/checkers" |
3086 | gc "launchpad.net/gocheck" |
3087 | |
3088 | "launchpad.net/juju-core/charm" |
3089 | - "launchpad.net/juju-core/errors" |
3090 | "launchpad.net/juju-core/state" |
3091 | ) |
3092 | |
3093 | |
3094 | === modified file 'state/relationunit.go' |
3095 | --- state/relationunit.go 2014-04-17 12:47:50 +0000 |
3096 | +++ state/relationunit.go 2014-05-15 02:28:23 +0000 |
3097 | @@ -8,12 +8,12 @@ |
3098 | "fmt" |
3099 | "strings" |
3100 | |
3101 | + "github.com/juju/errors" |
3102 | "labix.org/v2/mgo" |
3103 | "labix.org/v2/mgo/bson" |
3104 | "labix.org/v2/mgo/txn" |
3105 | |
3106 | "launchpad.net/juju-core/charm" |
3107 | - "launchpad.net/juju-core/errors" |
3108 | "launchpad.net/juju-core/names" |
3109 | ) |
3110 | |
3111 | |
3112 | === modified file 'state/relationunit_test.go' |
3113 | --- state/relationunit_test.go 2014-04-14 12:36:13 +0000 |
3114 | +++ state/relationunit_test.go 2014-05-15 02:28:23 +0000 |
3115 | @@ -9,11 +9,11 @@ |
3116 | "strconv" |
3117 | "time" |
3118 | |
3119 | + "github.com/juju/errors" |
3120 | jc "github.com/juju/testing/checkers" |
3121 | gc "launchpad.net/gocheck" |
3122 | |
3123 | "launchpad.net/juju-core/charm" |
3124 | - "launchpad.net/juju-core/errors" |
3125 | "launchpad.net/juju-core/instance" |
3126 | "launchpad.net/juju-core/state" |
3127 | "launchpad.net/juju-core/state/testing" |
3128 | |
3129 | === modified file 'state/service.go' |
3130 | --- state/service.go 2014-04-25 12:19:25 +0000 |
3131 | +++ state/service.go 2014-05-15 02:28:23 +0000 |
3132 | @@ -10,13 +10,13 @@ |
3133 | "strconv" |
3134 | "strings" |
3135 | |
3136 | + "github.com/juju/errors" |
3137 | "labix.org/v2/mgo" |
3138 | "labix.org/v2/mgo/bson" |
3139 | "labix.org/v2/mgo/txn" |
3140 | |
3141 | "launchpad.net/juju-core/charm" |
3142 | "launchpad.net/juju-core/constraints" |
3143 | - "launchpad.net/juju-core/errors" |
3144 | "launchpad.net/juju-core/names" |
3145 | "launchpad.net/juju-core/state/api/params" |
3146 | ) |
3147 | |
3148 | === modified file 'state/service_test.go' |
3149 | --- state/service_test.go 2014-04-21 23:10:05 +0000 |
3150 | +++ state/service_test.go 2014-05-15 02:28:23 +0000 |
3151 | @@ -7,6 +7,7 @@ |
3152 | "fmt" |
3153 | "sort" |
3154 | |
3155 | + "github.com/juju/errors" |
3156 | "github.com/juju/loggo" |
3157 | jc "github.com/juju/testing/checkers" |
3158 | "labix.org/v2/mgo" |
3159 | @@ -15,7 +16,6 @@ |
3160 | "launchpad.net/juju-core/charm" |
3161 | "launchpad.net/juju-core/constraints" |
3162 | "launchpad.net/juju-core/environs/config" |
3163 | - "launchpad.net/juju-core/errors" |
3164 | "launchpad.net/juju-core/state" |
3165 | "launchpad.net/juju-core/state/testing" |
3166 | ) |
3167 | |
3168 | === modified file 'state/settings.go' |
3169 | --- state/settings.go 2014-03-20 01:23:05 +0000 |
3170 | +++ state/settings.go 2014-05-15 02:28:23 +0000 |
3171 | @@ -8,11 +8,10 @@ |
3172 | "sort" |
3173 | "strings" |
3174 | |
3175 | + "github.com/juju/errors" |
3176 | "labix.org/v2/mgo" |
3177 | "labix.org/v2/mgo/bson" |
3178 | "labix.org/v2/mgo/txn" |
3179 | - |
3180 | - "launchpad.net/juju-core/errors" |
3181 | ) |
3182 | |
3183 | // See: http://docs.mongodb.org/manual/faq/developers/#faq-dollar-sign-escaping |
3184 | |
3185 | === modified file 'state/settings_test.go' |
3186 | --- state/settings_test.go 2014-04-14 12:36:13 +0000 |
3187 | +++ state/settings_test.go 2014-05-15 02:28:23 +0000 |
3188 | @@ -4,11 +4,11 @@ |
3189 | package state |
3190 | |
3191 | import ( |
3192 | + "github.com/juju/errors" |
3193 | jc "github.com/juju/testing/checkers" |
3194 | "labix.org/v2/mgo/txn" |
3195 | gc "launchpad.net/gocheck" |
3196 | |
3197 | - "launchpad.net/juju-core/errors" |
3198 | "launchpad.net/juju-core/testing" |
3199 | "launchpad.net/juju-core/testing/testbase" |
3200 | ) |
3201 | |
3202 | === modified file 'state/state.go' |
3203 | --- state/state.go 2014-05-01 16:57:34 +0000 |
3204 | +++ state/state.go 2014-05-15 02:28:23 +0000 |
3205 | @@ -16,6 +16,7 @@ |
3206 | "strings" |
3207 | "sync" |
3208 | |
3209 | + "github.com/juju/errors" |
3210 | "github.com/juju/loggo" |
3211 | "labix.org/v2/mgo" |
3212 | "labix.org/v2/mgo/bson" |
3213 | @@ -24,7 +25,6 @@ |
3214 | "launchpad.net/juju-core/charm" |
3215 | "launchpad.net/juju-core/constraints" |
3216 | "launchpad.net/juju-core/environs/config" |
3217 | - "launchpad.net/juju-core/errors" |
3218 | "launchpad.net/juju-core/names" |
3219 | "launchpad.net/juju-core/state/api/params" |
3220 | "launchpad.net/juju-core/state/multiwatcher" |
3221 | |
3222 | === modified file 'state/state_test.go' |
3223 | --- state/state_test.go 2014-05-01 16:14:47 +0000 |
3224 | +++ state/state_test.go 2014-05-15 02:28:23 +0000 |
3225 | @@ -10,6 +10,7 @@ |
3226 | "strings" |
3227 | "time" |
3228 | |
3229 | + "github.com/juju/errors" |
3230 | "github.com/juju/loggo" |
3231 | jc "github.com/juju/testing/checkers" |
3232 | "labix.org/v2/mgo" |
3233 | @@ -19,7 +20,6 @@ |
3234 | "launchpad.net/juju-core/charm" |
3235 | "launchpad.net/juju-core/constraints" |
3236 | "launchpad.net/juju-core/environs/config" |
3237 | - "launchpad.net/juju-core/errors" |
3238 | "launchpad.net/juju-core/instance" |
3239 | "launchpad.net/juju-core/names" |
3240 | "launchpad.net/juju-core/replicaset" |
3241 | |
3242 | === modified file 'state/status.go' |
3243 | --- state/status.go 2014-03-26 09:08:23 +0000 |
3244 | +++ state/status.go 2014-05-15 02:28:23 +0000 |
3245 | @@ -6,11 +6,11 @@ |
3246 | import ( |
3247 | "fmt" |
3248 | |
3249 | + "github.com/juju/errors" |
3250 | "labix.org/v2/mgo" |
3251 | "labix.org/v2/mgo/bson" |
3252 | "labix.org/v2/mgo/txn" |
3253 | |
3254 | - "launchpad.net/juju-core/errors" |
3255 | "launchpad.net/juju-core/state/api/params" |
3256 | ) |
3257 | |
3258 | |
3259 | === modified file 'state/tools_test.go' |
3260 | --- state/tools_test.go 2014-04-14 12:36:13 +0000 |
3261 | +++ state/tools_test.go 2014-05-15 02:28:23 +0000 |
3262 | @@ -6,10 +6,10 @@ |
3263 | import ( |
3264 | "fmt" |
3265 | |
3266 | + "github.com/juju/errors" |
3267 | jc "github.com/juju/testing/checkers" |
3268 | gc "launchpad.net/gocheck" |
3269 | |
3270 | - "launchpad.net/juju-core/errors" |
3271 | "launchpad.net/juju-core/state" |
3272 | "launchpad.net/juju-core/tools" |
3273 | "launchpad.net/juju-core/version" |
3274 | |
3275 | === modified file 'state/unit.go' |
3276 | --- state/unit.go 2014-04-30 23:18:40 +0000 |
3277 | +++ state/unit.go 2014-05-15 02:28:23 +0000 |
3278 | @@ -8,6 +8,7 @@ |
3279 | "fmt" |
3280 | "time" |
3281 | |
3282 | + "github.com/juju/errors" |
3283 | "github.com/juju/loggo" |
3284 | "labix.org/v2/mgo" |
3285 | "labix.org/v2/mgo/bson" |
3286 | @@ -15,7 +16,6 @@ |
3287 | |
3288 | "launchpad.net/juju-core/charm" |
3289 | "launchpad.net/juju-core/constraints" |
3290 | - "launchpad.net/juju-core/errors" |
3291 | "launchpad.net/juju-core/instance" |
3292 | "launchpad.net/juju-core/names" |
3293 | "launchpad.net/juju-core/state/api/params" |
3294 | |
3295 | === modified file 'state/unit_test.go' |
3296 | --- state/unit_test.go 2014-04-14 12:36:13 +0000 |
3297 | +++ state/unit_test.go 2014-05-15 02:28:23 +0000 |
3298 | @@ -6,11 +6,11 @@ |
3299 | import ( |
3300 | "strconv" |
3301 | |
3302 | + "github.com/juju/errors" |
3303 | jc "github.com/juju/testing/checkers" |
3304 | gc "launchpad.net/gocheck" |
3305 | |
3306 | "launchpad.net/juju-core/charm" |
3307 | - "launchpad.net/juju-core/errors" |
3308 | "launchpad.net/juju-core/instance" |
3309 | "launchpad.net/juju-core/state" |
3310 | "launchpad.net/juju-core/state/api/params" |
3311 | |
3312 | === modified file 'state/user.go' |
3313 | --- state/user.go 2014-03-28 12:28:30 +0000 |
3314 | +++ state/user.go 2014-05-15 02:28:23 +0000 |
3315 | @@ -4,11 +4,11 @@ |
3316 | "fmt" |
3317 | "regexp" |
3318 | |
3319 | + "github.com/juju/errors" |
3320 | "labix.org/v2/mgo" |
3321 | "labix.org/v2/mgo/bson" |
3322 | "labix.org/v2/mgo/txn" |
3323 | |
3324 | - "launchpad.net/juju-core/errors" |
3325 | "launchpad.net/juju-core/names" |
3326 | "launchpad.net/juju-core/utils" |
3327 | ) |
3328 | |
3329 | === modified file 'state/watcher.go' |
3330 | --- state/watcher.go 2014-04-30 23:18:40 +0000 |
3331 | +++ state/watcher.go 2014-05-15 02:28:23 +0000 |
3332 | @@ -9,13 +9,13 @@ |
3333 | "strings" |
3334 | "time" |
3335 | |
3336 | + "github.com/juju/errors" |
3337 | "github.com/juju/loggo" |
3338 | "labix.org/v2/mgo" |
3339 | "labix.org/v2/mgo/bson" |
3340 | "launchpad.net/tomb" |
3341 | |
3342 | "launchpad.net/juju-core/environs/config" |
3343 | - "launchpad.net/juju-core/errors" |
3344 | "launchpad.net/juju-core/instance" |
3345 | "launchpad.net/juju-core/names" |
3346 | "launchpad.net/juju-core/state/api/params" |
3347 | |
3348 | === modified file 'worker/authenticationworker/worker.go' |
3349 | --- worker/authenticationworker/worker.go 2014-04-17 03:41:32 +0000 |
3350 | +++ worker/authenticationworker/worker.go 2014-05-15 02:28:23 +0000 |
3351 | @@ -6,11 +6,11 @@ |
3352 | import ( |
3353 | "strings" |
3354 | |
3355 | + "github.com/juju/errors" |
3356 | "github.com/juju/loggo" |
3357 | "launchpad.net/tomb" |
3358 | |
3359 | "launchpad.net/juju-core/agent" |
3360 | - "launchpad.net/juju-core/errors" |
3361 | "launchpad.net/juju-core/state/api/keyupdater" |
3362 | "launchpad.net/juju-core/state/api/watcher" |
3363 | "launchpad.net/juju-core/utils/set" |
3364 | |
3365 | === modified file 'worker/deployer/deployer_test.go' |
3366 | --- worker/deployer/deployer_test.go 2014-04-14 12:36:13 +0000 |
3367 | +++ worker/deployer/deployer_test.go 2014-05-15 02:28:23 +0000 |
3368 | @@ -9,9 +9,9 @@ |
3369 | stdtesting "testing" |
3370 | "time" |
3371 | |
3372 | + "github.com/juju/errors" |
3373 | gc "launchpad.net/gocheck" |
3374 | |
3375 | - "launchpad.net/juju-core/errors" |
3376 | jujutesting "launchpad.net/juju-core/juju/testing" |
3377 | "launchpad.net/juju-core/state" |
3378 | "launchpad.net/juju-core/state/api" |
3379 | |
3380 | === modified file 'worker/firewaller/firewaller.go' |
3381 | --- worker/firewaller/firewaller.go 2014-04-30 23:18:40 +0000 |
3382 | +++ worker/firewaller/firewaller.go 2014-05-15 02:28:23 +0000 |
3383 | @@ -4,7 +4,7 @@ |
3384 | package firewaller |
3385 | |
3386 | import ( |
3387 | - "github.com/errgo/errgo" |
3388 | + "github.com/juju/errors" |
3389 | "github.com/juju/loggo" |
3390 | "launchpad.net/tomb" |
3391 | |
3392 | @@ -122,7 +122,7 @@ |
3393 | case change := <-fw.portsChange: |
3394 | change.unitd.ports = change.ports |
3395 | if err := fw.flushUnits([]*unitData{change.unitd}); err != nil { |
3396 | - return errgo.Annotate(err, "cannot change firewall ports") |
3397 | + return errors.Annotate(err, "cannot change firewall ports") |
3398 | } |
3399 | case change := <-fw.exposedChange: |
3400 | change.serviced.exposed = change.exposed |
3401 | @@ -131,7 +131,7 @@ |
3402 | unitds = append(unitds, unitd) |
3403 | } |
3404 | if err := fw.flushUnits(unitds); err != nil { |
3405 | - return errgo.Annotate(err, "cannot change firewall ports") |
3406 | + return errors.Annotate(err, "cannot change firewall ports") |
3407 | } |
3408 | } |
3409 | } |
3410 | @@ -157,7 +157,7 @@ |
3411 | if params.IsCodeNotFound(err) { |
3412 | return nil |
3413 | } else if err != nil { |
3414 | - return errgo.Annotate(err, "cannot watch machine units") |
3415 | + return errors.Annotate(err, "cannot watch machine units") |
3416 | } |
3417 | unitw, err := m.WatchUnits() |
3418 | if err != nil { |
3419 | @@ -177,7 +177,7 @@ |
3420 | if err != nil { |
3421 | stop("units watcher", unitw) |
3422 | delete(fw.machineds, tag) |
3423 | - return errgo.Annotatef(err, "cannot respond to units changes for %q", tag) |
3424 | + return errors.Annotatef(err, "cannot respond to units changes for %q", tag) |
3425 | } |
3426 | } |
3427 | go machined.watchLoop(unitw) |
3428 | @@ -374,7 +374,7 @@ |
3429 | } |
3430 | } |
3431 | if err := fw.flushUnits(changed); err != nil { |
3432 | - return errgo.Annotate(err, "cannot change firewall ports") |
3433 | + return errors.Annotate(err, "cannot change firewall ports") |
3434 | } |
3435 | return nil |
3436 | } |
3437 | |
3438 | === modified file 'worker/instancepoller/aggregate.go' |
3439 | --- worker/instancepoller/aggregate.go 2014-03-13 17:32:36 +0000 |
3440 | +++ worker/instancepoller/aggregate.go 2014-05-15 02:28:23 +0000 |
3441 | @@ -6,11 +6,11 @@ |
3442 | import ( |
3443 | "time" |
3444 | |
3445 | + "github.com/juju/errors" |
3446 | "github.com/juju/ratelimit" |
3447 | "launchpad.net/tomb" |
3448 | |
3449 | "launchpad.net/juju-core/environs" |
3450 | - "launchpad.net/juju-core/errors" |
3451 | "launchpad.net/juju-core/instance" |
3452 | ) |
3453 | |
3454 | |
3455 | === modified file 'worker/instancepoller/aggregate_test.go' |
3456 | --- worker/instancepoller/aggregate_test.go 2014-04-15 18:51:24 +0000 |
3457 | +++ worker/instancepoller/aggregate_test.go 2014-05-15 02:28:23 +0000 |
3458 | @@ -9,11 +9,11 @@ |
3459 | "sync/atomic" |
3460 | "time" |
3461 | |
3462 | + "github.com/juju/errors" |
3463 | jc "github.com/juju/testing/checkers" |
3464 | gc "launchpad.net/gocheck" |
3465 | |
3466 | "launchpad.net/juju-core/environs" |
3467 | - "launchpad.net/juju-core/errors" |
3468 | "launchpad.net/juju-core/instance" |
3469 | "launchpad.net/juju-core/testing/testbase" |
3470 | ) |
3471 | @@ -163,7 +163,8 @@ |
3472 | aggregator := newAggregator(testGetter) |
3473 | _, err := aggregator.instanceInfo("foo") |
3474 | |
3475 | - c.Assert(err, gc.DeepEquals, errors.NotFoundf("instance foo")) |
3476 | + c.Assert(err, gc.ErrorMatches, "instance foo not found") |
3477 | + c.Assert(err, jc.Satisfies, errors.IsNotFound) |
3478 | } |
3479 | |
3480 | func (s *aggregateSuite) TestAddressesError(c *gc.C) { |
3481 | |
3482 | === modified file 'worker/instancepoller/machine_test.go' |
3483 | --- worker/instancepoller/machine_test.go 2014-05-08 06:58:42 +0000 |
3484 | +++ worker/instancepoller/machine_test.go 2014-05-15 02:28:23 +0000 |
3485 | @@ -13,10 +13,10 @@ |
3486 | "sync/atomic" |
3487 | "time" |
3488 | |
3489 | + "github.com/juju/errors" |
3490 | jc "github.com/juju/testing/checkers" |
3491 | gc "launchpad.net/gocheck" |
3492 | |
3493 | - "launchpad.net/juju-core/errors" |
3494 | "launchpad.net/juju-core/instance" |
3495 | "launchpad.net/juju-core/state" |
3496 | "launchpad.net/juju-core/state/api/params" |
3497 | |
3498 | === modified file 'worker/instancepoller/updater.go' |
3499 | --- worker/instancepoller/updater.go 2014-05-08 06:58:42 +0000 |
3500 | +++ worker/instancepoller/updater.go 2014-05-15 02:28:23 +0000 |
3501 | @@ -7,9 +7,9 @@ |
3502 | "fmt" |
3503 | "time" |
3504 | |
3505 | + "github.com/juju/errors" |
3506 | "github.com/juju/loggo" |
3507 | |
3508 | - "launchpad.net/juju-core/errors" |
3509 | "launchpad.net/juju-core/instance" |
3510 | "launchpad.net/juju-core/state" |
3511 | "launchpad.net/juju-core/state/api/params" |
3512 | |
3513 | === modified file 'worker/peergrouper/mock_test.go' |
3514 | --- worker/peergrouper/mock_test.go 2014-04-17 16:13:09 +0000 |
3515 | +++ worker/peergrouper/mock_test.go 2014-05-15 02:28:23 +0000 |
3516 | @@ -12,9 +12,9 @@ |
3517 | "strconv" |
3518 | "sync" |
3519 | |
3520 | + "github.com/juju/errors" |
3521 | "launchpad.net/tomb" |
3522 | |
3523 | - "launchpad.net/juju-core/errors" |
3524 | "launchpad.net/juju-core/instance" |
3525 | "launchpad.net/juju-core/replicaset" |
3526 | "launchpad.net/juju-core/state" |
3527 | |
3528 | === modified file 'worker/peergrouper/worker.go' |
3529 | --- worker/peergrouper/worker.go 2014-04-17 17:30:48 +0000 |
3530 | +++ worker/peergrouper/worker.go 2014-05-15 02:28:23 +0000 |
3531 | @@ -8,10 +8,10 @@ |
3532 | "sync" |
3533 | "time" |
3534 | |
3535 | + "github.com/juju/errors" |
3536 | "launchpad.net/tomb" |
3537 | |
3538 | "launchpad.net/juju-core/agent/mongo" |
3539 | - "launchpad.net/juju-core/errors" |
3540 | "launchpad.net/juju-core/instance" |
3541 | "launchpad.net/juju-core/replicaset" |
3542 | "launchpad.net/juju-core/state" |
3543 | |
3544 | === modified file 'worker/provisioner/kvm-broker_test.go' |
3545 | --- worker/provisioner/kvm-broker_test.go 2014-05-14 02:59:53 +0000 |
3546 | +++ worker/provisioner/kvm-broker_test.go 2014-05-15 02:28:23 +0000 |
3547 | @@ -8,6 +8,7 @@ |
3548 | "path/filepath" |
3549 | "time" |
3550 | |
3551 | + "github.com/juju/errors" |
3552 | jc "github.com/juju/testing/checkers" |
3553 | gc "launchpad.net/gocheck" |
3554 | |
3555 | @@ -17,7 +18,6 @@ |
3556 | "launchpad.net/juju-core/container/kvm/mock" |
3557 | kvmtesting "launchpad.net/juju-core/container/kvm/testing" |
3558 | "launchpad.net/juju-core/environs" |
3559 | - "launchpad.net/juju-core/errors" |
3560 | "launchpad.net/juju-core/instance" |
3561 | instancetest "launchpad.net/juju-core/instance/testing" |
3562 | jujutesting "launchpad.net/juju-core/juju/testing" |
3563 | |
3564 | === modified file 'worker/provisioner/lxc-broker_test.go' |
3565 | --- worker/provisioner/lxc-broker_test.go 2014-05-14 02:59:53 +0000 |
3566 | +++ worker/provisioner/lxc-broker_test.go 2014-05-15 02:28:23 +0000 |
3567 | @@ -9,6 +9,7 @@ |
3568 | "path/filepath" |
3569 | "time" |
3570 | |
3571 | + "github.com/juju/errors" |
3572 | jc "github.com/juju/testing/checkers" |
3573 | gc "launchpad.net/gocheck" |
3574 | |
3575 | @@ -18,7 +19,6 @@ |
3576 | "launchpad.net/juju-core/container/lxc/mock" |
3577 | lxctesting "launchpad.net/juju-core/container/lxc/testing" |
3578 | "launchpad.net/juju-core/environs" |
3579 | - "launchpad.net/juju-core/errors" |
3580 | "launchpad.net/juju-core/instance" |
3581 | instancetest "launchpad.net/juju-core/instance/testing" |
3582 | jujutesting "launchpad.net/juju-core/juju/testing" |
3583 | |
3584 | === modified file 'worker/provisioner/provisioner.go' |
3585 | --- worker/provisioner/provisioner.go 2014-04-14 12:36:13 +0000 |
3586 | +++ worker/provisioner/provisioner.go 2014-05-15 02:28:23 +0000 |
3587 | @@ -6,13 +6,13 @@ |
3588 | import ( |
3589 | "sync" |
3590 | |
3591 | + "github.com/juju/errors" |
3592 | "github.com/juju/loggo" |
3593 | "launchpad.net/tomb" |
3594 | |
3595 | "launchpad.net/juju-core/agent" |
3596 | "launchpad.net/juju-core/environs" |
3597 | "launchpad.net/juju-core/environs/config" |
3598 | - "launchpad.net/juju-core/errors" |
3599 | "launchpad.net/juju-core/instance" |
3600 | apiprovisioner "launchpad.net/juju-core/state/api/provisioner" |
3601 | apiwatcher "launchpad.net/juju-core/state/api/watcher" |
3602 | |
3603 | === modified file 'worker/provisioner/provisioner_test.go' |
3604 | --- worker/provisioner/provisioner_test.go 2014-05-13 11:37:40 +0000 |
3605 | +++ worker/provisioner/provisioner_test.go 2014-05-15 02:28:23 +0000 |
3606 | @@ -8,6 +8,7 @@ |
3607 | "strings" |
3608 | "time" |
3609 | |
3610 | + "github.com/juju/errors" |
3611 | jc "github.com/juju/testing/checkers" |
3612 | gc "launchpad.net/gocheck" |
3613 | |
3614 | @@ -17,7 +18,6 @@ |
3615 | "launchpad.net/juju-core/environs/network" |
3616 | "launchpad.net/juju-core/environs/simplestreams" |
3617 | "launchpad.net/juju-core/environs/tools" |
3618 | - "launchpad.net/juju-core/errors" |
3619 | "launchpad.net/juju-core/instance" |
3620 | "launchpad.net/juju-core/juju/testing" |
3621 | "launchpad.net/juju-core/names" |
3622 | |
3623 | === modified file 'worker/rsyslog/worker.go' |
3624 | --- worker/rsyslog/worker.go 2014-04-24 11:55:01 +0000 |
3625 | +++ worker/rsyslog/worker.go 2014-05-15 02:28:23 +0000 |
3626 | @@ -10,7 +10,7 @@ |
3627 | "strconv" |
3628 | "time" |
3629 | |
3630 | - "github.com/errgo/errgo" |
3631 | + "github.com/juju/errors" |
3632 | "github.com/juju/loggo" |
3633 | |
3634 | "launchpad.net/juju-core/agent" |
3635 | @@ -122,7 +122,7 @@ |
3636 | func (h *RsyslogConfigHandler) SetUp() (watcher.NotifyWatcher, error) { |
3637 | if h.mode == RsyslogModeAccumulate { |
3638 | if err := h.ensureCertificates(); err != nil { |
3639 | - return nil, errgo.Annotate(err, "failed to write rsyslog certificates") |
3640 | + return nil, errors.Annotate(err, "failed to write rsyslog certificates") |
3641 | } |
3642 | } |
3643 | return h.st.WatchForEnvironConfigChanges() |
3644 | @@ -140,7 +140,7 @@ |
3645 | func (h *RsyslogConfigHandler) Handle() error { |
3646 | cfg, err := h.st.EnvironConfig() |
3647 | if err != nil { |
3648 | - return errgo.Annotate(err, "cannot get environ config") |
3649 | + return errors.Annotate(err, "cannot get environ config") |
3650 | } |
3651 | rsyslogCACert := cfg.RsyslogCACert() |
3652 | if rsyslogCACert == "" { |
3653 | @@ -154,20 +154,20 @@ |
3654 | h.syslogConfig.Port = cfg.SyslogPort() |
3655 | if h.mode == RsyslogModeForwarding { |
3656 | if err := writeFileAtomic(h.syslogConfig.CACertPath(), []byte(rsyslogCACert), 0644, 0, 0); err != nil { |
3657 | - return errgo.Annotate(err, "cannot write CA certificate") |
3658 | + return errors.Annotate(err, "cannot write CA certificate") |
3659 | } |
3660 | } |
3661 | data, err := h.syslogConfig.Render() |
3662 | if err != nil { |
3663 | - return errgo.Annotate(err, "failed to render rsyslog configuration file") |
3664 | + return errors.Annotate(err, "failed to render rsyslog configuration file") |
3665 | } |
3666 | if err := writeFileAtomic(h.syslogConfig.ConfigFilePath(), []byte(data), 0644, 0, 0); err != nil { |
3667 | - return errgo.Annotate(err, "failed to write rsyslog configuration file") |
3668 | + return errors.Annotate(err, "failed to write rsyslog configuration file") |
3669 | } |
3670 | logger.Debugf("Reloading rsyslog configuration") |
3671 | if err := restartRsyslog(); err != nil { |
3672 | logger.Errorf("failed to reload rsyslog configuration") |
3673 | - return errgo.Annotate(err, "cannot restart rsyslog") |
3674 | + return errors.Annotate(err, "cannot restart rsyslog") |
3675 | } |
3676 | // Record config values so we don't try again. |
3677 | // Do this last so we recover from intermittent |
3678 | |
3679 | === modified file 'worker/uniter/charm/bundles.go' |
3680 | --- worker/uniter/charm/bundles.go 2014-04-17 12:47:50 +0000 |
3681 | +++ worker/uniter/charm/bundles.go 2014-05-15 02:28:23 +0000 |
3682 | @@ -8,9 +8,10 @@ |
3683 | "os" |
3684 | "path" |
3685 | |
3686 | + "github.com/juju/errors" |
3687 | + |
3688 | "launchpad.net/juju-core/charm" |
3689 | "launchpad.net/juju-core/downloader" |
3690 | - "launchpad.net/juju-core/errors" |
3691 | "launchpad.net/juju-core/utils" |
3692 | ) |
3693 | |
3694 | |
3695 | === modified file 'worker/uniter/relation/relation.go' |
3696 | --- worker/uniter/relation/relation.go 2014-04-17 12:47:50 +0000 |
3697 | +++ worker/uniter/relation/relation.go 2014-05-15 02:28:23 +0000 |
3698 | @@ -13,8 +13,9 @@ |
3699 | "strconv" |
3700 | "strings" |
3701 | |
3702 | + "github.com/juju/errors" |
3703 | + |
3704 | "launchpad.net/juju-core/charm/hooks" |
3705 | - "launchpad.net/juju-core/errors" |
3706 | "launchpad.net/juju-core/utils" |
3707 | "launchpad.net/juju-core/worker/uniter/hook" |
3708 | ) |
3709 | |
3710 | === modified file 'worker/uniter/relationer_test.go' |
3711 | --- worker/uniter/relationer_test.go 2014-04-14 12:36:13 +0000 |
3712 | +++ worker/uniter/relationer_test.go 2014-05-15 02:28:23 +0000 |
3713 | @@ -8,11 +8,11 @@ |
3714 | "strings" |
3715 | "time" |
3716 | |
3717 | + "github.com/juju/errors" |
3718 | jc "github.com/juju/testing/checkers" |
3719 | gc "launchpad.net/gocheck" |
3720 | |
3721 | "launchpad.net/juju-core/charm/hooks" |
3722 | - "launchpad.net/juju-core/errors" |
3723 | "launchpad.net/juju-core/instance" |
3724 | jujutesting "launchpad.net/juju-core/juju/testing" |
3725 | "launchpad.net/juju-core/state" |
3726 | |
3727 | === modified file 'worker/uniter/state.go' |
3728 | --- worker/uniter/state.go 2014-04-17 12:47:50 +0000 |
3729 | +++ worker/uniter/state.go 2014-05-15 02:28:23 +0000 |
3730 | @@ -4,12 +4,12 @@ |
3731 | package uniter |
3732 | |
3733 | import ( |
3734 | - "errors" |
3735 | "fmt" |
3736 | "os" |
3737 | |
3738 | + "github.com/juju/errors" |
3739 | + |
3740 | "launchpad.net/juju-core/charm" |
3741 | - coreerrors "launchpad.net/juju-core/errors" |
3742 | "launchpad.net/juju-core/utils" |
3743 | uhook "launchpad.net/juju-core/worker/uniter/hook" |
3744 | ) |
3745 | @@ -75,7 +75,7 @@ |
3746 | |
3747 | // validate returns an error if the state violates expectations. |
3748 | func (st State) validate() (err error) { |
3749 | - defer coreerrors.Maskf(&err, "invalid uniter state") |
3750 | + defer errors.Maskf(&err, "invalid uniter state") |
3751 | hasHook := st.Hook != nil |
3752 | hasCharm := st.CharmURL != nil |
3753 | switch st.Op { |
3754 | |
3755 | === modified file 'worker/uniter/uniter_test.go' |
3756 | --- worker/uniter/uniter_test.go 2014-05-13 23:18:30 +0000 |
3757 | +++ worker/uniter/uniter_test.go 2014-05-15 02:28:23 +0000 |
3758 | @@ -17,6 +17,7 @@ |
3759 | stdtesting "testing" |
3760 | "time" |
3761 | |
3762 | + "github.com/juju/errors" |
3763 | gt "github.com/juju/testing" |
3764 | jc "github.com/juju/testing/checkers" |
3765 | gc "launchpad.net/gocheck" |
3766 | @@ -24,7 +25,6 @@ |
3767 | |
3768 | "launchpad.net/juju-core/agent/tools" |
3769 | corecharm "launchpad.net/juju-core/charm" |
3770 | - "launchpad.net/juju-core/errors" |
3771 | "launchpad.net/juju-core/instance" |
3772 | "launchpad.net/juju-core/juju/osenv" |
3773 | "launchpad.net/juju-core/juju/testing" |
3774 | |
3775 | === modified file 'worker/upgrader/upgrader_test.go' |
3776 | --- worker/upgrader/upgrader_test.go 2014-04-14 12:36:13 +0000 |
3777 | +++ worker/upgrader/upgrader_test.go 2014-05-15 02:28:23 +0000 |
3778 | @@ -10,6 +10,7 @@ |
3779 | stdtesting "testing" |
3780 | "time" |
3781 | |
3782 | + "github.com/juju/errors" |
3783 | gc "launchpad.net/gocheck" |
3784 | coretesting "launchpad.net/juju-core/testing" |
3785 | |
3786 | @@ -18,7 +19,6 @@ |
3787 | agenttools "launchpad.net/juju-core/agent/tools" |
3788 | envtesting "launchpad.net/juju-core/environs/testing" |
3789 | envtools "launchpad.net/juju-core/environs/tools" |
3790 | - "launchpad.net/juju-core/errors" |
3791 | jujutesting "launchpad.net/juju-core/juju/testing" |
3792 | "launchpad.net/juju-core/provider/dummy" |
3793 | "launchpad.net/juju-core/state" |
Reviewers: mp+219608_ code.launchpad. net,
Message:
Please take a look.
Description: com/juju/ errors
Extract errors package to github.
Also introduces a dependency on github. com/juju/ errgo com/errgo/ errgo dependency.
and removes the github.
Adds additional functions for simple tracing and
annotations of errors.
https:/ /code.launchpad .net/~thumper/ juju-core/ juju-errors/ +merge/ 219608
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/93410043/
Affected files (+254, -658 lines): toolsdir. go bootstrap_ test.go debuglog. go debuglog_ test.go deploy_ test.go destroyenvironm ent_test. go removemachine_ test.go bootstrap_ test.go machine. go machine_ test.go constraints. go kvm/container. go kvm/kvm. go lxc/instance. go bootstrap/ state.go bootstrap/ synctools. go cloudinit. go cloudinit/ cloudinit. go config/ config. go configstore/ disk.go configstore/ disk_test. go configstore/ mem.go emptystorage. go emptystorage_ test.go filestorage/ filestorage. go filestorage/ filestorage_ test.go httpstorage/ storage. go httpstorage/ storage_ test.go imagemetadata/ generate. go jujutest/ livetests. go jujutest/ tests.go open_test. go simplestreams/ datasource. go simplestreams/ simplestreams. go sshstorage/ storage. go sshstorage/ storage_ test.go tools/simplestr eams.go tools/tools. go tools/tools_ test.go errors_ test.go test.go azure/certfile. go azure/environ. go azure/instance. go azure/instancet ype.go azure/storage. go azure/storage_ test.go common/ destroy_ test.go dummy/storage. go ec2/storage. go joyent/ environ_ instance. go joyent/ storage. go joyent/ storage_ test.go local/environ. go local/instance. go maas/environ. go maas/environ_ whitebox_ test.go maas/storage. go maas/storage_ test.go manual/ environ. go openstack/ provider. go openstack/ storage. go agent/machine_ test.go machiner/ machiner_ test.go provisioner/ provisioner_ test.go uniter/ unit_test. go upgrader/ unitupgrader_ test.go
A [revision details]
M agent/agent.go
M agent/tools/
M cert/cert.go
M cmd/juju/
M cmd/juju/common.go
M cmd/juju/
M cmd/juju/
M cmd/juju/
M cmd/juju/
M cmd/juju/
M cmd/jujud/agent.go
M cmd/jujud/
M cmd/jujud/
M cmd/jujud/
M constraints/
M container/
M container/
M container/
M dependencies.tsv
M environs/
M environs/
M environs/
M environs/
M environs/config.go
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/open.go
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
M environs/
D errors/errors.go
D errors/
M juju/api.go
M juju/apiconn_
M juju/conn.go
M juju/conn_test.go
M provider/
M provider/
M provider/
M provider/
M provider/
M provider/
M provider/
M provider/
M provider/ec2/ec2.go
M provider/
M provider/
M provider/
M provider/
M provider/
M provider/
M provider/
M provider/
M provider/
M provider/
M provider/
M provider/
M provider/
M state/addmachine.go
M state/annotator.go
M state/api/
M state/api/client.go
M state/api/
M state/api/
M state/api/
M state/api/
...