Skip to content

Commit

Permalink
Change import from names.v2 to names.v3
Browse files Browse the repository at this point in the history
  • Loading branch information
@hmlanigan
hmlanigan committed Aug 21, 2019
1 parent 7db8cc7 commit 6ea2027
Show file tree
Hide file tree
Showing 1,209 changed files with 1,235 additions and 1,235 deletions.
8 changes: 3 additions & 5 deletions Gopkg.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions Gopkg.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,8 @@
name = "github.com/juju/bundlechanges"

[[constraint]]
revision = "780d9315d7ca5097ab2b732e5b3d0f96c64b9fdd"
revision = "7eee51ddb1f5033244c6501ec83b399af9d23861"
name = "github.com/juju/description"
source = "github.com/hmlanigan/description.git"

[[constraint]]
revision = "2ce1bb71843d6d179b3f1c1c9cb4a72cd067fc65"
Expand Down Expand Up @@ -163,9 +162,8 @@
name = "gopkg.in/juju/names.v2"

[[constraint]]
revision = "f66cc824b990a832353f8f2126ae4a71cf281ea1"
revision = "5ed389481ee8344db732cf8a65a8bbfeb42dc79d"
name = "gopkg.in/juju/names.v3"
source = "github.com/hmlanigan/names.git"

[[constraint]]
revision = "c1b8fa8bdccecb0b8db834ee0b92fdbcfa606dd6"
Expand Down
2 changes: 1 addition & 1 deletion agent/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/juju/utils"
"github.com/juju/utils/shell"
"github.com/juju/version"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"

"github.com/juju/juju/api"
"github.com/juju/juju/apiserver/params"
Expand Down
2 changes: 1 addition & 1 deletion agent/agent_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/version"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"

"github.com/juju/juju/agent"
"github.com/juju/juju/api"
Expand Down
2 changes: 1 addition & 1 deletion agent/agentbootstrap/bootstrap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/juju/loggo"
"github.com/juju/os/series"
"github.com/juju/utils"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"
"gopkg.in/mgo.v2"

"github.com/juju/juju/agent"
Expand Down
2 changes: 1 addition & 1 deletion agent/agentbootstrap/bootstrap_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"

"github.com/juju/juju/agent"
"github.com/juju/juju/agent/agentbootstrap"
Expand Down
2 changes: 1 addition & 1 deletion agent/format-2.0.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/juju/errors"
"github.com/juju/version"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"
goyaml "gopkg.in/yaml.v2"

"github.com/juju/juju/apiserver/params"
Expand Down
2 changes: 1 addition & 1 deletion agent/format_whitebox_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"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"

"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/cloudconfig/cloudinit"
Expand Down
2 changes: 1 addition & 1 deletion agent/identity_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"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"

"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/testing"
Expand Down
2 changes: 1 addition & 1 deletion api/action/client_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/names.v2"
"gopkg.in/juju/names.v3"

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

import (
"github.com/juju/errors"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"

"github.com/juju/juju/api/base"
"github.com/juju/juju/apiserver/params"
Expand Down
2 changes: 1 addition & 1 deletion api/agent/facade_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/names.v2"
"gopkg.in/juju/names.v3"

"github.com/juju/juju/api/agent"
"github.com/juju/juju/api/base"
Expand Down
2 changes: 1 addition & 1 deletion api/agent/machine_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/names.v2"
"gopkg.in/juju/names.v3"
"gopkg.in/mgo.v2"

"github.com/juju/juju/api"
Expand Down
2 changes: 1 addition & 1 deletion api/agent/state.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/names.v2"
"gopkg.in/juju/names.v3"

"github.com/juju/juju/api/base"
"github.com/juju/juju/api/common"
Expand Down
2 changes: 1 addition & 1 deletion api/agent/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/names.v2"
"gopkg.in/juju/names.v3"

"github.com/juju/juju/api"
apiagent "github.com/juju/juju/api/agent"
Expand Down
2 changes: 1 addition & 1 deletion api/apiclient.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/juju/utils"
"github.com/juju/utils/parallel"
"github.com/juju/version"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"
"gopkg.in/macaroon-bakery.v2-unstable/httpbakery"
"gopkg.in/macaroon.v2-unstable"
"gopkg.in/retry.v1"
Expand Down
2 changes: 1 addition & 1 deletion api/apiclient_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"

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

"github.com/juju/juju/api/base"
"github.com/juju/juju/apiserver/params"
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 @@ -11,7 +11,7 @@ import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"

"github.com/juju/juju/api/application"
basetesting "github.com/juju/juju/api/base/testing"
Expand Down
2 changes: 1 addition & 1 deletion api/applicationoffers/access_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package applicationoffers_test
import (
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"

"github.com/juju/juju/api/applicationoffers"
basetesting "github.com/juju/juju/api/base/testing"
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 @@ -7,7 +7,7 @@ import (
"github.com/juju/errors"
"github.com/juju/loggo"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"

"github.com/juju/juju/api/base"
"github.com/juju/juju/apiserver/params"
Expand Down
2 changes: 1 addition & 1 deletion api/applicationscaler/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package applicationscaler
import (
"github.com/juju/errors"
"github.com/juju/loggo"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"

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

"github.com/juju/httprequest"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"
"gopkg.in/macaroon-bakery.v2-unstable/httpbakery"
)

Expand Down
13 changes: 6 additions & 7 deletions api/base/mocks/caller_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions api/base/mocks/clientfacade_mock.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/base/testing/apicaller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"
"gopkg.in/macaroon-bakery.v2-unstable/httpbakery"

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

"github.com/juju/juju/api/base"
apiwatcher "github.com/juju/juju/api/watcher"
Expand Down
2 changes: 1 addition & 1 deletion api/caasfirewaller/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/names.v2"
"gopkg.in/juju/names.v3"

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

"github.com/juju/juju/api/base"
"github.com/juju/juju/api/common"
Expand Down
2 changes: 1 addition & 1 deletion api/caasoperator/client_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/version"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"

basetesting "github.com/juju/juju/api/base/testing"
"github.com/juju/juju/api/caasoperator"
Expand Down
2 changes: 1 addition & 1 deletion api/caasoperatorprovisioner/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package caasoperatorprovisioner
import (
"github.com/juju/errors"
"github.com/juju/version"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"

"github.com/juju/juju/api/base"
apiwatcher "github.com/juju/juju/api/watcher"
Expand Down
2 changes: 1 addition & 1 deletion api/caasoperatorprovisioner/client_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/version"
gc "gopkg.in/check.v1"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"

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

import (
"github.com/juju/errors"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"

"github.com/juju/juju/api/base"
apiwatcher "github.com/juju/juju/api/watcher"
Expand Down
2 changes: 1 addition & 1 deletion api/caasunitprovisioner/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/names.v2"
"gopkg.in/juju/names.v3"

basetesting "github.com/juju/juju/api/base/testing"
"github.com/juju/juju/api/caasunitprovisioner"
Expand Down
2 changes: 1 addition & 1 deletion api/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/juju/version"
"gopkg.in/juju/charm.v6"
csparams "gopkg.in/juju/charmrepo.v3/csclient/params"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"
"gopkg.in/macaroon.v2-unstable"

"github.com/juju/juju/api/base"
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 @@ -26,7 +26,7 @@ import (
"github.com/juju/version"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/names.v2"
"gopkg.in/juju/names.v3"

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

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

0 comments on commit 6ea2027

Please sign in to comment.