Skip to content

Commit

Permalink
Update to use stable charm.v6 and charmrepo.v2 upstreams
Browse files Browse the repository at this point in the history
  • Loading branch information
@wallyworld
wallyworld committed Nov 20, 2017
1 parent 0b0fb4a commit 81744e6
Show file tree
Hide file tree
Showing 323 changed files with 418 additions and 415 deletions.
2 changes: 1 addition & 1 deletion api/application/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ package application
import (
"github.com/juju/errors"
"github.com/juju/loggo"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/api/base"
Expand Down
2 changes: 1 addition & 1 deletion api/application/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/macaroon.v1"

"github.com/juju/juju/api/application"
Expand Down
2 changes: 1 addition & 1 deletion api/applicationoffers/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package applicationoffers
import (
"github.com/juju/errors"
"github.com/juju/loggo"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/api/base"
Expand Down
2 changes: 1 addition & 1 deletion api/applicationoffers/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/juju/errors"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/macaroon.v1"

"github.com/juju/juju/api/applicationoffers"
Expand Down
2 changes: 1 addition & 1 deletion api/charmrevisionupdater/updater_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"

"github.com/juju/juju/api/charmrevisionupdater"
"github.com/juju/juju/apiserver/facades/controller/charmrevisionupdater/testing"
Expand Down
4 changes: 2 additions & 2 deletions api/charms/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ package charms
import (
"github.com/juju/errors"
"github.com/juju/version"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6-unstable/resource"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/charm.v6/resource"

"github.com/juju/juju/api/base"
"github.com/juju/juju/apiserver/params"
Expand Down
4 changes: 2 additions & 2 deletions api/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"github.com/gorilla/websocket"
"github.com/juju/errors"
"github.com/juju/version"
"gopkg.in/juju/charm.v6-unstable"
csparams "gopkg.in/juju/charmrepo.v2-unstable/csclient/params"
"gopkg.in/juju/charm.v6"
csparams "gopkg.in/juju/charmrepo.v2/csclient/params"
"gopkg.in/juju/names.v2"
"gopkg.in/macaroon.v1"

Expand Down
2 changes: 1 addition & 1 deletion api/client_macaroon_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"

"github.com/juju/juju/api"
apitesting "github.com/juju/juju/api/testing"
Expand Down
2 changes: 1 addition & 1 deletion api/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
jc "github.com/juju/testing/checkers"
"github.com/juju/version"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/api"
Expand Down
2 changes: 1 addition & 1 deletion api/migrationmaster/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/juju/errors"
"github.com/juju/httprequest"
"github.com/juju/version"
charmresource "gopkg.in/juju/charm.v6-unstable/resource"
charmresource "gopkg.in/juju/charm.v6/resource"
"gopkg.in/juju/names.v2"
"gopkg.in/macaroon.v1"

Expand Down
2 changes: 1 addition & 1 deletion api/migrationmaster/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/juju/utils"
"github.com/juju/version"
gc "gopkg.in/check.v1"
charmresource "gopkg.in/juju/charm.v6-unstable/resource"
charmresource "gopkg.in/juju/charm.v6/resource"
"gopkg.in/juju/names.v2"
"gopkg.in/macaroon.v1"

Expand Down
2 changes: 1 addition & 1 deletion api/migrationtarget/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/juju/errors"
"github.com/juju/httprequest"
"github.com/juju/version"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/api/base"
Expand Down
2 changes: 1 addition & 1 deletion api/migrationtarget/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
jc "github.com/juju/testing/checkers"
"github.com/juju/version"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/api/base"
Expand Down
2 changes: 1 addition & 1 deletion api/uniter/application.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"

"github.com/juju/errors"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/api/common"
Expand Down
2 changes: 1 addition & 1 deletion api/uniter/charm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package uniter
import (
"fmt"

"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"

"github.com/juju/juju/apiserver/params"
)
Expand Down
2 changes: 1 addition & 1 deletion api/uniter/endpoint.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package uniter

import (
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
)

// Endpoint represents one endpoint of a relation. It is just a wrapper
Expand Down
2 changes: 1 addition & 1 deletion api/uniter/relation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package uniter
import (
"fmt"

"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/apiserver/params"
Expand Down
2 changes: 1 addition & 1 deletion api/uniter/relation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/api/uniter"
Expand Down
2 changes: 1 addition & 1 deletion api/uniter/relationunit_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package uniter_test
import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/api/uniter"
Expand Down
2 changes: 1 addition & 1 deletion api/uniter/unit.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package uniter

import (
"github.com/juju/errors"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/api/common"
Expand Down
2 changes: 1 addition & 1 deletion api/uniter/unit_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/api"
Expand Down
2 changes: 1 addition & 1 deletion api/uniter/uniter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"

"github.com/juju/errors"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/api/base"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/charms.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/juju/errors"
ziputil "github.com/juju/utils/zip"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/facades/client/application"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/charms_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"
"gopkg.in/macaroon-bakery.v1/httpbakery"

Expand Down
2 changes: 1 addition & 1 deletion apiserver/common/crossmodel/interface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package crossmodel

import (
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"
"gopkg.in/macaroon.v1"

Expand Down
2 changes: 1 addition & 1 deletion apiserver/common/firewall/firewall.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/juju/juju/apiserver/facade"
"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/state/watcher"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
)

var logger = loggo.GetLogger("juju.apiserver.crossmodelrelations")
Expand Down
2 changes: 1 addition & 1 deletion apiserver/common/firewall/firewall_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
jc "github.com/juju/testing/checkers"
"github.com/juju/utils/set"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/apiserver/common"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/common/unitstatus.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package common
import (
"fmt"

"gopkg.in/juju/charm.v6-unstable/hooks"
"gopkg.in/juju/charm.v6/hooks"

"github.com/juju/juju/state"
"github.com/juju/juju/status"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/agent/payloadshookcontext/unitfacade_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/apiserver/common"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/agent/uniter/subordinaterelationwatcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package uniter
import (
"github.com/juju/errors"
"github.com/juju/utils/set"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"

"github.com/juju/juju/state"
"github.com/juju/juju/worker/catacomb"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/agent/uniter/uniter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/juju/errors"
"github.com/juju/loggo"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/apiserver/common"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/agent/uniter/uniter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"
"gopkg.in/mgo.v2/bson"

Expand Down
4 changes: 2 additions & 2 deletions apiserver/facades/client/application/application.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/utils/set"
"gopkg.in/juju/charm.v6-unstable"
csparams "gopkg.in/juju/charmrepo.v2-unstable/csclient/params"
"gopkg.in/juju/charm.v6"
csparams "gopkg.in/juju/charmrepo.v2/csclient/params"
"gopkg.in/juju/names.v2"
"gopkg.in/macaroon.v1"
goyaml "gopkg.in/yaml.v2"
Expand Down
10 changes: 5 additions & 5 deletions apiserver/facades/client/application/application_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import (
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v6-unstable"
charmresource "gopkg.in/juju/charm.v6-unstable/resource"
"gopkg.in/juju/charmrepo.v2-unstable"
"gopkg.in/juju/charmrepo.v2-unstable/csclient"
csparams "gopkg.in/juju/charmrepo.v2-unstable/csclient/params"
"gopkg.in/juju/charm.v6"
charmresource "gopkg.in/juju/charm.v6/resource"
"gopkg.in/juju/charmrepo.v2"
"gopkg.in/juju/charmrepo.v2/csclient"
csparams "gopkg.in/juju/charmrepo.v2/csclient/params"
"gopkg.in/juju/names.v2"
"gopkg.in/macaroon.v1"
"gopkg.in/mgo.v2"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/client/application/application_unit_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"
"gopkg.in/macaroon.v1"

Expand Down
4 changes: 2 additions & 2 deletions apiserver/facades/client/application/backend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package application

import (
"gopkg.in/juju/charm.v6-unstable"
csparams "gopkg.in/juju/charmrepo.v2-unstable/csclient/params"
"gopkg.in/juju/charm.v6"
csparams "gopkg.in/juju/charmrepo.v2/csclient/params"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/apiserver/common/storagecommon"
Expand Down
8 changes: 4 additions & 4 deletions apiserver/facades/client/application/charmstore.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (
"github.com/juju/errors"
"github.com/juju/utils"
"github.com/juju/version"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charmrepo.v2-unstable"
"gopkg.in/juju/charmrepo.v2-unstable/csclient"
csparams "gopkg.in/juju/charmrepo.v2-unstable/csclient/params"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/charmrepo.v2"
"gopkg.in/juju/charmrepo.v2/csclient"
csparams "gopkg.in/juju/charmrepo.v2/csclient/params"
"gopkg.in/macaroon-bakery.v1/httpbakery"
"gopkg.in/macaroon.v1"

Expand Down
4 changes: 2 additions & 2 deletions apiserver/facades/client/application/deploy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"strings"

"github.com/juju/errors"
"gopkg.in/juju/charm.v6-unstable"
csparams "gopkg.in/juju/charmrepo.v2-unstable/csclient/params"
"gopkg.in/juju/charm.v6"
csparams "gopkg.in/juju/charmrepo.v2/csclient/params"
"gopkg.in/juju/names.v2"

"github.com/juju/juju/constraints"
Expand Down
4 changes: 2 additions & 2 deletions apiserver/facades/client/application/deploy_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
jc "github.com/juju/testing/checkers"
"github.com/juju/utils/set"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charmrepo.v2-unstable"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/charmrepo.v2"

"github.com/juju/juju/apiserver/facades/client/application"
"github.com/juju/juju/constraints"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/client/application/get.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package application

import (
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"

"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/constraints"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/client/application/get_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v6-unstable"
"gopkg.in/juju/charm.v6"

apiapplication "github.com/juju/juju/api/application"
"github.com/juju/juju/apiserver/common"
Expand Down
Loading

0 comments on commit 81744e6

Please sign in to comment.