diff --git a/api/action/client.go b/api/action/client.go index 4a4830c2196b..15b105655f93 100644 --- a/api/action/client.go +++ b/api/action/client.go @@ -5,7 +5,7 @@ package action import ( "github.com/juju/errors" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api/base" "github.com/juju/juju/apiserver/params" diff --git a/api/action/client_test.go b/api/action/client_test.go index 783402076741..db9656fc7ba2 100644 --- a/api/action/client_test.go +++ b/api/action/client_test.go @@ -9,7 +9,7 @@ import ( "github.com/juju/names" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api/action" "github.com/juju/juju/apiserver/params" diff --git a/api/apiclient_test.go b/api/apiclient_test.go index af643689aebb..6a610cf54bf4 100644 --- a/api/apiclient_test.go +++ b/api/apiclient_test.go @@ -10,12 +10,11 @@ import ( "net" "strconv" - "golang.org/x/net/websocket" - "github.com/juju/names" jc "github.com/juju/testing/checkers" "github.com/juju/utils" "github.com/juju/utils/parallel" + "golang.org/x/net/websocket" gc "gopkg.in/check.v1" "github.com/juju/juju/api" diff --git a/api/base/testing/apicaller.go b/api/base/testing/apicaller.go index c3526146aee0..20594d0340a4 100644 --- a/api/base/testing/apicaller.go +++ b/api/base/testing/apicaller.go @@ -4,12 +4,12 @@ package testing import ( + "github.com/juju/names" + "github.com/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" "github.com/juju/juju/api/base" - "github.com/juju/names" - "github.com/juju/testing" ) // APICallerFunc is a function type that implements APICaller. diff --git a/api/charmrevisionupdater/updater_test.go b/api/charmrevisionupdater/updater_test.go index f9e2912480c3..530f4d1ffd38 100644 --- a/api/charmrevisionupdater/updater_test.go +++ b/api/charmrevisionupdater/updater_test.go @@ -7,7 +7,7 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api/charmrevisionupdater" "github.com/juju/juju/apiserver/charmrevisionupdater/testing" diff --git a/api/charms/client.go b/api/charms/client.go index bfb86c32a81c..d151ca9fc091 100644 --- a/api/charms/client.go +++ b/api/charms/client.go @@ -5,7 +5,7 @@ package charms import ( "github.com/juju/errors" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api/base" "github.com/juju/juju/apiserver/params" diff --git a/api/client.go b/api/client.go index 6dc32c80936b..7054eadf2c33 100644 --- a/api/client.go +++ b/api/client.go @@ -22,7 +22,7 @@ import ( "github.com/juju/names" "github.com/juju/utils" "golang.org/x/net/websocket" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "gopkg.in/macaroon.v1" "github.com/juju/juju/api/base" diff --git a/api/client_test.go b/api/client_test.go index 240501e6fd38..cf322355d18c 100644 --- a/api/client_test.go +++ b/api/client_test.go @@ -22,7 +22,7 @@ import ( jc "github.com/juju/testing/checkers" "golang.org/x/net/websocket" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api" "github.com/juju/juju/apiserver/params" diff --git a/api/uniter/charm.go b/api/uniter/charm.go index f2b313e83fde..7d1062bc7c50 100644 --- a/api/uniter/charm.go +++ b/api/uniter/charm.go @@ -8,7 +8,7 @@ import ( "net/url" "github.com/juju/errors" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/apiserver/params" ) diff --git a/api/uniter/endpoint.go b/api/uniter/endpoint.go index ecf6f652d9f7..68dfa22cafed 100644 --- a/api/uniter/endpoint.go +++ b/api/uniter/endpoint.go @@ -4,7 +4,7 @@ package uniter import ( - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" ) // Endpoint represents one endpoint of a relation. It is just a wrapper diff --git a/api/uniter/relation_test.go b/api/uniter/relation_test.go index ef65442a8727..1c34f6bb5fe5 100644 --- a/api/uniter/relation_test.go +++ b/api/uniter/relation_test.go @@ -7,7 +7,7 @@ import ( "github.com/juju/names" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api/uniter" "github.com/juju/juju/apiserver/params" diff --git a/api/uniter/relationunit_test.go b/api/uniter/relationunit_test.go index 4924fc0be19f..14d5e8522d9e 100644 --- a/api/uniter/relationunit_test.go +++ b/api/uniter/relationunit_test.go @@ -7,7 +7,7 @@ import ( "github.com/juju/names" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api/uniter" "github.com/juju/juju/apiserver/params" diff --git a/api/uniter/service.go b/api/uniter/service.go index b7f991602b13..75378ec715db 100644 --- a/api/uniter/service.go +++ b/api/uniter/service.go @@ -8,7 +8,7 @@ import ( "github.com/juju/errors" "github.com/juju/names" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api/common" "github.com/juju/juju/api/watcher" diff --git a/api/uniter/unit.go b/api/uniter/unit.go index a3d913ce7cf0..14960d6a622f 100644 --- a/api/uniter/unit.go +++ b/api/uniter/unit.go @@ -8,7 +8,7 @@ import ( "github.com/juju/errors" "github.com/juju/names" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api/common" "github.com/juju/juju/api/watcher" diff --git a/api/uniter/unit_test.go b/api/uniter/unit_test.go index 5539b6acc014..8ab5fead0892 100644 --- a/api/uniter/unit_test.go +++ b/api/uniter/unit_test.go @@ -12,7 +12,7 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api" "github.com/juju/juju/api/base" diff --git a/api/uniter/uniter.go b/api/uniter/uniter.go index c0483617e608..12cce67e1bb2 100644 --- a/api/uniter/uniter.go +++ b/api/uniter/uniter.go @@ -8,7 +8,7 @@ import ( "github.com/juju/errors" "github.com/juju/names" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api/base" "github.com/juju/juju/api/common" diff --git a/apiserver/action/action_test.go b/apiserver/action/action_test.go index d59a3fc3be4c..8d463cc216bf 100644 --- a/apiserver/action/action_test.go +++ b/apiserver/action/action_test.go @@ -10,7 +10,7 @@ import ( "github.com/juju/names" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/apiserver/action" "github.com/juju/juju/apiserver/common" diff --git a/apiserver/addresser/addresser_test.go b/apiserver/addresser/addresser_test.go index d4bb539159d2..6df1a796c494 100644 --- a/apiserver/addresser/addresser_test.go +++ b/apiserver/addresser/addresser_test.go @@ -5,6 +5,7 @@ package addresser_test import ( "github.com/juju/errors" + jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" diff --git a/apiserver/addresser/mock_test.go b/apiserver/addresser/mock_test.go index 09db89292ad7..2441ae805c0f 100644 --- a/apiserver/addresser/mock_test.go +++ b/apiserver/addresser/mock_test.go @@ -7,12 +7,11 @@ import ( "sort" "sync" - gc "gopkg.in/check.v1" - "github.com/juju/errors" "github.com/juju/names" "github.com/juju/testing" jujutxn "github.com/juju/txn" + gc "gopkg.in/check.v1" "github.com/juju/juju/apiserver/addresser" "github.com/juju/juju/environs" diff --git a/apiserver/adminv2_test.go b/apiserver/adminv2_test.go index bf769818b225..b893efb3996f 100644 --- a/apiserver/adminv2_test.go +++ b/apiserver/adminv2_test.go @@ -4,11 +4,11 @@ package apiserver_test import ( - "github.com/juju/juju/api" "github.com/juju/names" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" + "github.com/juju/juju/api" "github.com/juju/juju/apiserver" "github.com/juju/juju/testing/factory" ) diff --git a/apiserver/charmrevisionupdater/testing/suite.go b/apiserver/charmrevisionupdater/testing/suite.go index 46e0bd1cdeb3..5e44adfb55a9 100644 --- a/apiserver/charmrevisionupdater/testing/suite.go +++ b/apiserver/charmrevisionupdater/testing/suite.go @@ -5,13 +5,14 @@ package testing import ( "fmt" + "net/http/httptest" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/charmrepo" - "gopkg.in/juju/charmstore.v4" - "gopkg.in/juju/charmstore.v4/charmstoretesting" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charmrepo.v1" + "gopkg.in/juju/charmrepo.v1/csclient" + "gopkg.in/juju/charmstore.v5-unstable" "github.com/juju/juju/apiserver/charmrevisionupdater" jujutesting "github.com/juju/juju/juju/testing" @@ -25,8 +26,10 @@ import ( type CharmSuite struct { jcSuite *jujutesting.JujuConnSuite - Server *charmstoretesting.Server - charms map[string]*state.Charm + Handler charmstore.HTTPCloseHandler + Server *httptest.Server + Client *csclient.Client + charms map[string]*state.Charm } func (s *CharmSuite) SetUpSuite(c *gc.C, jcSuite *jujutesting.JujuConnSuite) { @@ -36,33 +39,42 @@ func (s *CharmSuite) SetUpSuite(c *gc.C, jcSuite *jujutesting.JujuConnSuite) { func (s *CharmSuite) TearDownSuite(c *gc.C) {} func (s *CharmSuite) SetUpTest(c *gc.C) { - s.Server = charmstoretesting.OpenServer(c, s.jcSuite.Session, charmstore.ServerParams{ + db := s.jcSuite.Session.DB("juju-testing") + params := charmstore.ServerParams{ AuthUsername: "test-user", AuthPassword: "test-password", + } + handler, err := charmstore.NewServer(db, nil, "", params, charmstore.V4) + c.Assert(err, jc.ErrorIsNil) + s.Handler = handler + s.Server = httptest.NewServer(handler) + s.Client = csclient.New(csclient.Params{ + URL: s.Server.URL, + User: params.AuthUsername, + Password: params.AuthPassword, }) - urls := []string{ - "~who/quantal/mysql-23", - "~who/quantal/dummy-24", - "~who/quantal/riak-25", - "~who/quantal/wordpress-26", - "~who/quantal/logging-27", + urls := map[string]string{ + "mysql": "quantal/mysql-23", + "dummy": "quantal/dummy-24", + "riak": "quantal/riak-25", + "wordpress": "quantal/wordpress-26", + "logging": "quantal/logging-27", } - for _, url := range urls { - id := charm.MustParseReference(url) - ch := testcharms.Repo.CharmArchive(c.MkDir(), id.Name) - s.Server.UploadCharm(c, ch, id, true) + for name, url := range urls { + testcharms.UploadCharm(c, s.Client, url, name) } s.jcSuite.PatchValue(&charmrepo.CacheDir, c.MkDir()) // Patch the charm repo initializer function: it is replaced with a charm // store repo pointing to the testing server. s.jcSuite.PatchValue(&charmrevisionupdater.NewCharmStore, func(p charmrepo.NewCharmStoreParams) charmrepo.Interface { - p.URL = s.Server.URL() + p.URL = s.Server.URL return charmrepo.NewCharmStore(p) }) s.charms = make(map[string]*state.Charm) } func (s *CharmSuite) TearDownTest(c *gc.C) { + s.Handler.Close() s.Server.Close() } @@ -79,7 +91,6 @@ func (s *CharmSuite) AddMachine(c *gc.C, machineId string, job state.MachineJob) inst, hc := jujutesting.AssertStartInstanceWithConstraints(c, s.jcSuite.Environ, m.Id(), cons) err = m.SetProvisioned(inst.Id(), "fake_nonce", hc) c.Assert(err, jc.ErrorIsNil) - } // AddCharmWithRevision adds a charm with the specified revision to state. diff --git a/apiserver/charmrevisionupdater/updater.go b/apiserver/charmrevisionupdater/updater.go index dcb10fd914d0..b985fc227663 100644 --- a/apiserver/charmrevisionupdater/updater.go +++ b/apiserver/charmrevisionupdater/updater.go @@ -6,8 +6,8 @@ package charmrevisionupdater import ( "github.com/juju/errors" "github.com/juju/loggo" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/charmrepo" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charmrepo.v1" "github.com/juju/juju/apiserver/common" "github.com/juju/juju/apiserver/params" diff --git a/apiserver/charmrevisionupdater/updater_test.go b/apiserver/charmrevisionupdater/updater_test.go index 5753954a0f68..34860939b32c 100644 --- a/apiserver/charmrevisionupdater/updater_test.go +++ b/apiserver/charmrevisionupdater/updater_test.go @@ -10,8 +10,8 @@ import ( "github.com/juju/errors" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/charmrepo" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charmrepo.v1" "github.com/juju/juju/apiserver/charmrevisionupdater" "github.com/juju/juju/apiserver/charmrevisionupdater/testing" @@ -127,7 +127,7 @@ func (s *charmVersionSuite) TestWordpressCharmNoReadAccessIsntVisible(c *gc.C) { s.SetupScenario(c) // Disallow read access to the wordpress charm in the charm store. - err := s.Server.NewClient().Put("/quantal/wordpress/meta/perm/read", nil) + err := s.Client.Put("/quantal/wordpress/meta/perm/read", nil) c.Assert(err, jc.ErrorIsNil) // Run the revision updater and check that the public charm updates are @@ -155,7 +155,7 @@ func (s *charmVersionSuite) TestEnvironmentUUIDUsed(c *gc.C) { var header http.Header srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { header = r.Header - s.Server.Handler().ServeHTTP(w, r) + s.Handler.ServeHTTP(w, r) })) defer srv.Close() diff --git a/apiserver/charms.go b/apiserver/charms.go index 29e95e06591d..0f47653ec39f 100644 --- a/apiserver/charms.go +++ b/apiserver/charms.go @@ -23,7 +23,7 @@ import ( "github.com/juju/errors" ziputil "github.com/juju/utils/zip" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" apihttp "github.com/juju/juju/apiserver/http" "github.com/juju/juju/apiserver/params" diff --git a/apiserver/charms/client.go b/apiserver/charms/client.go index d321d91a5011..910aedd52fab 100644 --- a/apiserver/charms/client.go +++ b/apiserver/charms/client.go @@ -6,7 +6,7 @@ package charms import ( "github.com/juju/errors" "github.com/juju/utils/set" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api" "github.com/juju/juju/apiserver/common" diff --git a/apiserver/charms/client_test.go b/apiserver/charms/client_test.go index 4a63a614e117..ced40ff13731 100644 --- a/apiserver/charms/client_test.go +++ b/apiserver/charms/client_test.go @@ -6,7 +6,7 @@ package charms_test import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api" "github.com/juju/juju/apiserver/charms" @@ -97,14 +97,14 @@ func (s *baseCharmsSuite) TestClientCharmInfo(c *gc.C) { charm: "wordpress", expectedActions: &charm.Actions{ActionSpecs: nil}, url: "not-valid", - err: "charm url series is not resolved", + err: "entity url series is not resolved", }, { about: "invalid schema", charm: "wordpress", expectedActions: &charm.Actions{ActionSpecs: nil}, url: "not-valid:your-arguments", - err: `charm URL has invalid schema: "not-valid:your-arguments"`, + err: `entity URL has invalid schema: "not-valid:your-arguments"`, }, { about: "unknown charm", diff --git a/apiserver/charms/state.go b/apiserver/charms/state.go index 805ba6f3e257..fd0e2e681f1d 100644 --- a/apiserver/charms/state.go +++ b/apiserver/charms/state.go @@ -4,7 +4,7 @@ package charms import ( - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/state" ) diff --git a/apiserver/charms_test.go b/apiserver/charms_test.go index 4f57e8d957d8..be837406e369 100644 --- a/apiserver/charms_test.go +++ b/apiserver/charms_test.go @@ -17,7 +17,7 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" apihttp "github.com/juju/juju/apiserver/http" "github.com/juju/juju/apiserver/params" diff --git a/apiserver/client/client.go b/apiserver/client/client.go index 721c57d8e9f9..eb3d666cd96c 100644 --- a/apiserver/client/client.go +++ b/apiserver/client/client.go @@ -11,7 +11,7 @@ import ( "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api" "github.com/juju/juju/apiserver/common" diff --git a/apiserver/client/client_test.go b/apiserver/client/client_test.go index fa9e4a34933e..9d1e2a9cd2c1 100644 --- a/apiserver/client/client_test.go +++ b/apiserver/client/client_test.go @@ -15,8 +15,8 @@ import ( "github.com/juju/names" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/charmrepo" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charmrepo.v1" "github.com/juju/juju/agent" "github.com/juju/juju/api" @@ -1050,14 +1050,14 @@ func (s *clientSuite) TestClientCharmInfo(c *gc.C) { charm: "wordpress", expectedActions: &charm.Actions{ActionSpecs: nil}, url: "not-valid", - err: "charm url series is not resolved", + err: "entity url series is not resolved", }, { about: "invalid schema", charm: "wordpress", expectedActions: &charm.Actions{ActionSpecs: nil}, url: "not-valid:your-arguments", - err: `charm URL has invalid schema: "not-valid:your-arguments"`, + err: `entity URL has invalid schema: "not-valid:your-arguments"`, }, { about: "unknown charm", @@ -1625,10 +1625,10 @@ func (s *clientRepoSuite) TearDownTest(c *gc.C) { func (s *clientRepoSuite) TestClientServiceDeployCharmErrors(c *gc.C) { for url, expect := range map[string]string{ - "wordpress": "charm url series is not resolved", - "cs:wordpress": "charm url series is not resolved", + "wordpress": "entity url series is not resolved", + "cs:wordpress": "entity url series is not resolved", "cs:precise/wordpress": "charm url must include revision", - "cs:precise/wordpress-999999": `.* charm "cs:precise/wordpress-999999".* not found`, + "cs:precise/wordpress-999999": `cannot retrieve "cs:precise/wordpress-999999": charm not found`, } { c.Logf("test %s", url) err := s.APIState.Client().ServiceDeploy( @@ -1921,10 +1921,10 @@ func (s *clientRepoSuite) TestBlockServiceUpdateForced(c *gc.C) { func (s *clientRepoSuite) TestClientServiceUpdateSetCharmErrors(c *gc.C) { s.AddTestingService(c, "wordpress", s.AddTestingCharm(c, "wordpress")) for charmUrl, expect := range map[string]string{ - "wordpress": "charm url series is not resolved", - "cs:wordpress": "charm url series is not resolved", + "wordpress": "entity url series is not resolved", + "cs:wordpress": "entity url series is not resolved", "cs:precise/wordpress": "charm url must include revision", - "cs:precise/wordpress-999999": `cannot retrieve charm "cs:precise/wordpress-999999": charm not found`, + "cs:precise/wordpress-999999": `cannot retrieve "cs:precise/wordpress-999999": charm not found`, } { c.Logf("test %s", charmUrl) args := params.ServiceUpdate{ @@ -2209,10 +2209,10 @@ func (s *clientRepoSuite) TestClientServiceSetCharmErrors(c *gc.C) { s.AddTestingService(c, "wordpress", s.AddTestingCharm(c, "wordpress")) for url, expect := range map[string]string{ // TODO(fwereade,Makyo) make these errors consistent one day. - "wordpress": "charm url series is not resolved", - "cs:wordpress": "charm url series is not resolved", + "wordpress": "entity url series is not resolved", + "cs:wordpress": "entity url series is not resolved", "cs:precise/wordpress": "charm url must include revision", - "cs:precise/wordpress-999999": `cannot retrieve charm "cs:precise/wordpress-999999": charm not found`, + "cs:precise/wordpress-999999": `cannot retrieve "cs:precise/wordpress-999999": charm not found`, } { c.Logf("test %s", url) err := s.APIState.Client().ServiceSetCharm( @@ -3212,7 +3212,7 @@ func (s *testModeCharmRepo) WithTestMode() charmrepo.Interface { func (s *clientRepoSuite) TestClientSpecializeStoreOnDeployServiceSetCharmAndAddCharm(c *gc.C) { repo := &testModeCharmRepo{} s.PatchValue(&service.NewCharmStore, func(p charmrepo.NewCharmStoreParams) charmrepo.Interface { - p.URL = s.Srv.URL() + p.URL = s.Srv.URL repo.CharmStore = charmrepo.NewCharmStore(p).(*charmrepo.CharmStore) return repo }) @@ -3281,7 +3281,7 @@ var resolveCharmTests = []struct { }, { about: "invalid charm name", url: "cs:", - parseErr: `charm URL has invalid charm name: "cs:"`, + parseErr: `entity URL has invalid entity name: "cs:"`, }, { about: "local charm", url: "local:wordpress", diff --git a/apiserver/client/get.go b/apiserver/client/get.go index b3b3a55332b8..c5a19bef90ee 100644 --- a/apiserver/client/get.go +++ b/apiserver/client/get.go @@ -4,7 +4,7 @@ package client import ( - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/apiserver/params" "github.com/juju/juju/constraints" diff --git a/apiserver/client/get_test.go b/apiserver/client/get_test.go index da7c8856411b..45192e9bea76 100644 --- a/apiserver/client/get_test.go +++ b/apiserver/client/get_test.go @@ -8,7 +8,7 @@ import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/apiserver/params" "github.com/juju/juju/constraints" diff --git a/apiserver/client/perm_test.go b/apiserver/client/perm_test.go index a31a3f9eb67b..d2bfc9df733d 100644 --- a/apiserver/client/perm_test.go +++ b/apiserver/client/perm_test.go @@ -9,7 +9,7 @@ import ( "github.com/juju/names" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api" "github.com/juju/juju/apiserver/params" @@ -337,7 +337,7 @@ func opClientSetAnnotations(c *gc.C, st api.Connection, mst *state.State) (func( func opClientServiceDeploy(c *gc.C, st api.Connection, mst *state.State) (func(), error) { err := st.Client().ServiceDeploy("mad:bad/url-1", "x", 1, "", constraints.Value{}, "") - if err.Error() == `charm URL has invalid schema: "mad:bad/url-1"` { + if err.Error() == `entity URL has invalid schema: "mad:bad/url-1"` { err = nil } return func() {}, err @@ -345,7 +345,7 @@ func opClientServiceDeploy(c *gc.C, st api.Connection, mst *state.State) (func() func opClientServiceDeployWithNetworks(c *gc.C, st api.Connection, mst *state.State) (func(), error) { err := st.Client().ServiceDeployWithNetworks("mad:bad/url-1", "x", 1, "", constraints.Value{}, "", nil) - if err.Error() == `charm URL has invalid schema: "mad:bad/url-1"` { + if err.Error() == `entity URL has invalid schema: "mad:bad/url-1"` { err = nil } return func() {}, err diff --git a/apiserver/client/state.go b/apiserver/client/state.go index 78460ee33b7d..f177c0371bda 100644 --- a/apiserver/client/state.go +++ b/apiserver/client/state.go @@ -5,7 +5,7 @@ package client import ( "github.com/juju/names" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/constraints" "github.com/juju/juju/environs/config" diff --git a/apiserver/client/status.go b/apiserver/client/status.go index da95fa07c8f2..362332d791a2 100644 --- a/apiserver/client/status.go +++ b/apiserver/client/status.go @@ -10,8 +10,8 @@ import ( "github.com/juju/errors" "github.com/juju/utils/set" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/apiserver/params" "github.com/juju/juju/constraints" diff --git a/apiserver/common/environdestroy_test.go b/apiserver/common/environdestroy_test.go index e93d3c6d172e..2a747fb8a13b 100644 --- a/apiserver/common/environdestroy_test.go +++ b/apiserver/common/environdestroy_test.go @@ -8,6 +8,7 @@ import ( "github.com/juju/errors" "github.com/juju/names" + jtesting "github.com/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" @@ -22,7 +23,6 @@ import ( "github.com/juju/juju/state" jujutesting "github.com/juju/juju/testing" "github.com/juju/juju/testing/factory" - jtesting "github.com/juju/testing" ) type destroyEnvironmentSuite struct { diff --git a/apiserver/common/storagecommon/storage_test.go b/apiserver/common/storagecommon/storage_test.go index 7ae6fb0f04a8..1d9d32973f11 100644 --- a/apiserver/common/storagecommon/storage_test.go +++ b/apiserver/common/storagecommon/storage_test.go @@ -4,8 +4,9 @@ package storagecommon_test import ( - "github.com/juju/juju/state" "github.com/juju/names" + + "github.com/juju/juju/state" ) type fakeStorageInstance struct { diff --git a/apiserver/common/watch_test.go b/apiserver/common/watch_test.go index c8aa410f18b7..fbdc936bef44 100644 --- a/apiserver/common/watch_test.go +++ b/apiserver/common/watch_test.go @@ -6,11 +6,10 @@ package common_test import ( "fmt" - "launchpad.net/tomb" - "github.com/juju/names" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" + "launchpad.net/tomb" "github.com/juju/juju/apiserver/common" "github.com/juju/juju/apiserver/params" diff --git a/apiserver/debuglog_file.go b/apiserver/debuglog_file.go index b26e303ee6b1..50a1998e1b17 100644 --- a/apiserver/debuglog_file.go +++ b/apiserver/debuglog_file.go @@ -12,10 +12,11 @@ import ( "regexp" "strings" - "github.com/juju/juju/state" "github.com/juju/loggo" "github.com/juju/names" "github.com/juju/utils/tailer" + + "github.com/juju/juju/state" ) func newDebugLogFileHandler(statePool *state.StatePool, stop <-chan struct{}, logDir string) http.Handler { diff --git a/apiserver/params/actions.go b/apiserver/params/actions.go index fba12f03fd4b..b9df44135baa 100644 --- a/apiserver/params/actions.go +++ b/apiserver/params/actions.go @@ -7,7 +7,7 @@ import ( "time" // TODO(jcw4) per fwereade 2014-11-21 remove this dependency - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" ) const ( diff --git a/apiserver/params/params.go b/apiserver/params/params.go index b0e2f4d60f7b..3747c8c00397 100644 --- a/apiserver/params/params.go +++ b/apiserver/params/params.go @@ -10,7 +10,7 @@ import ( "github.com/juju/errors" "github.com/juju/utils/proxy" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "gopkg.in/macaroon.v1" "github.com/juju/juju/constraints" diff --git a/apiserver/params/params_test.go b/apiserver/params/params_test.go index a6d4ac69b6d3..357e41c184e1 100644 --- a/apiserver/params/params_test.go +++ b/apiserver/params/params_test.go @@ -9,7 +9,7 @@ import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/apiserver/params" "github.com/juju/juju/constraints" diff --git a/apiserver/params/status.go b/apiserver/params/status.go index f93bd6dd7a63..ee1bcbec96bd 100644 --- a/apiserver/params/status.go +++ b/apiserver/params/status.go @@ -8,7 +8,7 @@ package params import ( "time" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/instance" "github.com/juju/juju/network" diff --git a/apiserver/service/charmstore.go b/apiserver/service/charmstore.go index f7861fe16d46..9ca63b706296 100644 --- a/apiserver/service/charmstore.go +++ b/apiserver/service/charmstore.go @@ -11,10 +11,10 @@ import ( "github.com/juju/errors" "github.com/juju/utils" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/charmrepo" - "gopkg.in/juju/charmstore.v4/csclient" - "gopkg.in/macaroon-bakery.v0/httpbakery" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charmrepo.v1" + "gopkg.in/juju/charmrepo.v1/csclient" + "gopkg.in/macaroon-bakery.v1/httpbakery" "gopkg.in/macaroon.v1" "github.com/juju/juju/apiserver/params" diff --git a/apiserver/service/service.go b/apiserver/service/service.go index afca25942e99..14c8186a4884 100644 --- a/apiserver/service/service.go +++ b/apiserver/service/service.go @@ -10,7 +10,7 @@ import ( "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/apiserver/common" "github.com/juju/juju/apiserver/params" diff --git a/apiserver/service/service_test.go b/apiserver/service/service_test.go index 05a33f9691b9..99c03910a872 100644 --- a/apiserver/service/service_test.go +++ b/apiserver/service/service_test.go @@ -12,8 +12,8 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charmstore.v4/csclient" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charmrepo.v1/csclient" "gopkg.in/macaroon.v1" "gopkg.in/mgo.v2" @@ -387,7 +387,7 @@ func (s *serviceSuite) TestAddCharm(c *gc.C) { client := s.APIState.Client() // First test the sanity checks. err := client.AddCharm(&charm.URL{Name: "nonsense"}) - c.Assert(err, gc.ErrorMatches, `charm URL has invalid schema: ":nonsense-0"`) + c.Assert(err, gc.ErrorMatches, `entity URL has invalid schema: ":nonsense-0"`) err = client.AddCharm(charm.MustParseURL("local:precise/dummy")) c.Assert(err, gc.ErrorMatches, "only charm store charm URLs are supported, with cs: schema") err = client.AddCharm(charm.MustParseURL("cs:precise/wordpress")) @@ -426,7 +426,7 @@ func (s *serviceSuite) TestAddCharmWithAuthorization(c *gc.C) { // Change permissions on the new charm such that only bob // can read from it. s.DischargeUser = "restricted" - err := s.Srv.NewClient().Put("/"+curl.Path()+"/meta/perm/read", []string{"bob"}) + err := s.Client.Put("/"+curl.Path()+"/meta/perm/read", []string{"bob"}) c.Assert(err, jc.ErrorIsNil) // Try to add a charm to the environment without authorization. @@ -436,7 +436,7 @@ func (s *serviceSuite) TestAddCharmWithAuthorization(c *gc.C) { tryAs := func(user string) error { client := csclient.New(csclient.Params{ - URL: s.Srv.URL(), + URL: s.Srv.URL, }) s.DischargeUser = user var m *macaroon.Macaroon diff --git a/apiserver/storage/mock_test.go b/apiserver/storage/mock_test.go index c06d0530f2d1..c73c391e9c2d 100644 --- a/apiserver/storage/mock_test.go +++ b/apiserver/storage/mock_test.go @@ -6,7 +6,7 @@ package storage_test import ( "github.com/juju/errors" "github.com/juju/names" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/state" jujustorage "github.com/juju/juju/storage" diff --git a/apiserver/testing/fakecharmstore.go b/apiserver/testing/fakecharmstore.go index 07dc20a06a26..372a5abc1561 100644 --- a/apiserver/testing/fakecharmstore.go +++ b/apiserver/testing/fakecharmstore.go @@ -6,15 +6,17 @@ package testing import ( "fmt" "net/http" + "net/http/httptest" gitjujutesting "github.com/juju/testing" + jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/charmrepo" - "gopkg.in/juju/charmstore.v4" - "gopkg.in/juju/charmstore.v4/charmstoretesting" - "gopkg.in/macaroon-bakery.v0/bakery/checkers" - "gopkg.in/macaroon-bakery.v0/bakerytest" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charmrepo.v1" + "gopkg.in/juju/charmrepo.v1/csclient" + "gopkg.in/juju/charmstore.v5-unstable" + "gopkg.in/macaroon-bakery.v1/bakery/checkers" + "gopkg.in/macaroon-bakery.v1/bakerytest" "gopkg.in/mgo.v2" "github.com/juju/juju/apiserver/service" @@ -31,7 +33,9 @@ type CharmStoreSuite struct { DischargeUser string discharger *bakerytest.Discharger - Srv *charmstoretesting.Server + handler charmstore.HTTPCloseHandler + Srv *httptest.Server + Client *csclient.Client } func (s *CharmStoreSuite) SetUpTest(c *gc.C) { @@ -45,32 +49,37 @@ func (s *CharmStoreSuite) SetUpTest(c *gc.C) { checkers.DeclaredCaveat("username", s.DischargeUser), }, nil }) - s.Srv = charmstoretesting.OpenServer(c, s.Session, charmstore.ServerParams{ + db := s.Session.DB("juju-testing") + params := charmstore.ServerParams{ + AuthUsername: "test-user", + AuthPassword: "test-password", IdentityLocation: s.discharger.Location(), PublicKeyLocator: s.discharger, + } + handler, err := charmstore.NewServer(db, nil, "", params, charmstore.V4) + c.Assert(err, jc.ErrorIsNil) + s.handler = handler + s.Srv = httptest.NewServer(handler) + s.Client = csclient.New(csclient.Params{ + URL: s.Srv.URL, + User: params.AuthUsername, + Password: params.AuthPassword, }) + s.PatchValue(&charmrepo.CacheDir, c.MkDir()) s.PatchValue(&service.NewCharmStore, func(p charmrepo.NewCharmStoreParams) charmrepo.Interface { - p.URL = s.Srv.URL() + p.URL = s.Srv.URL return charmrepo.NewCharmStore(p) }) } func (s *CharmStoreSuite) TearDownTest(c *gc.C) { s.discharger.Close() + s.handler.Close() s.Srv.Close() s.CleanupSuite.TearDownTest(c) } func (s *CharmStoreSuite) UploadCharm(c *gc.C, url, name string) (*charm.URL, charm.Charm) { - id := charm.MustParseReference(url) - promulgated := false - if id.User == "" { - id.User = "who" - promulgated = true - } - ch := testcharms.Repo.CharmArchive(c.MkDir(), name) - id = s.Srv.UploadCharm(c, ch, id, promulgated) - curl := (*charm.URL)(id) - return curl, ch + return testcharms.UploadCharm(c, s.Client, url, name) } diff --git a/apiserver/testing/service.go b/apiserver/testing/service.go index 41b58d95e845..1186a87bf5d5 100644 --- a/apiserver/testing/service.go +++ b/apiserver/testing/service.go @@ -6,7 +6,7 @@ package testing import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/constraints" "github.com/juju/juju/state" diff --git a/apiserver/tools_test.go b/apiserver/tools_test.go index f7e5584ed32b..f2bc0fdebdb5 100644 --- a/apiserver/tools_test.go +++ b/apiserver/tools_test.go @@ -24,7 +24,6 @@ import ( envtesting "github.com/juju/juju/environs/testing" envtools "github.com/juju/juju/environs/tools" toolstesting "github.com/juju/juju/environs/tools/testing" - "github.com/juju/juju/state" "github.com/juju/juju/state/toolstorage" "github.com/juju/juju/testing" diff --git a/apiserver/uniter/uniter_base.go b/apiserver/uniter/uniter_base.go index 66451829f230..3b3c0bd37329 100644 --- a/apiserver/uniter/uniter_base.go +++ b/apiserver/uniter/uniter_base.go @@ -12,7 +12,7 @@ import ( "github.com/juju/errors" "github.com/juju/names" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/apiserver/common" leadershipapiserver "github.com/juju/juju/apiserver/leadership" diff --git a/apiserver/uniter/uniter_base_test.go b/apiserver/uniter/uniter_base_test.go index c9b6ac87c402..1e6afee7c97a 100644 --- a/apiserver/uniter/uniter_base_test.go +++ b/apiserver/uniter/uniter_base_test.go @@ -12,7 +12,7 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/apiserver/common" "github.com/juju/juju/apiserver/params" diff --git a/cloudconfig/cloudinit/cloudinit.go b/cloudconfig/cloudinit/cloudinit.go index bfb7e1c54fee..59785398f5c5 100644 --- a/cloudconfig/cloudinit/cloudinit.go +++ b/cloudconfig/cloudinit/cloudinit.go @@ -7,10 +7,11 @@ package cloudinit import ( "strings" - "github.com/juju/juju/utils/ssh" "github.com/juju/utils/packaging/commands" "github.com/juju/utils/packaging/config" "github.com/juju/utils/shell" + + "github.com/juju/juju/utils/ssh" ) // cloudConfig represents a set of cloud-init configuration options. diff --git a/cloudconfig/cloudinit/helpers_test.go b/cloudconfig/cloudinit/helpers_test.go index f37b57020198..20304e9e770a 100644 --- a/cloudconfig/cloudinit/helpers_test.go +++ b/cloudconfig/cloudinit/helpers_test.go @@ -1,9 +1,8 @@ package cloudinit import ( - gc "gopkg.in/check.v1" - "github.com/juju/utils/proxy" + gc "gopkg.in/check.v1" ) type HelperSuite struct{} diff --git a/cmd/juju/action/action.go b/cmd/juju/action/action.go index f6ed51f84d2b..cd36c203f9c0 100644 --- a/cmd/juju/action/action.go +++ b/cmd/juju/action/action.go @@ -8,7 +8,7 @@ import ( "github.com/juju/cmd" "github.com/juju/errors" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api/action" "github.com/juju/juju/apiserver/params" diff --git a/cmd/juju/action/defined_test.go b/cmd/juju/action/defined_test.go index 6c935d2545f0..e393844ed5f1 100644 --- a/cmd/juju/action/defined_test.go +++ b/cmd/juju/action/defined_test.go @@ -11,7 +11,7 @@ import ( "github.com/juju/names" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "gopkg.in/yaml.v1" "github.com/juju/juju/cmd/juju/action" diff --git a/cmd/juju/action/package_test.go b/cmd/juju/action/package_test.go index eedad1918611..7c5438785641 100644 --- a/cmd/juju/action/package_test.go +++ b/cmd/juju/action/package_test.go @@ -14,10 +14,9 @@ import ( jujutesting "github.com/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/apiserver/params" - "github.com/juju/juju/cmd/envcmd" "github.com/juju/juju/cmd/juju/action" coretesting "github.com/juju/juju/testing" ) @@ -56,7 +55,7 @@ func (s *BaseActionSuite) patchAPIClient(client *fakeAPIClient) func() { ) } -func (s *BaseActionSuite) checkHelp(c *gc.C, subcmd envcmd.EnvironCommand) { +func (s *BaseActionSuite) checkHelp(c *gc.C, subcmd cmd.Command) { ctx, err := coretesting.RunCommand(c, s.command, subcmd.Info().Name, "--help") c.Assert(err, gc.IsNil) diff --git a/cmd/juju/action/status_test.go b/cmd/juju/action/status_test.go index f509763f3ff2..bc690402b91b 100644 --- a/cmd/juju/action/status_test.go +++ b/cmd/juju/action/status_test.go @@ -18,7 +18,7 @@ import ( type StatusSuite struct { BaseActionSuite - subcommand *action.StatusCommand + subcommand cmd.Command } var _ = gc.Suite(&StatusSuite{}) diff --git a/cmd/juju/commands/bootstrap.go b/cmd/juju/commands/bootstrap.go index 1f040783a579..b9286f9d1f3e 100644 --- a/cmd/juju/commands/bootstrap.go +++ b/cmd/juju/commands/bootstrap.go @@ -13,7 +13,7 @@ import ( "github.com/juju/errors" "github.com/juju/utils" "github.com/juju/utils/featureflag" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "launchpad.net/gnuflag" apiblock "github.com/juju/juju/api/block" diff --git a/cmd/juju/commands/common.go b/cmd/juju/commands/common.go index 4edea64137e4..72c6dd215c1c 100644 --- a/cmd/juju/commands/common.go +++ b/cmd/juju/commands/common.go @@ -14,10 +14,10 @@ import ( "github.com/juju/persistent-cookiejar" "github.com/juju/utils" "golang.org/x/net/publicsuffix" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/charmrepo" - "gopkg.in/juju/charmstore.v4/csclient" - "gopkg.in/macaroon-bakery.v0/httpbakery" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charmrepo.v1" + "gopkg.in/juju/charmrepo.v1/csclient" + "gopkg.in/macaroon-bakery.v1/httpbakery" "gopkg.in/macaroon.v1" "github.com/juju/juju/api" diff --git a/cmd/juju/commands/debughooks.go b/cmd/juju/commands/debughooks.go index aae59b86f69a..d0f3696d3d22 100644 --- a/cmd/juju/commands/debughooks.go +++ b/cmd/juju/commands/debughooks.go @@ -10,7 +10,7 @@ import ( "github.com/juju/cmd" "github.com/juju/names" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" unitdebug "github.com/juju/juju/worker/uniter/runner/debug" ) diff --git a/cmd/juju/commands/deploy.go b/cmd/juju/commands/deploy.go index f885e6bb8a69..d635f7ae49e6 100644 --- a/cmd/juju/commands/deploy.go +++ b/cmd/juju/commands/deploy.go @@ -10,7 +10,7 @@ import ( "github.com/juju/cmd" "github.com/juju/errors" "github.com/juju/names" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "launchpad.net/gnuflag" "github.com/juju/juju/api" diff --git a/cmd/juju/commands/deploy_test.go b/cmd/juju/commands/deploy_test.go index d1b0afc50bd4..a5e2bcb54b54 100644 --- a/cmd/juju/commands/deploy_test.go +++ b/cmd/juju/commands/deploy_test.go @@ -18,13 +18,12 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/charmrepo" - "gopkg.in/juju/charmstore.v4" - "gopkg.in/juju/charmstore.v4/charmstoretesting" - "gopkg.in/juju/charmstore.v4/csclient" - "gopkg.in/macaroon-bakery.v0/bakery/checkers" - "gopkg.in/macaroon-bakery.v0/bakerytest" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charmrepo.v1" + "gopkg.in/juju/charmrepo.v1/csclient" + "gopkg.in/juju/charmstore.v5-unstable" + "gopkg.in/macaroon-bakery.v1/bakery/checkers" + "gopkg.in/macaroon-bakery.v1/bakerytest" "github.com/juju/juju/api" "github.com/juju/juju/apiserver/params" @@ -98,7 +97,7 @@ func (s *DeploySuite) TestInitErrors(c *gc.C) { func (s *DeploySuite) TestNoCharm(c *gc.C) { err := runDeploy(c, "local:unknown-123") - c.Assert(err, gc.ErrorMatches, `charm not found in ".*": local:trusty/unknown-123`) + c.Assert(err, gc.ErrorMatches, `entity not found in ".*": local:trusty/unknown-123`) } func (s *DeploySuite) TestBlockDeploy(c *gc.C) { @@ -442,7 +441,7 @@ var deployAuthorizationTests = []struct { func (s *DeployCharmStoreSuite) TestDeployAuthorization(c *gc.C) { for i, test := range deployAuthorizationTests { c.Logf("test %d: %s", i, test.about) - url, _ := s.uploadCharm(c, test.uploadURL, "wordpress") + url, _ := testcharms.UploadCharm(c, s.client, test.uploadURL, "wordpress") if test.readPermUser != "" { s.changeReadPerm(c, url, test.readPermUser) } @@ -472,7 +471,9 @@ const ( // place to allow testing code that calls addCharmViaAPI. type charmStoreSuite struct { testing.JujuConnSuite - srv *charmstoretesting.Server + handler charmstore.HTTPCloseHandler + srv *httptest.Server + client *csclient.Client discharger *bakerytest.Discharger } @@ -483,7 +484,7 @@ func (s *charmStoreSuite) SetUpTest(c *gc.C) { s.discharger = bakerytest.NewDischarger(nil, func(req *http.Request, cond string, arg string) ([]checkers.Caveat, error) { cookie, err := req.Cookie(clientUserCookie) if err != nil { - return nil, errors.New("discharge denied to non-clients") + return nil, errors.Annotate(err, "discharge denied to non-clients") } return []checkers.Caveat{ checkers.DeclaredCaveat("username", cookie.Value), @@ -491,9 +492,21 @@ func (s *charmStoreSuite) SetUpTest(c *gc.C) { }) // Set up the charm store testing server. - s.srv = charmstoretesting.OpenServer(c, s.Session, charmstore.ServerParams{ + db := s.Session.DB("juju-testing") + params := charmstore.ServerParams{ + AuthUsername: "test-user", + AuthPassword: "test-password", IdentityLocation: s.discharger.Location(), PublicKeyLocator: s.discharger, + } + handler, err := charmstore.NewServer(db, nil, "", params, charmstore.V4) + c.Assert(err, jc.ErrorIsNil) + s.handler = handler + s.srv = httptest.NewServer(handler) + s.client = csclient.New(csclient.Params{ + URL: s.srv.URL, + User: params.AuthUsername, + Password: params.AuthPassword, }) // Initialize the charm cache dir. @@ -506,7 +519,7 @@ func (s *charmStoreSuite) SetUpTest(c *gc.C) { if err != nil { return nil, err } - csclient.params.URL = s.srv.URL() + csclient.params.URL = s.srv.URL // Add a cookie so that the discharger can detect whether the // HTTP client is the juju environment or the juju client. lurl, err := url.Parse(s.discharger.Location()) @@ -521,32 +534,20 @@ func (s *charmStoreSuite) SetUpTest(c *gc.C) { }) // Point the Juju API server to the charm store testing server. - s.PatchValue(&csclient.ServerURL, s.srv.URL()) + s.PatchValue(&csclient.ServerURL, s.srv.URL) } func (s *charmStoreSuite) TearDownTest(c *gc.C) { s.discharger.Close() + s.handler.Close() s.srv.Close() s.JujuConnSuite.TearDownTest(c) } -// uploadCharm adds a charm with the given URL and name to the charm store. -func (s *charmStoreSuite) uploadCharm(c *gc.C, url, name string) (*charm.URL, charm.Charm) { - id := charm.MustParseReference(url) - promulgated := false - if id.User == "" { - id.User = "who" - promulgated = true - } - ch := testcharms.Repo.CharmArchive(c.MkDir(), name) - id = s.srv.UploadCharm(c, ch, id, promulgated) - return (*charm.URL)(id), ch -} - // changeReadPerm changes the read permission of the given charm URL. // The charm must be present in the testing charm store. func (s *charmStoreSuite) changeReadPerm(c *gc.C, url *charm.URL, perms ...string) { - err := s.srv.NewClient().Put("/"+url.Path()+"/meta/perm/read", perms) + err := s.client.Put("/"+url.Path()+"/meta/perm/read", perms) c.Assert(err, jc.ErrorIsNil) } diff --git a/cmd/juju/commands/expose_test.go b/cmd/juju/commands/expose_test.go index 0896bbcbf3a1..43299f166ca3 100644 --- a/cmd/juju/commands/expose_test.go +++ b/cmd/juju/commands/expose_test.go @@ -6,7 +6,7 @@ package commands import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/cmd/envcmd" jujutesting "github.com/juju/juju/juju/testing" diff --git a/cmd/juju/commands/get_test.go b/cmd/juju/commands/get_test.go index 2081f664b055..caba950fe022 100644 --- a/cmd/juju/commands/get_test.go +++ b/cmd/juju/commands/get_test.go @@ -9,7 +9,7 @@ import ( "github.com/juju/cmd" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" goyaml "gopkg.in/yaml.v1" "github.com/juju/juju/cmd/envcmd" diff --git a/cmd/juju/commands/helptool.go b/cmd/juju/commands/helptool.go index e19066484109..7fcd9a66cca4 100644 --- a/cmd/juju/commands/helptool.go +++ b/cmd/juju/commands/helptool.go @@ -9,7 +9,7 @@ import ( "github.com/juju/cmd" "github.com/juju/errors" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "launchpad.net/gnuflag" "github.com/juju/juju/network" diff --git a/cmd/juju/commands/publish.go b/cmd/juju/commands/publish.go index 0f57381b52c2..95215e4507ea 100644 --- a/cmd/juju/commands/publish.go +++ b/cmd/juju/commands/publish.go @@ -11,8 +11,8 @@ import ( "github.com/juju/cmd" "github.com/juju/utils/bzr" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/charmrepo" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charmrepo.v1" "launchpad.net/gnuflag" "github.com/juju/juju/cmd/envcmd" diff --git a/cmd/juju/commands/publish_test.go b/cmd/juju/commands/publish_test.go index 844f0b02358d..081aa94e5b0a 100644 --- a/cmd/juju/commands/publish_test.go +++ b/cmd/juju/commands/publish_test.go @@ -13,7 +13,7 @@ import ( "github.com/juju/utils" "github.com/juju/utils/bzr" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5/charmrepo" + "gopkg.in/juju/charmrepo.v1" "github.com/juju/juju/cmd/envcmd" "github.com/juju/juju/testing" @@ -114,7 +114,7 @@ func (s *PublishSuite) TestFrom(c *gc.C) { func (s *PublishSuite) TestMissingSeries(c *gc.C) { _, err := s.runPublish(c, "cs:wordpress") - c.Assert(err, gc.ErrorMatches, `cannot infer charm URL for "cs:wordpress": charm url series is not resolved`) + c.Assert(err, gc.ErrorMatches, `cannot infer entity URL for "cs:wordpress": entity url series is not resolved`) } func (s *PublishSuite) TestNotClean(c *gc.C) { diff --git a/cmd/juju/commands/register.go b/cmd/juju/commands/register.go index 0e6d19d11b44..4e7537e765aa 100644 --- a/cmd/juju/commands/register.go +++ b/cmd/juju/commands/register.go @@ -11,7 +11,7 @@ import ( "github.com/juju/errors" "github.com/juju/persistent-cookiejar" - "gopkg.in/macaroon-bakery.v0/httpbakery" + "gopkg.in/macaroon-bakery.v1/httpbakery" "github.com/juju/juju/api" "github.com/juju/juju/api/charms" @@ -35,9 +35,10 @@ var registerMeteredCharm = func(registrationURL string, state api.Connection, ja return err } if metered { - httpClient := httpbakery.NewHTTPClient() - httpClient.Jar = jar - credentials, err := registerMetrics(registrationURL, environmentUUID, charmURL, serviceName, httpClient, openWebBrowser) + client := httpbakery.NewClient() + client.Client.Jar = jar + client.VisitWebPage = openWebBrowser + credentials, err := registerMetrics(registrationURL, environmentUUID, charmURL, serviceName, client) if err != nil { logger.Infof("failed to register metrics: %v", err) return err @@ -57,7 +58,7 @@ var registerMeteredCharm = func(registrationURL string, state api.Connection, ja return nil } -func registerMetrics(registrationURL, environmentUUID, charmURL, serviceName string, client *http.Client, visitWebPage func(*url.URL) error) ([]byte, error) { +func registerMetrics(registrationURL, environmentUUID, charmURL, serviceName string, client *httpbakery.Client) ([]byte, error) { if registrationURL == "" { return nil, errors.Errorf("no metric registration url is specified") } @@ -85,9 +86,7 @@ func registerMetrics(registrationURL, environmentUUID, charmURL, serviceName str } req.Header.Set("Content-Type", "application/json") - bodyGetter := httpbakery.SeekerBody(bytes.NewReader(buff.Bytes())) - - response, err := httpbakery.DoWithBody(client, req, bodyGetter, visitWebPage) + response, err := client.DoWithBody(req, bytes.NewReader(buff.Bytes())) if err != nil { return nil, errors.Trace(err) } diff --git a/cmd/juju/commands/register_test.go b/cmd/juju/commands/register_test.go index 85c7bd8d6545..ebe85254ad28 100644 --- a/cmd/juju/commands/register_test.go +++ b/cmd/juju/commands/register_test.go @@ -6,9 +6,9 @@ import ( "encoding/json" "net/http" "net/http/httptest" - "net/url" gc "gopkg.in/check.v1" + "gopkg.in/macaroon-bakery.v1/httpbakery" ) var _ = gc.Suite(®istrationSuite{}) @@ -28,7 +28,8 @@ func (s *registrationSuite) TearDownTest(c *gc.C) { } func (s *registrationSuite) TestHttpMetricsRegistrar(c *gc.C) { - data, err := registerMetrics(s.server.URL, "environment uuid", "charm url", "service name", &http.Client{}, func(*url.URL) error { return nil }) + client := httpbakery.NewClient() + data, err := registerMetrics(s.server.URL, "environment uuid", "charm url", "service name", client) c.Assert(err, gc.IsNil) var b []byte err = json.Unmarshal(data, &b) diff --git a/cmd/juju/commands/removeunit_test.go b/cmd/juju/commands/removeunit_test.go index 92e893f1c157..5e853b07c4b7 100644 --- a/cmd/juju/commands/removeunit_test.go +++ b/cmd/juju/commands/removeunit_test.go @@ -8,7 +8,7 @@ import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/cmd/envcmd" jujutesting "github.com/juju/juju/juju/testing" diff --git a/cmd/juju/commands/scp_unix_test.go b/cmd/juju/commands/scp_unix_test.go index 641d136922bc..6e68a7f410f3 100644 --- a/cmd/juju/commands/scp_unix_test.go +++ b/cmd/juju/commands/scp_unix_test.go @@ -14,7 +14,7 @@ import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/cmd/envcmd" "github.com/juju/juju/network" diff --git a/cmd/juju/commands/ssh_test.go b/cmd/juju/commands/ssh_test.go index a64e09d7ef74..4b6cc1a1d498 100644 --- a/cmd/juju/commands/ssh_test.go +++ b/cmd/juju/commands/ssh_test.go @@ -14,7 +14,7 @@ import ( "github.com/juju/cmd" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/apiserver" "github.com/juju/juju/cmd/envcmd" diff --git a/cmd/juju/commands/unexpose_test.go b/cmd/juju/commands/unexpose_test.go index 19b9925f3660..dc16fcaea953 100644 --- a/cmd/juju/commands/unexpose_test.go +++ b/cmd/juju/commands/unexpose_test.go @@ -6,7 +6,7 @@ package commands import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/cmd/envcmd" jujutesting "github.com/juju/juju/juju/testing" diff --git a/cmd/juju/commands/upgradecharm.go b/cmd/juju/commands/upgradecharm.go index 2d9a107061d2..f6a9756a684f 100644 --- a/cmd/juju/commands/upgradecharm.go +++ b/cmd/juju/commands/upgradecharm.go @@ -10,7 +10,7 @@ import ( "github.com/juju/cmd" "github.com/juju/errors" "github.com/juju/names" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "launchpad.net/gnuflag" "github.com/juju/juju/cmd/envcmd" diff --git a/cmd/juju/commands/upgradecharm_test.go b/cmd/juju/commands/upgradecharm_test.go index 4c793a947d97..475ca2d7c358 100644 --- a/cmd/juju/commands/upgradecharm_test.go +++ b/cmd/juju/commands/upgradecharm_test.go @@ -6,15 +6,15 @@ package commands import ( "bytes" "io/ioutil" + "net/http/httptest" "os" "path" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/charmrepo" - "gopkg.in/juju/charmstore.v4" - "gopkg.in/juju/charmstore.v4/charmstoretesting" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charmrepo.v1" + "gopkg.in/juju/charmstore.v5-unstable" "github.com/juju/juju/cmd/envcmd" jujutesting "github.com/juju/juju/juju/testing" @@ -25,23 +25,33 @@ import ( type UpgradeCharmErrorsSuite struct { jujutesting.RepoSuite - srv *charmstoretesting.Server + handler charmstore.HTTPCloseHandler + srv *httptest.Server } func (s *UpgradeCharmErrorsSuite) SetUpTest(c *gc.C) { s.RepoSuite.SetUpTest(c) - s.srv = charmstoretesting.OpenServer(c, s.Session, charmstore.ServerParams{}) + // Set up the charm store testing server. + handler, err := charmstore.NewServer(s.Session.DB("juju-testing"), nil, "", charmstore.ServerParams{ + AuthUsername: "test-user", + AuthPassword: "test-password", + }, charmstore.V4) + c.Assert(err, jc.ErrorIsNil) + s.handler = handler + s.srv = httptest.NewServer(handler) + s.PatchValue(&charmrepo.CacheDir, c.MkDir()) original := newCharmStoreClient s.PatchValue(&newCharmStoreClient, func() (*csClient, error) { csclient, err := original() c.Assert(err, jc.ErrorIsNil) - csclient.params.URL = s.srv.URL() + csclient.params.URL = s.srv.URL return csclient, nil }) } func (s *UpgradeCharmErrorsSuite) TearDownTest(c *gc.C) { + s.handler.Close() s.srv.Close() s.RepoSuite.TearDownTest(c) } @@ -73,7 +83,7 @@ func (s *UpgradeCharmErrorsSuite) TestWithInvalidRepository(c *gc.C) { // overwrites it (TearDownTest will revert it again). os.Setenv("JUJU_REPOSITORY", "") err = runUpgradeCharm(c, "riak", "--repository=") - c.Assert(err, gc.ErrorMatches, `charm not found in ".*": local:trusty/riak`) + c.Assert(err, gc.ErrorMatches, `entity not found in ".*": local:trusty/riak`) } func (s *UpgradeCharmErrorsSuite) TestInvalidService(c *gc.C) { @@ -316,12 +326,12 @@ var upgradeCharmAuthorizationTests = []struct { }} func (s *UpgradeCharmCharmStoreSuite) TestUpgradeCharmAuthorization(c *gc.C) { - s.uploadCharm(c, "cs:~other/trusty/wordpress-0", "wordpress") + testcharms.UploadCharm(c, s.client, "cs:~other/trusty/wordpress-0", "wordpress") err := runDeploy(c, "cs:~other/trusty/wordpress-0") c.Assert(err, jc.ErrorIsNil) for i, test := range upgradeCharmAuthorizationTests { c.Logf("test %d: %s", i, test.about) - url, _ := s.uploadCharm(c, test.uploadURL, "wordpress") + url, _ := testcharms.UploadCharm(c, s.client, test.uploadURL, "wordpress") if test.readPermUser != "" { s.changeReadPerm(c, url, test.readPermUser) } diff --git a/cmd/juju/environment/environment_test.go b/cmd/juju/environment/environment_test.go index b75984a6552c..f8117df5d60a 100644 --- a/cmd/juju/environment/environment_test.go +++ b/cmd/juju/environment/environment_test.go @@ -11,7 +11,6 @@ import ( "github.com/juju/juju/cmd/juju/environment" "github.com/juju/juju/feature" "github.com/juju/juju/juju/osenv" - // Bring in the dummy provider definition. _ "github.com/juju/juju/provider/dummy" "github.com/juju/juju/testing" diff --git a/cmd/juju/environment/share_test.go b/cmd/juju/environment/share_test.go index d3fef24a5fb6..10fed4cbe9a1 100644 --- a/cmd/juju/environment/share_test.go +++ b/cmd/juju/environment/share_test.go @@ -12,7 +12,6 @@ import ( "github.com/juju/juju/apiserver/params" "github.com/juju/juju/cmd/envcmd" "github.com/juju/juju/cmd/juju/environment" - "github.com/juju/juju/testing" ) diff --git a/cmd/juju/status/output_oneline.go b/cmd/juju/status/output_oneline.go index 3b9fc2f4d3e9..d4fcf3d0d4cd 100644 --- a/cmd/juju/status/output_oneline.go +++ b/cmd/juju/status/output_oneline.go @@ -9,6 +9,7 @@ import ( "strings" "github.com/juju/errors" + "github.com/juju/juju/cmd/juju/common" ) diff --git a/cmd/juju/status/output_tabular.go b/cmd/juju/status/output_tabular.go index 970c26ad6c79..f759e4cb7f65 100644 --- a/cmd/juju/status/output_tabular.go +++ b/cmd/juju/status/output_tabular.go @@ -11,7 +11,7 @@ import ( "text/tabwriter" "github.com/juju/errors" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/apiserver/params" "github.com/juju/juju/cmd/juju/common" diff --git a/cmd/juju/status/status_test.go b/cmd/juju/status/status_test.go index 3c3b35573f5a..853b60062e48 100644 --- a/cmd/juju/status/status_test.go +++ b/cmd/juju/status/status_test.go @@ -15,7 +15,7 @@ import ( "github.com/juju/cmd" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" goyaml "gopkg.in/yaml.v1" "github.com/juju/juju/apiserver/params" diff --git a/cmd/juju/system/login.go b/cmd/juju/system/login.go index c43255e36ddd..a0d54bc25f2f 100644 --- a/cmd/juju/system/login.go +++ b/cmd/juju/system/login.go @@ -6,13 +6,13 @@ package system import ( "github.com/juju/cmd" "github.com/juju/errors" - "github.com/juju/juju/api/usermanager" "github.com/juju/names" "github.com/juju/utils" goyaml "gopkg.in/yaml.v1" "launchpad.net/gnuflag" "github.com/juju/juju/api" + "github.com/juju/juju/api/usermanager" "github.com/juju/juju/cmd/envcmd" "github.com/juju/juju/environs/configstore" "github.com/juju/juju/juju" diff --git a/cmd/juju/system/system_test.go b/cmd/juju/system/system_test.go index 087a66886ef9..33dae0114c81 100644 --- a/cmd/juju/system/system_test.go +++ b/cmd/juju/system/system_test.go @@ -8,10 +8,9 @@ import ( gc "gopkg.in/check.v1" "github.com/juju/juju/cmd/juju/system" - "github.com/juju/juju/testing" - // Bring in the dummy provider definition. _ "github.com/juju/juju/provider/dummy" + "github.com/juju/juju/testing" ) type SystemCommandSuite struct { diff --git a/cmd/jujud/agent/machine.go b/cmd/jujud/agent/machine.go index cce1d039ea77..21c4644308f6 100644 --- a/cmd/jujud/agent/machine.go +++ b/cmd/jujud/agent/machine.go @@ -25,7 +25,7 @@ import ( "github.com/juju/utils/set" "github.com/juju/utils/symlink" "github.com/juju/utils/voyeur" - "gopkg.in/juju/charm.v5/charmrepo" + "gopkg.in/juju/charmrepo.v1" "gopkg.in/mgo.v2" "gopkg.in/natefinch/lumberjack.v2" "launchpad.net/gnuflag" diff --git a/cmd/jujud/agent/machine_test.go b/cmd/jujud/agent/machine_test.go index 88bf6dbbb512..9eb0e4514122 100644 --- a/cmd/jujud/agent/machine_test.go +++ b/cmd/jujud/agent/machine_test.go @@ -25,8 +25,8 @@ import ( "github.com/juju/utils/set" "github.com/juju/utils/symlink" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/charmrepo" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charmrepo.v1" "gopkg.in/natefinch/lumberjack.v2" "github.com/juju/juju/agent" @@ -2144,8 +2144,8 @@ func (s *MachineWithCharmsSuite) SetUpSuite(c *gc.C) { } func (s *MachineWithCharmsSuite) TearDownSuite(c *gc.C) { - s.commonMachineSuite.TearDownSuite(c) s.CharmSuite.TearDownSuite(c) + s.commonMachineSuite.TearDownSuite(c) } func (s *MachineWithCharmsSuite) SetUpTest(c *gc.C) { @@ -2154,8 +2154,8 @@ func (s *MachineWithCharmsSuite) SetUpTest(c *gc.C) { } func (s *MachineWithCharmsSuite) TearDownTest(c *gc.C) { - s.commonMachineSuite.TearDownTest(c) s.CharmSuite.TearDownTest(c) + s.commonMachineSuite.TearDownTest(c) } func (s *MachineWithCharmsSuite) TestManageEnvironRunsCharmRevisionUpdater(c *gc.C) { diff --git a/cmd/jujud/main.go b/cmd/jujud/main.go index 16512914af8e..df48041fc7fa 100644 --- a/cmd/jujud/main.go +++ b/cmd/jujud/main.go @@ -22,9 +22,9 @@ import ( agentcmd "github.com/juju/juju/cmd/jujud/agent" "github.com/juju/juju/juju/names" "github.com/juju/juju/juju/sockets" - "github.com/juju/juju/storage/looputil" // Import the providers. _ "github.com/juju/juju/provider/all" + "github.com/juju/juju/storage/looputil" "github.com/juju/juju/worker/logsender" "github.com/juju/juju/worker/uniter/runner/jujuc" ) diff --git a/cmd/jujud/main_nix.go b/cmd/jujud/main_nix.go index 022cf18b5896..5be8b8301d13 100644 --- a/cmd/jujud/main_nix.go +++ b/cmd/jujud/main_nix.go @@ -9,8 +9,9 @@ package main import ( "os" - "github.com/juju/juju/juju/osenv" "github.com/juju/utils/featureflag" + + "github.com/juju/juju/juju/osenv" ) func init() { diff --git a/container/kvm/libvirt.go b/container/kvm/libvirt.go index e1715d9aedc0..54a3fca18899 100644 --- a/container/kvm/libvirt.go +++ b/container/kvm/libvirt.go @@ -21,8 +21,9 @@ import ( "strings" "github.com/juju/errors" - "github.com/juju/juju/network" "github.com/juju/utils" + + "github.com/juju/juju/network" ) var ( diff --git a/dependencies.tsv b/dependencies.tsv index f0303f8d4f44..debc402f6ef9 100644 --- a/dependencies.tsv +++ b/dependencies.tsv @@ -17,7 +17,7 @@ github.com/juju/gojsonreference git f0d24ac5ee330baa21721cdff56d45e4ee42628e 201 github.com/juju/gojsonschema git e1ad140384f254c82f89450d9a7c8dd38a632838 2015-03-12T17:00:16Z github.com/juju/govmomi git 4354a88d4b34abe467215f77c2fc1cb9f78b66f7 2015-04-24T01:54:48Z github.com/juju/httpprof git 14bf14c307672fd2456bdbf35d19cf0ccd3cf565 2014-12-17T16:00:36Z -github.com/juju/jujusvg git 28683402583926ce903491c14a07cdc5cb371adb 2015-04-10T08:55:05Z +github.com/juju/httprequest git 76dcfa921b9ccd65ca63c754c39f2cfa4acc1d5c 2015-09-14T15:16:24Z github.com/juju/loggo git 8477fc936adf0e382d680310047ca27e128a309a 2015-05-27T03:58:39Z github.com/juju/names git a6a253b0a94cc79e99a68d284b970ffce2a11ecd 2015-07-09T13:59:32Z github.com/juju/persistent-cookiejar git beee02cb39231c7ad4a01a677fc54c48d2b46b08 2015-04-09T09:48:35Z @@ -27,10 +27,11 @@ github.com/juju/schema git afe1151cb49d1d7ed3c75592dfc6f38703f2e988 2015-08-07T0 github.com/juju/syslog git 6be94e8b718766e9ff7a37342157fe4795da7cfa 2015-02-05T15:59:36Z github.com/juju/testing git 31ee64312c3c64cc94a5b41ea7a200b42e0f9767 2015-09-02T15:44:51Z github.com/juju/txn git 99ec629d0066a4d73c54d8e021a7fc1dc07df614 2015-06-09T16:58:27Z -github.com/juju/utils git 03357ca1fc29e4a2b9189c82906475b6bc34f84a 2015-09-10T03:07:18Z +github.com/juju/utils git 03357ca1fc29e4a2b9189c82906475b6bc34f84a 2015-09-10T07:18:02Z github.com/juju/xml git eb759a627588d35166bc505fceb51b88500e291e 2015-04-13T13:11:21Z -golang.org/x/crypto git c57d4a71915a248dbad846d60825145062b4c18e 2015-03-27T05:11:19Z -golang.org/x/net git bb64f4dc73d4ab97978d5e1cb34515dcc570361b 2015-05-18T01:39:50Z +github.com/julienschmidt/httprouter git 109e267447e95ad1bb48b758e40dd7453eb7b039 2015-09-05T17:25:33Z +golang.org/x/crypto git aedad9a179ec1ea11b7064c57cbc6dc30d7724ec 2015-08-30T18:06:42Z +golang.org/x/net git ea47fc708ee3e20177f3ca3716217c4ab75942cb 2015-08-29T23:03:18Z golang.org/x/oauth2 git 11c60b6f71a6ad48ed6f93c65fa4c6f9b1b5b46a 2015-03-25T02:00:22Z google.golang.org/api git 0d3983fb069cb6651353fc44c5cb604e263f2a93 2014-12-10T23:51:26Z google.golang.org/cloud git f20d6dcccb44ed49de45ae3703312cb46e627db1 2015-03-19T22:36:35Z @@ -38,12 +39,14 @@ gopkg.in/amz.v3 git bff3a097c4108da57bb8cbe3aad2990d74d23676 2015-08-20T12:28:33 gopkg.in/check.v1 git b3d3430320d4260e5fea99841af984b3badcea63 2015-06-26T10:50:28Z gopkg.in/errgo.v1 git 15098963088579c1cd9eb1a7da285831e548390b 2015-07-07T18:34:45Z gopkg.in/goose.v1 git be6030ce33a6d77f5e9c63b7698030e6431d5343 2015-08-24T15:19:40Z -gopkg.in/juju/charm.v5 git 1d5ef3d01f135c3324e309ca06393882ba5e6d0e 2015-07-20T12:55:48Z -gopkg.in/juju/charmstore.v4 git b90d24652753eeb1f7d209483d499f6b24dcf25e 2015-07-10T10:24:09Z +gopkg.in/juju/charm.v6-unstable git 49f6312f83592ab73309a9de5987d49a789c806c 2015-09-02T21:57:54Z +gopkg.in/juju/charmrepo.v1 git 8677b12d9772a2a596a99e65b7e6f642fceb6c40 2015-09-14T13:26:00Z +gopkg.in/juju/charmstore.v5-unstable git a921c6c69d74361c38a99a95d2aceec76533038d 2015-08-27T20:19:40Z gopkg.in/juju/environschema.v1 git 16cc59268c09c22870cb4de8eb6248652535f315 2015-08-24T13:22:26Z -gopkg.in/macaroon-bakery.v0 git 9593b80b01ba04b519769d045dffd6abd827d2fd 2015-04-10T07:46:55Z +gopkg.in/juju/jujusvg.v1 git 3eedb1c722ece2b66d62508368ca3e8b7f916569 2015-05-20T11:48:32Z +gopkg.in/macaroon-bakery.v1 git 4ef12b7e1bf76f499808a230a099019fe9b7f192 2015-09-03T21:38:03Z gopkg.in/macaroon.v1 git ab3940c6c16510a850e1c2dd628b919f0f3f1464 2015-01-21T11:42:31Z -gopkg.in/mgo.v2 git 3569c88678d88179dcbd68d02ab081cbca3cd4d0 2015-06-04T15:26:27Z +gopkg.in/mgo.v2 git f4923a569136442e900b8cf5c1a706c0a8b0883c 2015-08-21T15:31:23Z gopkg.in/natefinch/lumberjack.v2 git 588a21fb0fa0ebdfde42670fa214576b6f0f22df 2015-05-21T01:59:18Z gopkg.in/natefinch/npipe.v2 git e562d4ae5c2f838f9e7e406f7d9890d5b02467a9 2014-08-11T16:19:00Z gopkg.in/yaml.v1 git 9f9df34309c04878acc86042b16630b0f696e1de 2014-09-24T16:16:07Z @@ -51,4 +54,4 @@ launchpad.net/gnuflag bzr roger.peppe@canonical.com-20140716064605-pk32dnmfust02 launchpad.net/golxc bzr ian.booth@canonical.com-20141121040613-ztm1q0iy9rune3zt 13 launchpad.net/gomaasapi bzr michael.foord@canonical.com-20150703101140-oo7493pkzlzg7l6u 63 launchpad.net/gwacl bzr andrew.wilkins@canonical.com-20150811023840-kvosbu9d0kwwjfm2 245 -launchpad.net/tomb bzr gustavo@niemeyer.net-20130531003818-70ikdgklbxopn8x4 17 +launchpad.net/tomb bzr gustavo@niemeyer.net-20140529072043-hzcrlnl3ygvg914q 18 diff --git a/environs/config/config.go b/environs/config/config.go index 0d7a0e04eb9c..eef48be1227a 100644 --- a/environs/config/config.go +++ b/environs/config/config.go @@ -17,8 +17,8 @@ import ( "github.com/juju/schema" "github.com/juju/utils" "github.com/juju/utils/proxy" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/charmrepo" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charmrepo.v1" "gopkg.in/juju/environschema.v1" "github.com/juju/juju/cert" diff --git a/environs/config/config_test.go b/environs/config/config_test.go index c6bed7465767..5d58a743813c 100644 --- a/environs/config/config_test.go +++ b/environs/config/config_test.go @@ -17,7 +17,7 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils/proxy" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5/charmrepo" + "gopkg.in/juju/charmrepo.v1" "gopkg.in/juju/environschema.v1" "github.com/juju/juju/cert" diff --git a/environs/configstore/cachefile_test.go b/environs/configstore/cachefile_test.go index 7f7fcf953384..99b0bc25731b 100644 --- a/environs/configstore/cachefile_test.go +++ b/environs/configstore/cachefile_test.go @@ -7,12 +7,12 @@ import ( "fmt" "path/filepath" - "github.com/juju/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" "github.com/juju/juju/environs/configstore" "github.com/juju/juju/feature" + "github.com/juju/juju/testing" ) var _ = gc.Suite(&cacheFileInterfaceSuite{}) diff --git a/environs/jujutest/livetests.go b/environs/jujutest/livetests.go index 4064be388714..f673e846e5b2 100644 --- a/environs/jujutest/livetests.go +++ b/environs/jujutest/livetests.go @@ -12,7 +12,7 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5/charmrepo" + "gopkg.in/juju/charmrepo.v1" "github.com/juju/juju/api" "github.com/juju/juju/cloudconfig/instancecfg" diff --git a/featuretests/cmd_juju_system_test.go b/featuretests/cmd_juju_system_test.go index c74fe1393fb3..ebbf34a4bb10 100644 --- a/featuretests/cmd_juju_system_test.go +++ b/featuretests/cmd_juju_system_test.go @@ -5,10 +5,9 @@ package featuretests import ( "fmt" - "strings" - "io/ioutil" "path/filepath" + "strings" "github.com/juju/cmd" "github.com/juju/errors" diff --git a/featuretests/cmdjuju_test.go b/featuretests/cmdjuju_test.go index 6a0df6068e64..c09d08d75549 100644 --- a/featuretests/cmdjuju_test.go +++ b/featuretests/cmdjuju_test.go @@ -6,7 +6,7 @@ package featuretests import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/cmd/envcmd" "github.com/juju/juju/cmd/juju/common" diff --git a/juju/deploy.go b/juju/deploy.go index d536b5a38dd8..f8fa69e45a57 100644 --- a/juju/deploy.go +++ b/juju/deploy.go @@ -9,7 +9,7 @@ import ( "github.com/juju/errors" "github.com/juju/names" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/constraints" "github.com/juju/juju/instance" diff --git a/juju/deploy_test.go b/juju/deploy_test.go index ae3406d26a3c..e3d9e4cddb73 100644 --- a/juju/deploy_test.go +++ b/juju/deploy_test.go @@ -11,8 +11,8 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils/set" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/charmrepo" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charmrepo.v1" "github.com/juju/juju/constraints" "github.com/juju/juju/instance" diff --git a/juju/home.go b/juju/home.go index 56ff67a9a428..a455dc9e35b7 100644 --- a/juju/home.go +++ b/juju/home.go @@ -7,7 +7,7 @@ import ( stderrors "errors" "fmt" - "gopkg.in/juju/charm.v5/charmrepo" + "gopkg.in/juju/charmrepo.v1" "github.com/juju/juju/juju/osenv" "github.com/juju/juju/utils/ssh" diff --git a/juju/series/series_windows_test.go b/juju/series/series_windows_test.go index bb49bbc040c3..30cf17171c63 100644 --- a/juju/series/series_windows_test.go +++ b/juju/series/series_windows_test.go @@ -13,7 +13,11 @@ import ( "github.com/juju/juju/juju/series" "github.com/juju/juju/testing" jc "github.com/juju/testing/checkers" + "github.com/juju/utils" gc "gopkg.in/check.v1" + + "github.com/juju/juju/testing" + "github.com/juju/juju/version" ) type windowsSeriesSuite struct { diff --git a/juju/testing/conn.go b/juju/testing/conn.go index 8249bd16f073..f112b4965bd9 100644 --- a/juju/testing/conn.go +++ b/juju/testing/conn.go @@ -17,8 +17,8 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/charmrepo" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charmrepo.v1" goyaml "gopkg.in/yaml.v1" "github.com/juju/juju/agent" diff --git a/juju/testing/repo.go b/juju/testing/repo.go index a0e8c3685562..cff95924f89d 100644 --- a/juju/testing/repo.go +++ b/juju/testing/repo.go @@ -9,7 +9,7 @@ import ( "github.com/juju/utils" "github.com/juju/utils/symlink" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/environs/config" "github.com/juju/juju/state" diff --git a/provider/maas/environ.go b/provider/maas/environ.go index 2a38fd8020ea..cd96a2492dc4 100644 --- a/provider/maas/environ.go +++ b/provider/maas/environ.go @@ -18,6 +18,7 @@ import ( "time" "github.com/juju/errors" + "github.com/juju/names" "github.com/juju/utils" "github.com/juju/utils/set" "gopkg.in/mgo.v2/bson" @@ -38,7 +39,6 @@ import ( "github.com/juju/juju/provider/common" "github.com/juju/juju/state/multiwatcher" "github.com/juju/juju/tools" - "github.com/juju/names" ) const ( diff --git a/provider/vsphere/environ_broker.go b/provider/vsphere/environ_broker.go index 92c5d026138b..8bd53651bf3e 100644 --- a/provider/vsphere/environ_broker.go +++ b/provider/vsphere/environ_broker.go @@ -8,6 +8,7 @@ package vsphere import ( "github.com/juju/errors" "github.com/juju/govmomi/vim25/mo" + "github.com/juju/utils" "github.com/juju/juju/cloudconfig/cloudinit" "github.com/juju/juju/cloudconfig/instancecfg" @@ -17,7 +18,6 @@ import ( "github.com/juju/juju/provider/common" "github.com/juju/juju/state/multiwatcher" "github.com/juju/juju/tools" - "github.com/juju/utils" ) const ( diff --git a/provider/vsphere/environ_broker_test.go b/provider/vsphere/environ_broker_test.go index 0886c548686d..d34263be7e36 100644 --- a/provider/vsphere/environ_broker_test.go +++ b/provider/vsphere/environ_broker_test.go @@ -6,13 +6,12 @@ package vsphere_test import ( - jc "github.com/juju/testing/checkers" - gc "gopkg.in/check.v1" - "github.com/juju/errors" "github.com/juju/govmomi/vim25/methods" "github.com/juju/govmomi/vim25/soap" "github.com/juju/govmomi/vim25/types" + jc "github.com/juju/testing/checkers" + gc "gopkg.in/check.v1" "github.com/juju/juju/cloudconfig/instancecfg" "github.com/juju/juju/constraints" diff --git a/provider/vsphere/ova_import_manager.go b/provider/vsphere/ova_import_manager.go index b28622e5082c..ea843fa39e0c 100644 --- a/provider/vsphere/ova_import_manager.go +++ b/provider/vsphere/ova_import_manager.go @@ -20,8 +20,9 @@ import ( "github.com/juju/govmomi/vim25/progress" "github.com/juju/govmomi/vim25/soap" "github.com/juju/govmomi/vim25/types" - "github.com/juju/juju/juju/osenv" "golang.org/x/net/context" + + "github.com/juju/juju/juju/osenv" ) /* diff --git a/service/windows/service_test.go b/service/windows/service_test.go index 399cc70ed4e4..7a2cda5a0c3b 100644 --- a/service/windows/service_test.go +++ b/service/windows/service_test.go @@ -1,15 +1,14 @@ package windows_test import ( - coretesting "github.com/juju/juju/testing" - "github.com/juju/testing" - "github.com/juju/errors" + "github.com/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" "github.com/juju/juju/service/common" "github.com/juju/juju/service/windows" + coretesting "github.com/juju/juju/testing" ) type serviceSuite struct { diff --git a/service/windows/stubwinsvc_test.go b/service/windows/stubwinsvc_test.go index 8eea3a892976..fe27b139dd04 100644 --- a/service/windows/stubwinsvc_test.go +++ b/service/windows/stubwinsvc_test.go @@ -10,7 +10,6 @@ import ( "github.com/gabriel-samfira/sys/windows" "github.com/gabriel-samfira/sys/windows/svc" "github.com/gabriel-samfira/sys/windows/svc/mgr" - "github.com/juju/testing" ) diff --git a/state/allwatcher.go b/state/allwatcher.go index be93843578b5..986753244778 100644 --- a/state/allwatcher.go +++ b/state/allwatcher.go @@ -9,11 +9,12 @@ import ( "time" "github.com/juju/errors" + "github.com/juju/names" + "gopkg.in/mgo.v2" + "github.com/juju/juju/network" "github.com/juju/juju/state/multiwatcher" "github.com/juju/juju/state/watcher" - "github.com/juju/names" - "gopkg.in/mgo.v2" ) // allWatcherStateBacking implements Backing by fetching entities for diff --git a/state/allwatcher_internal_test.go b/state/allwatcher_internal_test.go index 596caf9fd843..73c9ec923457 100644 --- a/state/allwatcher_internal_test.go +++ b/state/allwatcher_internal_test.go @@ -14,7 +14,7 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/constraints" "github.com/juju/juju/instance" diff --git a/state/charm.go b/state/charm.go index e9739f5a3c2c..f0a04f575947 100644 --- a/state/charm.go +++ b/state/charm.go @@ -9,7 +9,7 @@ import ( "github.com/juju/errors" "github.com/juju/names" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/txn" diff --git a/state/charm_test.go b/state/charm_test.go index b9de01a2da7d..d52bc99c2945 100644 --- a/state/charm_test.go +++ b/state/charm_test.go @@ -9,7 +9,7 @@ import ( "github.com/juju/errors" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/state" "github.com/juju/juju/testcharms" diff --git a/state/cleanup_test.go b/state/cleanup_test.go index bff378e6236d..a4bdbfb821ba 100644 --- a/state/cleanup_test.go +++ b/state/cleanup_test.go @@ -10,7 +10,7 @@ import ( "github.com/juju/names" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/instance" "github.com/juju/juju/state" diff --git a/state/endpoint.go b/state/endpoint.go index 9dcde571f4b6..0a0e4a995a17 100644 --- a/state/endpoint.go +++ b/state/endpoint.go @@ -6,7 +6,7 @@ package state import ( "fmt" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" ) // counterpartRole returns the RelationRole that this RelationRole diff --git a/state/endpoint_test.go b/state/endpoint_test.go index 7b77a2283184..92c43d3670cf 100644 --- a/state/endpoint_test.go +++ b/state/endpoint_test.go @@ -6,7 +6,7 @@ package state_test import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/state" ) diff --git a/state/errors.go b/state/errors.go index a98282a92e6c..c1beb712b9cb 100644 --- a/state/errors.go +++ b/state/errors.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/juju/errors" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "gopkg.in/mgo.v2/txn" ) diff --git a/state/export_test.go b/state/export_test.go index b76013440893..54960884a3e7 100644 --- a/state/export_test.go +++ b/state/export_test.go @@ -16,7 +16,7 @@ import ( jujutxn "github.com/juju/txn" txntesting "github.com/juju/txn/testing" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/txn" diff --git a/state/filesystem.go b/state/filesystem.go index 6af4695aad21..bb771b00043f 100644 --- a/state/filesystem.go +++ b/state/filesystem.go @@ -12,7 +12,7 @@ import ( "github.com/juju/errors" "github.com/juju/names" jujutxn "github.com/juju/txn" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/txn" diff --git a/state/filesystem_test.go b/state/filesystem_test.go index 19ef297c06c5..98b5ef652322 100644 --- a/state/filesystem_test.go +++ b/state/filesystem_test.go @@ -8,7 +8,7 @@ import ( "github.com/juju/names" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/state" "github.com/juju/juju/state/testing" diff --git a/state/metrics.go b/state/metrics.go index 5a78a6c083a6..6039cbc9e16e 100644 --- a/state/metrics.go +++ b/state/metrics.go @@ -10,7 +10,7 @@ import ( "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/txn" diff --git a/state/multiwatcher/multiwatcher.go b/state/multiwatcher/multiwatcher.go index cf0befe0be25..93e80b70d535 100644 --- a/state/multiwatcher/multiwatcher.go +++ b/state/multiwatcher/multiwatcher.go @@ -9,7 +9,7 @@ import ( "fmt" "time" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/constraints" "github.com/juju/juju/instance" diff --git a/state/relation.go b/state/relation.go index 0968be83526d..e06258143f54 100644 --- a/state/relation.go +++ b/state/relation.go @@ -13,7 +13,7 @@ import ( "github.com/juju/errors" "github.com/juju/names" jujutxn "github.com/juju/txn" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/txn" diff --git a/state/relation_internal_test.go b/state/relation_internal_test.go index 84bd48ae171d..8f592cbdb2bd 100644 --- a/state/relation_internal_test.go +++ b/state/relation_internal_test.go @@ -6,7 +6,7 @@ package state import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" ) type RelationSuite struct{} diff --git a/state/relation_test.go b/state/relation_test.go index 6526f5ea7d5e..b2c50b62c391 100644 --- a/state/relation_test.go +++ b/state/relation_test.go @@ -7,7 +7,7 @@ import ( "github.com/juju/errors" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/state" ) diff --git a/state/relationunit.go b/state/relationunit.go index 08be404ca591..30e4a048a070 100644 --- a/state/relationunit.go +++ b/state/relationunit.go @@ -11,7 +11,7 @@ import ( "github.com/juju/errors" "github.com/juju/names" jujutxn "github.com/juju/txn" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/txn" diff --git a/state/relationunit_test.go b/state/relationunit_test.go index 22828b7bb690..2da0c5973ee6 100644 --- a/state/relationunit_test.go +++ b/state/relationunit_test.go @@ -13,7 +13,7 @@ import ( "github.com/juju/names" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/network" "github.com/juju/juju/state" diff --git a/state/service.go b/state/service.go index c34ac802e005..b0266f07e0b0 100644 --- a/state/service.go +++ b/state/service.go @@ -14,7 +14,7 @@ import ( "github.com/juju/errors" "github.com/juju/names" jujutxn "github.com/juju/txn" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/txn" diff --git a/state/service_test.go b/state/service_test.go index b1f4dbb32553..e11cd5171fb2 100644 --- a/state/service_test.go +++ b/state/service_test.go @@ -12,7 +12,7 @@ import ( jc "github.com/juju/testing/checkers" jujutxn "github.com/juju/txn" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/txn" diff --git a/state/state.go b/state/state.go index f8326cd7a296..3e5d8768befe 100644 --- a/state/state.go +++ b/state/state.go @@ -21,7 +21,7 @@ import ( "github.com/juju/names" jujutxn "github.com/juju/txn" "github.com/juju/utils" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/txn" diff --git a/state/state_leader_test.go b/state/state_leader_test.go index 55400ff4410c..153157ed6a0d 100644 --- a/state/state_leader_test.go +++ b/state/state_leader_test.go @@ -6,9 +6,10 @@ package state_test import ( "time" - coretesting "github.com/juju/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" + + coretesting "github.com/juju/juju/testing" ) type StateLeadershipSuite struct { diff --git a/state/state_test.go b/state/state_test.go index 5221964db586..aa0600cf1905 100644 --- a/state/state_test.go +++ b/state/state_test.go @@ -20,7 +20,7 @@ import ( "github.com/juju/txn" "github.com/juju/utils" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" mgotxn "gopkg.in/mgo.v2/txn" diff --git a/state/storage.go b/state/storage.go index 70e838ac9e57..8e4fd90a26aa 100644 --- a/state/storage.go +++ b/state/storage.go @@ -11,7 +11,7 @@ import ( "github.com/juju/names" jujutxn "github.com/juju/txn" "github.com/juju/utils/set" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/txn" diff --git a/state/storage_test.go b/state/storage_test.go index 82161556592e..24bd80cd38ea 100644 --- a/state/storage_test.go +++ b/state/storage_test.go @@ -11,7 +11,7 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils/set" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "gopkg.in/mgo.v2" "github.com/juju/juju/state" diff --git a/state/unit.go b/state/unit.go index 1abd423eacc5..8b8fde52c5d5 100644 --- a/state/unit.go +++ b/state/unit.go @@ -14,7 +14,7 @@ import ( jujutxn "github.com/juju/txn" "github.com/juju/utils" "github.com/juju/utils/set" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/txn" diff --git a/state/unit_test.go b/state/unit_test.go index 5f53dcee270b..0eae90782a2c 100644 --- a/state/unit_test.go +++ b/state/unit_test.go @@ -10,7 +10,7 @@ import ( jc "github.com/juju/testing/checkers" jujutxn "github.com/juju/txn" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/instance" "github.com/juju/juju/network" diff --git a/state/upgrades.go b/state/upgrades.go index 9c50c471c85b..4f52692bac9f 100644 --- a/state/upgrades.go +++ b/state/upgrades.go @@ -14,7 +14,7 @@ import ( "github.com/juju/names" "github.com/juju/utils" "github.com/juju/utils/set" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/txn" diff --git a/state/upgrades_test.go b/state/upgrades_test.go index 17bd247aaf1a..4c2e04e0cab6 100644 --- a/state/upgrades_test.go +++ b/state/upgrades_test.go @@ -15,7 +15,7 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/txn" diff --git a/testcharms/charm.go b/testcharms/charm.go index 21008e2ab5d7..5461c3de5786 100644 --- a/testcharms/charm.go +++ b/testcharms/charm.go @@ -6,8 +6,38 @@ package testcharms import ( - "gopkg.in/juju/charm.v5/testing" + jc "github.com/juju/testing/checkers" + gc "gopkg.in/check.v1" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charmrepo.v1/csclient" + "gopkg.in/juju/charmrepo.v1/csclient/params" + "gopkg.in/juju/charmrepo.v1/testing" ) // Repo provides access to the test charm repository. var Repo = testing.NewRepo("charm-repo", "quantal") + +// UploadCharm uploads a charm using the given charm store client, and returns +// the resulting charm URL and charm. +func UploadCharm(c *gc.C, client *csclient.Client, url, name string) (*charm.URL, charm.Charm) { + id := charm.MustParseReference(url) + promulgatedRevision := -1 + if id.User == "" { + id.User = "who" + promulgatedRevision = id.Revision + } + ch := Repo.CharmArchive(c.MkDir(), name) + + // Upload the charm. + err := client.UploadCharmWithRevision(id, ch, promulgatedRevision) + c.Assert(err, jc.ErrorIsNil) + + // Allow read permissions to everyone. + err = client.Put("/"+id.Path()+"/meta/perm/read", []string{params.Everyone}) + c.Assert(err, jc.ErrorIsNil) + + // Return the charm and its URL. + curl, err := id.URL("") + c.Assert(err, jc.ErrorIsNil) + return curl, ch +} diff --git a/testing/factory/factory.go b/testing/factory/factory.go index 81bce19eaf1b..4e09a6c1f2b1 100644 --- a/testing/factory/factory.go +++ b/testing/factory/factory.go @@ -10,14 +10,14 @@ import ( "sync/atomic" "time" - envtesting "github.com/juju/juju/environs/testing" "github.com/juju/names" jc "github.com/juju/testing/checkers" "github.com/juju/utils" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/environs" + envtesting "github.com/juju/juju/environs/testing" "github.com/juju/juju/instance" "github.com/juju/juju/network" "github.com/juju/juju/state" diff --git a/testing/factory/factory_test.go b/testing/factory/factory_test.go index 272811d834b8..cea37785d410 100644 --- a/testing/factory/factory_test.go +++ b/testing/factory/factory_test.go @@ -13,7 +13,7 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/instance" "github.com/juju/juju/state" diff --git a/upgrades/charmstorage.go b/upgrades/charmstorage.go index 821dba199a7c..95c9672f5ba2 100644 --- a/upgrades/charmstorage.go +++ b/upgrades/charmstorage.go @@ -13,7 +13,7 @@ import ( "github.com/juju/errors" "github.com/juju/utils" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/agent" "github.com/juju/juju/provider" diff --git a/upgrades/charmstorage_test.go b/upgrades/charmstorage_test.go index cb925b7a50e1..205f19918452 100644 --- a/upgrades/charmstorage_test.go +++ b/upgrades/charmstorage_test.go @@ -11,7 +11,7 @@ import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/agent" "github.com/juju/juju/environs" diff --git a/upgrades/steps125.go b/upgrades/steps125.go index 2c821c8ae67a..2b9564cd0c91 100644 --- a/upgrades/steps125.go +++ b/upgrades/steps125.go @@ -7,12 +7,13 @@ import ( "strings" "github.com/juju/errors" + "github.com/juju/utils/exec" + "github.com/juju/juju/cloudconfig" "github.com/juju/juju/environs" "github.com/juju/juju/juju/os" "github.com/juju/juju/juju/osenv" "github.com/juju/juju/state" - "github.com/juju/utils/exec" ) // stateStepsFor125 returns upgrade steps for Juju 1.25 that manipulate state directly. diff --git a/upgrades/steps125_test.go b/upgrades/steps125_test.go index 4d4e2b84e56e..5eeae210b5b7 100644 --- a/upgrades/steps125_test.go +++ b/upgrades/steps125_test.go @@ -7,10 +7,9 @@ import ( "errors" "strings" - gc "gopkg.in/check.v1" - jc "github.com/juju/testing/checkers" "github.com/juju/utils/exec" + gc "gopkg.in/check.v1" "github.com/juju/juju/cloudconfig" "github.com/juju/juju/juju/os" diff --git a/worker/charmrevisionworker/revisionupdater_test.go b/worker/charmrevisionworker/revisionupdater_test.go index 3a0126c0a8d0..0a07712c51f4 100644 --- a/worker/charmrevisionworker/revisionupdater_test.go +++ b/worker/charmrevisionworker/revisionupdater_test.go @@ -11,7 +11,7 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api" "github.com/juju/juju/apiserver/charmrevisionupdater/testing" @@ -63,6 +63,7 @@ func (s *RevisionUpdateSuite) SetUpTest(c *gc.C) { } func (s *RevisionUpdateSuite) TearDownTest(c *gc.C) { + s.CharmSuite.TearDownTest(c) s.JujuConnSuite.TearDownTest(c) } @@ -108,9 +109,7 @@ func (s *RevisionUpdateSuite) TestVersionUpdateRunsPeriodically(c *gc.C) { c.Assert(s.checkCharmRevision(c, 23), jc.IsTrue) // Make some changes - id := charm.MustParseReference("~who/quantal/mysql-24") - ch := testcharms.Repo.CharmArchive(c.MkDir(), id.Name) - s.Server.UploadCharm(c, ch, id, true) + testcharms.UploadCharm(c, s.Client, "quantal/mysql-24", "mysql") // Check the results of the latest changes. c.Assert(s.checkCharmRevision(c, 24), jc.IsTrue) } diff --git a/worker/envworkermanager/envworkermanager_test.go b/worker/envworkermanager/envworkermanager_test.go index 716cd3901467..d928c852c39a 100644 --- a/worker/envworkermanager/envworkermanager_test.go +++ b/worker/envworkermanager/envworkermanager_test.go @@ -8,13 +8,13 @@ import ( "time" "github.com/juju/errors" - cmdutil "github.com/juju/juju/cmd/jujud/util" "github.com/juju/loggo" "github.com/juju/names" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" "launchpad.net/tomb" + cmdutil "github.com/juju/juju/cmd/jujud/util" "github.com/juju/juju/state" statetesting "github.com/juju/juju/state/testing" "github.com/juju/juju/testing" diff --git a/worker/logsender/bufferedlogwriter.go b/worker/logsender/bufferedlogwriter.go index f635950c7813..26de833fb231 100644 --- a/worker/logsender/bufferedlogwriter.go +++ b/worker/logsender/bufferedlogwriter.go @@ -9,9 +9,10 @@ import ( "time" "github.com/juju/errors" - "github.com/juju/juju/feature" "github.com/juju/loggo" "github.com/juju/utils/deque" + + "github.com/juju/juju/feature" ) // LogRecord represents a log message in an agent which is to be diff --git a/worker/machiner/state.go b/worker/machiner/state.go index 667770d43fe2..6b59b5fcadba 100644 --- a/worker/machiner/state.go +++ b/worker/machiner/state.go @@ -4,11 +4,12 @@ package machiner import ( "github.com/juju/errors" + "github.com/juju/names" + "github.com/juju/juju/api/machiner" "github.com/juju/juju/api/watcher" "github.com/juju/juju/apiserver/params" "github.com/juju/juju/network" - "github.com/juju/names" ) type MachineAccessor interface { diff --git a/worker/metrics/collect/context_test.go b/worker/metrics/collect/context_test.go index 33983d7cff51..dca24cb59888 100644 --- a/worker/metrics/collect/context_test.go +++ b/worker/metrics/collect/context_test.go @@ -10,7 +10,7 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils/keyvalues" gc "gopkg.in/check.v1" - corecharm "gopkg.in/juju/charm.v5" + corecharm "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/worker/metrics/collect" ) diff --git a/worker/metrics/collect/manifold.go b/worker/metrics/collect/manifold.go index 5a644c1e3332..fd2aa8f54e48 100644 --- a/worker/metrics/collect/manifold.go +++ b/worker/metrics/collect/manifold.go @@ -13,8 +13,8 @@ import ( "github.com/juju/errors" "github.com/juju/loggo" "github.com/juju/names" - corecharm "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/hooks" + corecharm "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/agent" "github.com/juju/juju/api/base" diff --git a/worker/metrics/collect/manifold_test.go b/worker/metrics/collect/manifold_test.go index 2b2091e15d55..383cd72cafa4 100644 --- a/worker/metrics/collect/manifold_test.go +++ b/worker/metrics/collect/manifold_test.go @@ -10,7 +10,7 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils" gc "gopkg.in/check.v1" - corecharm "gopkg.in/juju/charm.v5" + corecharm "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/agent" "github.com/juju/juju/api/base" diff --git a/worker/metrics/sender/sender_test.go b/worker/metrics/sender/sender_test.go index 8a5e28aa9060..b78f03cdbfe6 100644 --- a/worker/metrics/sender/sender_test.go +++ b/worker/metrics/sender/sender_test.go @@ -10,7 +10,7 @@ import ( "github.com/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - corecharm "gopkg.in/juju/charm.v5" + corecharm "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/apiserver/params" "github.com/juju/juju/worker/metrics/sender" diff --git a/worker/metrics/spool/manifold.go b/worker/metrics/spool/manifold.go index d286bd4fb31e..94540010e771 100644 --- a/worker/metrics/spool/manifold.go +++ b/worker/metrics/spool/manifold.go @@ -12,7 +12,7 @@ import ( "time" "github.com/juju/errors" - corecharm "gopkg.in/juju/charm.v5" + corecharm "gopkg.in/juju/charm.v6-unstable" "launchpad.net/tomb" "github.com/juju/juju/agent" diff --git a/worker/metrics/spool/metrics.go b/worker/metrics/spool/metrics.go index f64f9f9fb2c4..5860f2a048d8 100644 --- a/worker/metrics/spool/metrics.go +++ b/worker/metrics/spool/metrics.go @@ -14,11 +14,11 @@ import ( "time" "github.com/juju/errors" - "github.com/juju/juju/apiserver/params" "github.com/juju/loggo" "github.com/juju/utils" - corecharm "gopkg.in/juju/charm.v5" + corecharm "gopkg.in/juju/charm.v6-unstable" + "github.com/juju/juju/apiserver/params" "github.com/juju/juju/worker/uniter/runner/jujuc" ) diff --git a/worker/metrics/spool/metrics_test.go b/worker/metrics/spool/metrics_test.go index 53a0df766687..8c62d90cedda 100644 --- a/worker/metrics/spool/metrics_test.go +++ b/worker/metrics/spool/metrics_test.go @@ -12,7 +12,7 @@ import ( "github.com/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - corecharm "gopkg.in/juju/charm.v5" + corecharm "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/worker/metrics/spool" "github.com/juju/juju/worker/uniter/runner/jujuc" diff --git a/worker/rsyslog/manifold.go b/worker/rsyslog/manifold.go index f8117f1769a0..3405442de3e7 100644 --- a/worker/rsyslog/manifold.go +++ b/worker/rsyslog/manifold.go @@ -4,6 +4,8 @@ package rsyslog import ( + "github.com/juju/utils/featureflag" + "github.com/juju/juju/agent" "github.com/juju/juju/api/base" "github.com/juju/juju/api/rsyslog" @@ -11,7 +13,6 @@ import ( "github.com/juju/juju/worker" "github.com/juju/juju/worker/dependency" "github.com/juju/juju/worker/util" - "github.com/juju/utils/featureflag" ) // ManifoldConfig defines the names of the manifolds on which a diff --git a/worker/txnpruner/txnpruner.go b/worker/txnpruner/txnpruner.go index d9ace2157ee9..0ccb7dd223df 100644 --- a/worker/txnpruner/txnpruner.go +++ b/worker/txnpruner/txnpruner.go @@ -7,6 +7,7 @@ import ( "time" "github.com/juju/errors" + "github.com/juju/juju/worker" ) diff --git a/worker/uniter/charm/bundles.go b/worker/uniter/charm/bundles.go index b77841122f88..b14fb0284874 100644 --- a/worker/uniter/charm/bundles.go +++ b/worker/uniter/charm/bundles.go @@ -10,7 +10,7 @@ import ( "github.com/juju/errors" "github.com/juju/utils" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/downloader" ) diff --git a/worker/uniter/charm/bundles_test.go b/worker/uniter/charm/bundles_test.go index 42b54f4c33ca..875ff3e92dd3 100644 --- a/worker/uniter/charm/bundles_test.go +++ b/worker/uniter/charm/bundles_test.go @@ -18,7 +18,7 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils" gc "gopkg.in/check.v1" - corecharm "gopkg.in/juju/charm.v5" + corecharm "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api" "github.com/juju/juju/api/uniter" diff --git a/worker/uniter/charm/charm.go b/worker/uniter/charm/charm.go index 7197b656a138..1efcb85060d2 100644 --- a/worker/uniter/charm/charm.go +++ b/worker/uniter/charm/charm.go @@ -10,7 +10,7 @@ import ( "github.com/juju/loggo" "github.com/juju/utils" "github.com/juju/utils/set" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" ) var logger = loggo.GetLogger("juju.worker.uniter.charm") diff --git a/worker/uniter/charm/charm_test.go b/worker/uniter/charm/charm_test.go index c78070f964c8..6d70176ca8d5 100644 --- a/worker/uniter/charm/charm_test.go +++ b/worker/uniter/charm/charm_test.go @@ -11,7 +11,7 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils/set" gc "gopkg.in/check.v1" - corecharm "gopkg.in/juju/charm.v5" + corecharm "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/testcharms" "github.com/juju/juju/worker/uniter/charm" diff --git a/worker/uniter/charm/converter.go b/worker/uniter/charm/converter.go index 22e4986dc76a..ea5a7ca94651 100644 --- a/worker/uniter/charm/converter.go +++ b/worker/uniter/charm/converter.go @@ -10,7 +10,7 @@ import ( "github.com/juju/utils/set" "github.com/juju/utils/symlink" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" ) // NewDeployer returns a Deployer of whatever kind is currently in use for the diff --git a/worker/uniter/charm/git.go b/worker/uniter/charm/git.go index 9bdb7f6397f9..0e3b4eb516ff 100644 --- a/worker/uniter/charm/git.go +++ b/worker/uniter/charm/git.go @@ -12,7 +12,7 @@ import ( "path/filepath" "strings" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" ) // GitDir exposes a specialized subset of git operations on a directory. diff --git a/worker/uniter/charm/git_deployer_test.go b/worker/uniter/charm/git_deployer_test.go index d8c1646e4cda..d034f8c76ebf 100644 --- a/worker/uniter/charm/git_deployer_test.go +++ b/worker/uniter/charm/git_deployer_test.go @@ -10,7 +10,7 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils/symlink" gc "gopkg.in/check.v1" - corecharm "gopkg.in/juju/charm.v5" + corecharm "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/testing" "github.com/juju/juju/worker/uniter/charm" diff --git a/worker/uniter/charm/git_test.go b/worker/uniter/charm/git_test.go index 0aa7e3c5b56c..e42757143bae 100644 --- a/worker/uniter/charm/git_test.go +++ b/worker/uniter/charm/git_test.go @@ -13,7 +13,7 @@ import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - corecharm "gopkg.in/juju/charm.v5" + corecharm "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/testing" "github.com/juju/juju/worker/uniter/charm" diff --git a/worker/uniter/charm/manifest_deployer.go b/worker/uniter/charm/manifest_deployer.go index 91cdb47e1008..594ef3ab6943 100644 --- a/worker/uniter/charm/manifest_deployer.go +++ b/worker/uniter/charm/manifest_deployer.go @@ -10,7 +10,7 @@ import ( "github.com/juju/utils" "github.com/juju/utils/set" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" ) const ( diff --git a/worker/uniter/hook/hook.go b/worker/uniter/hook/hook.go index 84e897230b0e..c8afc1854802 100644 --- a/worker/uniter/hook/hook.go +++ b/worker/uniter/hook/hook.go @@ -8,7 +8,7 @@ import ( "fmt" "github.com/juju/names" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" ) // TODO(fwereade): move these definitions to juju/charm/hooks. diff --git a/worker/uniter/hook/hook_test.go b/worker/uniter/hook/hook_test.go index be7c8c4e6b55..7397c6ab02ca 100644 --- a/worker/uniter/hook/hook_test.go +++ b/worker/uniter/hook/hook_test.go @@ -6,7 +6,7 @@ package hook_test import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/testing" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/hook/hooktesting/source.go b/worker/uniter/hook/hooktesting/source.go index b80d4d725341..7e67281af4fe 100644 --- a/worker/uniter/hook/hooktesting/source.go +++ b/worker/uniter/hook/hooktesting/source.go @@ -4,7 +4,7 @@ package hooktesting import ( - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "launchpad.net/tomb" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/hook/listsource_test.go b/worker/uniter/hook/listsource_test.go index 41fa9d5d89cc..3dc80b2f1584 100644 --- a/worker/uniter/hook/listsource_test.go +++ b/worker/uniter/hook/listsource_test.go @@ -6,7 +6,7 @@ package hook_test import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/worker/uniter/hook" "github.com/juju/juju/worker/uniter/hook/hooktesting" diff --git a/worker/uniter/hook/peeker_test.go b/worker/uniter/hook/peeker_test.go index 03d899350f59..03cdf017d9eb 100644 --- a/worker/uniter/hook/peeker_test.go +++ b/worker/uniter/hook/peeker_test.go @@ -8,7 +8,7 @@ import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" statetesting "github.com/juju/juju/state/testing" coretesting "github.com/juju/juju/testing" diff --git a/worker/uniter/hook/sender_test.go b/worker/uniter/hook/sender_test.go index 7999d4d419fb..54bde38606a5 100644 --- a/worker/uniter/hook/sender_test.go +++ b/worker/uniter/hook/sender_test.go @@ -8,7 +8,7 @@ import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" statetesting "github.com/juju/juju/state/testing" coretesting "github.com/juju/juju/testing" diff --git a/worker/uniter/op_callbacks.go b/worker/uniter/op_callbacks.go index a354913812d2..5de6ec3aa2ed 100644 --- a/worker/uniter/op_callbacks.go +++ b/worker/uniter/op_callbacks.go @@ -8,8 +8,8 @@ import ( "github.com/juju/errors" "github.com/juju/names" - corecharm "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/hooks" + corecharm "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/apiserver/params" "github.com/juju/juju/worker/uniter/charm" diff --git a/worker/uniter/operation/deploy.go b/worker/uniter/operation/deploy.go index a60568ee4c3b..6ac5d8623a9a 100644 --- a/worker/uniter/operation/deploy.go +++ b/worker/uniter/operation/deploy.go @@ -7,8 +7,8 @@ import ( "fmt" "github.com/juju/errors" - corecharm "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/hooks" + corecharm "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/worker/uniter/charm" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/operation/deploy_test.go b/worker/uniter/operation/deploy_test.go index da0d1c5a9386..3cfec4bfbd18 100644 --- a/worker/uniter/operation/deploy_test.go +++ b/worker/uniter/operation/deploy_test.go @@ -8,8 +8,8 @@ import ( "github.com/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - corecharm "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/hooks" + corecharm "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/worker/uniter/charm" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/operation/errors.go b/worker/uniter/operation/errors.go index 636253343f48..17e4e913ade4 100644 --- a/worker/uniter/operation/errors.go +++ b/worker/uniter/operation/errors.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/juju/errors" - corecharm "gopkg.in/juju/charm.v5" + corecharm "gopkg.in/juju/charm.v6-unstable" ) var ( diff --git a/worker/uniter/operation/executor.go b/worker/uniter/operation/executor.go index acfd33941057..b5c86a2d2194 100644 --- a/worker/uniter/operation/executor.go +++ b/worker/uniter/operation/executor.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/juju/errors" - corecharm "gopkg.in/juju/charm.v5" + corecharm "gopkg.in/juju/charm.v6-unstable" ) type executorStep struct { diff --git a/worker/uniter/operation/executor_test.go b/worker/uniter/operation/executor_test.go index 7aaab9bd0e4c..94adca5434f7 100644 --- a/worker/uniter/operation/executor_test.go +++ b/worker/uniter/operation/executor_test.go @@ -11,8 +11,8 @@ import ( jc "github.com/juju/testing/checkers" ft "github.com/juju/testing/filetesting" gc "gopkg.in/check.v1" - corecharm "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/hooks" + corecharm "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/worker/uniter/hook" "github.com/juju/juju/worker/uniter/operation" diff --git a/worker/uniter/operation/factory.go b/worker/uniter/operation/factory.go index e386f12eb7cc..10392aa916be 100644 --- a/worker/uniter/operation/factory.go +++ b/worker/uniter/operation/factory.go @@ -6,7 +6,7 @@ package operation import ( "github.com/juju/errors" "github.com/juju/names" - corecharm "gopkg.in/juju/charm.v5" + corecharm "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/worker/uniter/charm" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/operation/factory_test.go b/worker/uniter/operation/factory_test.go index 80aa5fe3eb54..99221afaef23 100644 --- a/worker/uniter/operation/factory_test.go +++ b/worker/uniter/operation/factory_test.go @@ -8,8 +8,8 @@ import ( jc "github.com/juju/testing/checkers" utilexec "github.com/juju/utils/exec" gc "gopkg.in/check.v1" - corecharm "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/hooks" + corecharm "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/worker/uniter/hook" "github.com/juju/juju/worker/uniter/operation" diff --git a/worker/uniter/operation/interface.go b/worker/uniter/operation/interface.go index 655d07cc1f22..0944db0eafae 100644 --- a/worker/uniter/operation/interface.go +++ b/worker/uniter/operation/interface.go @@ -7,7 +7,7 @@ import ( "github.com/juju/loggo" "github.com/juju/names" utilexec "github.com/juju/utils/exec" - corecharm "gopkg.in/juju/charm.v5" + corecharm "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/worker/uniter/charm" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/operation/leader_test.go b/worker/uniter/operation/leader_test.go index ad58e90c52ba..379ee2bca960 100644 --- a/worker/uniter/operation/leader_test.go +++ b/worker/uniter/operation/leader_test.go @@ -7,7 +7,7 @@ import ( "github.com/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/worker/uniter/hook" "github.com/juju/juju/worker/uniter/operation" diff --git a/worker/uniter/operation/runaction_test.go b/worker/uniter/operation/runaction_test.go index 0bca5c708b77..63d6095f19d8 100644 --- a/worker/uniter/operation/runaction_test.go +++ b/worker/uniter/operation/runaction_test.go @@ -8,7 +8,7 @@ import ( "github.com/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/worker/uniter/hook" "github.com/juju/juju/worker/uniter/operation" diff --git a/worker/uniter/operation/runhook.go b/worker/uniter/operation/runhook.go index 106c4e2b54cb..1b09fbf63b8d 100644 --- a/worker/uniter/operation/runhook.go +++ b/worker/uniter/operation/runhook.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/juju/errors" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/apiserver/params" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/operation/runhook_test.go b/worker/uniter/operation/runhook_test.go index 801831508617..89166243d94c 100644 --- a/worker/uniter/operation/runhook_test.go +++ b/worker/uniter/operation/runhook_test.go @@ -8,7 +8,7 @@ import ( "github.com/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/worker/uniter/hook" "github.com/juju/juju/worker/uniter/operation" diff --git a/worker/uniter/operation/state.go b/worker/uniter/operation/state.go index 958b22b71ae7..45f7b3dbf99c 100644 --- a/worker/uniter/operation/state.go +++ b/worker/uniter/operation/state.go @@ -8,7 +8,7 @@ import ( "github.com/juju/errors" "github.com/juju/utils" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/worker/uniter/hook" ) diff --git a/worker/uniter/operation/state_test.go b/worker/uniter/operation/state_test.go index 1a11d50fb1e1..5fc6636c23bb 100644 --- a/worker/uniter/operation/state_test.go +++ b/worker/uniter/operation/state_test.go @@ -9,8 +9,8 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/worker/uniter/hook" "github.com/juju/juju/worker/uniter/operation" diff --git a/worker/uniter/operation/util_test.go b/worker/uniter/operation/util_test.go index beb19d165c98..b997a3e71042 100644 --- a/worker/uniter/operation/util_test.go +++ b/worker/uniter/operation/util_test.go @@ -7,8 +7,8 @@ import ( "github.com/juju/errors" "github.com/juju/testing" utilexec "github.com/juju/utils/exec" - corecharm "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/hooks" + corecharm "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/worker/uniter/charm" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/relation/relationer.go b/worker/uniter/relation/relationer.go index 14236886d5a3..0dadff05f3ad 100644 --- a/worker/uniter/relation/relationer.go +++ b/worker/uniter/relation/relationer.go @@ -6,7 +6,7 @@ package relation import ( "fmt" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" apiuniter "github.com/juju/juju/api/uniter" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/relation/relationer_test.go b/worker/uniter/relation/relationer_test.go index 79e962b0f9c6..03ef6903a503 100644 --- a/worker/uniter/relation/relationer_test.go +++ b/worker/uniter/relation/relationer_test.go @@ -14,7 +14,7 @@ import ( ft "github.com/juju/testing/filetesting" "github.com/juju/utils" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/api" apiuniter "github.com/juju/juju/api/uniter" diff --git a/worker/uniter/relation/relations.go b/worker/uniter/relation/relations.go index 437834432b32..77331775bfd4 100644 --- a/worker/uniter/relation/relations.go +++ b/worker/uniter/relation/relations.go @@ -8,8 +8,8 @@ import ( "github.com/juju/loggo" "github.com/juju/names" "github.com/juju/utils/set" - corecharm "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/hooks" + corecharm "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charm.v6-unstable/hooks" "launchpad.net/tomb" "github.com/juju/juju/api/uniter" diff --git a/worker/uniter/relation/relations_test.go b/worker/uniter/relation/relations_test.go index e98d7e9bb944..65301ce7b36f 100644 --- a/worker/uniter/relation/relations_test.go +++ b/worker/uniter/relation/relations_test.go @@ -14,8 +14,8 @@ import ( "github.com/juju/testing" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charm.v6-unstable/hooks" apitesting "github.com/juju/juju/api/base/testing" "github.com/juju/juju/api/uniter" diff --git a/worker/uniter/relation/state.go b/worker/uniter/relation/state.go index c60ec15cb321..aaab64d6bd1a 100644 --- a/worker/uniter/relation/state.go +++ b/worker/uniter/relation/state.go @@ -15,7 +15,7 @@ import ( "github.com/juju/errors" "github.com/juju/utils" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/worker/uniter/hook" ) diff --git a/worker/uniter/relation/state_test.go b/worker/uniter/relation/state_test.go index a5d1bb4ecb38..6f01d171a9de 100644 --- a/worker/uniter/relation/state_test.go +++ b/worker/uniter/relation/state_test.go @@ -12,7 +12,7 @@ import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/worker/uniter/hook" "github.com/juju/juju/worker/uniter/relation" diff --git a/worker/uniter/remotestate/mock_test.go b/worker/uniter/remotestate/mock_test.go index f4c3653b1ca0..74f4b6111dc5 100644 --- a/worker/uniter/remotestate/mock_test.go +++ b/worker/uniter/remotestate/mock_test.go @@ -5,7 +5,7 @@ package remotestate_test import ( "github.com/juju/names" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api/watcher" "github.com/juju/juju/apiserver/params" diff --git a/worker/uniter/remotestate/snapshot.go b/worker/uniter/remotestate/snapshot.go index 3c2f5a8ad183..7ab90b2b8aa3 100644 --- a/worker/uniter/remotestate/snapshot.go +++ b/worker/uniter/remotestate/snapshot.go @@ -5,7 +5,7 @@ package remotestate import ( "github.com/juju/names" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/apiserver/params" ) diff --git a/worker/uniter/remotestate/state.go b/worker/uniter/remotestate/state.go index 8c2ef012203d..6ddc269ccbd4 100644 --- a/worker/uniter/remotestate/state.go +++ b/worker/uniter/remotestate/state.go @@ -5,7 +5,7 @@ package remotestate import ( "github.com/juju/names" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api/uniter" "github.com/juju/juju/api/watcher" diff --git a/worker/uniter/remotestate/watcher_test.go b/worker/uniter/remotestate/watcher_test.go index b8ce146ac41f..d3c2ff953a4f 100644 --- a/worker/uniter/remotestate/watcher_test.go +++ b/worker/uniter/remotestate/watcher_test.go @@ -9,7 +9,7 @@ import ( "github.com/juju/names" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/apiserver/params" "github.com/juju/juju/state/multiwatcher" diff --git a/worker/uniter/resolver.go b/worker/uniter/resolver.go index cb5077db95c5..4a8a03ae899d 100644 --- a/worker/uniter/resolver.go +++ b/worker/uniter/resolver.go @@ -5,7 +5,7 @@ package uniter import ( "github.com/juju/errors" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/apiserver/params" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/resolver/interface.go b/worker/uniter/resolver/interface.go index 2b1eaddf79fe..70473e470f17 100644 --- a/worker/uniter/resolver/interface.go +++ b/worker/uniter/resolver/interface.go @@ -5,7 +5,7 @@ package resolver import ( "github.com/juju/errors" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/worker/uniter/operation" "github.com/juju/juju/worker/uniter/remotestate" diff --git a/worker/uniter/resolver/locker_test.go b/worker/uniter/resolver/locker_test.go index b0822ac3a76e..f352c9e0963f 100644 --- a/worker/uniter/resolver/locker_test.go +++ b/worker/uniter/resolver/locker_test.go @@ -6,7 +6,7 @@ package resolver_test import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/worker/uniter/hook" "github.com/juju/juju/worker/uniter/operation" diff --git a/worker/uniter/resolver/loop.go b/worker/uniter/resolver/loop.go index 5dd8fb5ee13b..e990accffc3f 100644 --- a/worker/uniter/resolver/loop.go +++ b/worker/uniter/resolver/loop.go @@ -5,8 +5,8 @@ package resolver import ( "github.com/juju/errors" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charm.v6-unstable/hooks" "launchpad.net/tomb" "github.com/juju/juju/worker/charmdir" diff --git a/worker/uniter/resolver/loop_test.go b/worker/uniter/resolver/loop_test.go index a20852427ed2..3b05e2e9330c 100644 --- a/worker/uniter/resolver/loop_test.go +++ b/worker/uniter/resolver/loop_test.go @@ -9,7 +9,7 @@ import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "launchpad.net/tomb" "github.com/juju/juju/testing" diff --git a/worker/uniter/resolver/mock_test.go b/worker/uniter/resolver/mock_test.go index e23fabd973ec..4bbbbfd4a6a4 100644 --- a/worker/uniter/resolver/mock_test.go +++ b/worker/uniter/resolver/mock_test.go @@ -5,7 +5,7 @@ package resolver_test import ( "github.com/juju/testing" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/worker/charmdir" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/resolver/opfactory.go b/worker/uniter/resolver/opfactory.go index ec4ee698e3e8..fca8e93a3586 100644 --- a/worker/uniter/resolver/opfactory.go +++ b/worker/uniter/resolver/opfactory.go @@ -6,8 +6,8 @@ package resolver import ( "github.com/juju/errors" "github.com/juju/loggo" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/worker/uniter/hook" "github.com/juju/juju/worker/uniter/operation" diff --git a/worker/uniter/resolver/opfactory_test.go b/worker/uniter/resolver/opfactory_test.go index eeb5ca68a087..7c08f41b8832 100644 --- a/worker/uniter/resolver/opfactory_test.go +++ b/worker/uniter/resolver/opfactory_test.go @@ -8,8 +8,8 @@ import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/testing" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/resolver_test.go b/worker/uniter/resolver_test.go index 43dc200b815b..caf8bde3cfc5 100644 --- a/worker/uniter/resolver_test.go +++ b/worker/uniter/resolver_test.go @@ -8,7 +8,7 @@ import ( "github.com/juju/names" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/worker/uniter" uniteractions "github.com/juju/juju/worker/uniter/actions" diff --git a/worker/uniter/runner/context/context.go b/worker/uniter/runner/context/context.go index e456d76e19f8..8d73ccc181d9 100644 --- a/worker/uniter/runner/context/context.go +++ b/worker/uniter/runner/context/context.go @@ -16,7 +16,7 @@ import ( "github.com/juju/loggo" "github.com/juju/names" "github.com/juju/utils/proxy" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api/uniter" "github.com/juju/juju/apiserver/params" diff --git a/worker/uniter/runner/context/context_test.go b/worker/uniter/runner/context/context_test.go index 3f5e054c69e3..7101739d51ed 100644 --- a/worker/uniter/runner/context/context_test.go +++ b/worker/uniter/runner/context/context_test.go @@ -13,7 +13,7 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils/exec" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/apiserver/params" "github.com/juju/juju/network" diff --git a/worker/uniter/runner/context/contextfactory.go b/worker/uniter/runner/context/contextfactory.go index 38761d67873a..1102df891c3a 100644 --- a/worker/uniter/runner/context/contextfactory.go +++ b/worker/uniter/runner/context/contextfactory.go @@ -10,7 +10,7 @@ import ( "github.com/juju/errors" "github.com/juju/names" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/api/uniter" "github.com/juju/juju/apiserver/params" diff --git a/worker/uniter/runner/context/contextfactory_test.go b/worker/uniter/runner/context/contextfactory_test.go index 63efb0b00879..2c1df720eb65 100644 --- a/worker/uniter/runner/context/contextfactory_test.go +++ b/worker/uniter/runner/context/contextfactory_test.go @@ -13,7 +13,7 @@ import ( "github.com/juju/utils" "github.com/juju/utils/fs" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/apiserver/params" "github.com/juju/juju/state" diff --git a/worker/uniter/runner/context/export_test.go b/worker/uniter/runner/context/export_test.go index c94fc5416be9..f155b375121a 100644 --- a/worker/uniter/runner/context/export_test.go +++ b/worker/uniter/runner/context/export_test.go @@ -7,7 +7,7 @@ import ( "github.com/juju/errors" "github.com/juju/names" "github.com/juju/utils/proxy" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api/uniter" "github.com/juju/juju/apiserver/params" diff --git a/worker/uniter/runner/context/util_test.go b/worker/uniter/runner/context/util_test.go index fb87fa886c4d..82e36934ea01 100644 --- a/worker/uniter/runner/context/util_test.go +++ b/worker/uniter/runner/context/util_test.go @@ -14,7 +14,7 @@ import ( "github.com/juju/utils" "github.com/juju/utils/proxy" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api" "github.com/juju/juju/api/block" diff --git a/worker/uniter/runner/factory.go b/worker/uniter/runner/factory.go index 1f08341b35fe..bebf2c1d1925 100644 --- a/worker/uniter/runner/factory.go +++ b/worker/uniter/runner/factory.go @@ -6,7 +6,7 @@ package runner import ( "github.com/juju/errors" "github.com/juju/names" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/api/uniter" "github.com/juju/juju/apiserver/params" diff --git a/worker/uniter/runner/factory_test.go b/worker/uniter/runner/factory_test.go index f3cb89c709cb..fc2ad9c5c8c8 100644 --- a/worker/uniter/runner/factory_test.go +++ b/worker/uniter/runner/factory_test.go @@ -12,7 +12,7 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/state" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/runner/jujuc/add-metric.go b/worker/uniter/runner/jujuc/add-metric.go index b64a93abc76f..a07925ff5f22 100644 --- a/worker/uniter/runner/jujuc/add-metric.go +++ b/worker/uniter/runner/jujuc/add-metric.go @@ -7,11 +7,10 @@ import ( "fmt" "time" - "gopkg.in/juju/charm.v5" - "github.com/juju/cmd" "github.com/juju/errors" "github.com/juju/utils/keyvalues" + "gopkg.in/juju/charm.v6-unstable" ) // Metric represents a single metric set by the charm. diff --git a/worker/uniter/runner/jujuc/context.go b/worker/uniter/runner/jujuc/context.go index f7c256c0c98f..691842d5a07c 100644 --- a/worker/uniter/runner/jujuc/context.go +++ b/worker/uniter/runner/jujuc/context.go @@ -11,7 +11,7 @@ import ( "github.com/juju/errors" "github.com/juju/names" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/apiserver/params" "github.com/juju/juju/network" diff --git a/worker/uniter/runner/jujuc/restricted.go b/worker/uniter/runner/jujuc/restricted.go index a8bf4e361a09..96e982c51194 100644 --- a/worker/uniter/runner/jujuc/restricted.go +++ b/worker/uniter/runner/jujuc/restricted.go @@ -8,7 +8,7 @@ import ( "github.com/juju/errors" "github.com/juju/names" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/apiserver/params" "github.com/juju/juju/network" diff --git a/worker/uniter/runner/jujuc/testing/suite.go b/worker/uniter/runner/jujuc/testing/suite.go index 9bcc2e7b6438..bf00dab124fe 100644 --- a/worker/uniter/runner/jujuc/testing/suite.go +++ b/worker/uniter/runner/jujuc/testing/suite.go @@ -6,7 +6,7 @@ package testing import ( "github.com/juju/testing" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" ) // ContextSuite is the base suite for testing jujuc.Context-related code. diff --git a/worker/uniter/runner/jujuc/testing/unit.go b/worker/uniter/runner/jujuc/testing/unit.go index 893bdb7d8548..8397ca42aeb2 100644 --- a/worker/uniter/runner/jujuc/testing/unit.go +++ b/worker/uniter/runner/jujuc/testing/unit.go @@ -5,7 +5,7 @@ package testing import ( "github.com/juju/errors" - "gopkg.in/juju/charm.v5" + "gopkg.in/juju/charm.v6-unstable" ) // Unit holds the values for the hook context. diff --git a/worker/uniter/runner/runner_test.go b/worker/uniter/runner/runner_test.go index a50bd01abc09..e71feefe7279 100644 --- a/worker/uniter/runner/runner_test.go +++ b/worker/uniter/runner/runner_test.go @@ -17,7 +17,7 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils/proxy" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/worker/uniter/hook" "github.com/juju/juju/worker/uniter/runner" diff --git a/worker/uniter/storage/attachments.go b/worker/uniter/storage/attachments.go index 34b66d16567b..2c2d3fe4690d 100644 --- a/worker/uniter/storage/attachments.go +++ b/worker/uniter/storage/attachments.go @@ -13,7 +13,7 @@ import ( "github.com/juju/loggo" "github.com/juju/names" "github.com/juju/utils/set" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/apiserver/params" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/storage/attachments_test.go b/worker/uniter/storage/attachments_test.go index 17f204a3e988..49c066df4fe6 100644 --- a/worker/uniter/storage/attachments_test.go +++ b/worker/uniter/storage/attachments_test.go @@ -11,7 +11,7 @@ import ( "github.com/juju/names" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/apiserver/params" corestorage "github.com/juju/juju/storage" diff --git a/worker/uniter/storage/resolver.go b/worker/uniter/storage/resolver.go index b77339ae4661..e3ec5038f625 100644 --- a/worker/uniter/storage/resolver.go +++ b/worker/uniter/storage/resolver.go @@ -6,7 +6,7 @@ package storage import ( "github.com/juju/errors" "github.com/juju/names" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/apiserver/params" "github.com/juju/juju/storage" diff --git a/worker/uniter/storage/state.go b/worker/uniter/storage/state.go index 40ebcb47fd12..2286dfc61f0e 100644 --- a/worker/uniter/storage/state.go +++ b/worker/uniter/storage/state.go @@ -12,7 +12,7 @@ import ( "github.com/juju/errors" "github.com/juju/names" "github.com/juju/utils" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/worker/uniter/hook" ) diff --git a/worker/uniter/storage/state_test.go b/worker/uniter/storage/state_test.go index cccd66bbeb45..7f6fd3884d7e 100644 --- a/worker/uniter/storage/state_test.go +++ b/worker/uniter/storage/state_test.go @@ -12,7 +12,7 @@ import ( "github.com/juju/names" jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/testing" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/uniter.go b/worker/uniter/uniter.go index b28d0a3e72a1..78d8822125ee 100644 --- a/worker/uniter/uniter.go +++ b/worker/uniter/uniter.go @@ -15,7 +15,7 @@ import ( "github.com/juju/names" "github.com/juju/utils/exec" "github.com/juju/utils/fslock" - corecharm "gopkg.in/juju/charm.v5" + corecharm "gopkg.in/juju/charm.v6-unstable" "launchpad.net/tomb" "github.com/juju/juju/api/uniter" diff --git a/worker/uniter/uniter_test.go b/worker/uniter/uniter_test.go index 5a918bafb2c1..24d2d8fc2267 100644 --- a/worker/uniter/uniter_test.go +++ b/worker/uniter/uniter_test.go @@ -20,7 +20,7 @@ import ( ft "github.com/juju/testing/filetesting" "github.com/juju/utils/clock" gc "gopkg.in/check.v1" - corecharm "gopkg.in/juju/charm.v5" + corecharm "gopkg.in/juju/charm.v6-unstable" "github.com/juju/juju/agent/tools" "github.com/juju/juju/apiserver/params" diff --git a/worker/uniter/upgrade123.go b/worker/uniter/upgrade123.go index f6f849c69d52..18fa33338fd2 100644 --- a/worker/uniter/upgrade123.go +++ b/worker/uniter/upgrade123.go @@ -8,7 +8,7 @@ import ( "github.com/juju/names" "github.com/juju/utils" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/worker/uniter/operation" ) diff --git a/worker/uniter/upgrade123_test.go b/worker/uniter/upgrade123_test.go index aa7b79828917..9ef4adf14912 100644 --- a/worker/uniter/upgrade123_test.go +++ b/worker/uniter/upgrade123_test.go @@ -11,8 +11,8 @@ import ( jc "github.com/juju/testing/checkers" "github.com/juju/utils" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/worker/uniter" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/upgrade126.go b/worker/uniter/upgrade126.go index 6f8f659796e7..dd4825db0c10 100644 --- a/worker/uniter/upgrade126.go +++ b/worker/uniter/upgrade126.go @@ -5,7 +5,7 @@ package uniter import ( "github.com/juju/names" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/worker/uniter/operation" ) diff --git a/worker/uniter/upgrade126_test.go b/worker/uniter/upgrade126_test.go index 41e256f206cd..1dd87cf9c1c8 100644 --- a/worker/uniter/upgrade126_test.go +++ b/worker/uniter/upgrade126_test.go @@ -6,8 +6,8 @@ package uniter_test import ( jc "github.com/juju/testing/checkers" gc "gopkg.in/check.v1" - "gopkg.in/juju/charm.v5" - "gopkg.in/juju/charm.v5/hooks" + "gopkg.in/juju/charm.v6-unstable" + "gopkg.in/juju/charm.v6-unstable/hooks" "github.com/juju/juju/worker/uniter" "github.com/juju/juju/worker/uniter/hook" diff --git a/worker/uniter/util_test.go b/worker/uniter/util_test.go index 1b45725df8cd..8e8563684029 100644 --- a/worker/uniter/util_test.go +++ b/worker/uniter/util_test.go @@ -27,7 +27,7 @@ import ( "github.com/juju/utils/fslock" "github.com/juju/utils/proxy" gc "gopkg.in/check.v1" - corecharm "gopkg.in/juju/charm.v5" + corecharm "gopkg.in/juju/charm.v6-unstable" goyaml "gopkg.in/yaml.v1" apiuniter "github.com/juju/juju/api/uniter"