Skip to content

Commit

Permalink
Use juju repos for mgo, txn, blobstore instead of gopkg.in
Browse files Browse the repository at this point in the history
  • Loading branch information
@wallyworld
wallyworld committed Mar 2, 2021
1 parent b043c96 commit 31b06ac
Show file tree
Hide file tree
Showing 238 changed files with 492 additions and 484 deletions.
2 changes: 1 addition & 1 deletion agent/agentbootstrap/bootstrap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"github.com/juju/clock"
"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/mgo/v2"
"github.com/juju/names/v4"
"github.com/juju/os/series"
"github.com/juju/utils"
"gopkg.in/mgo.v2"

"github.com/juju/juju/agent"
apiagent "github.com/juju/juju/api/agent"
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 @@ -8,10 +8,10 @@ import (
stdtesting "testing"

"github.com/juju/errors"
"github.com/juju/mgo/v2"
"github.com/juju/names/v4"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/mgo.v2"

"github.com/juju/juju/api"
apiagent "github.com/juju/juju/api/agent"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/common/mocks/modeloperation.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 apiserver/common/networkingcommon/linklayer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package networkingcommon
import (
"github.com/juju/collections/set"
"github.com/juju/errors"
"gopkg.in/mgo.v2/txn"
"github.com/juju/mgo/v2/txn"

"github.com/juju/juju/core/network"
"github.com/juju/juju/state"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/common/networkingcommon/mocks/package_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 apiserver/common/networkingcommon/networkconfigapi.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"github.com/juju/collections/set"
"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/mgo/v2/txn"
"github.com/juju/names/v4"
"gopkg.in/mgo.v2/txn"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/params"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/common/networkingcommon/networkconfigapi_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ package networkingcommon_test
import (
"github.com/golang/mock/gomock"
"github.com/juju/errors"
"github.com/juju/mgo/v2/txn"
"github.com/juju/names/v4"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/mgo.v2/txn"

"github.com/juju/juju/apiserver/common/networkingcommon"
"github.com/juju/juju/apiserver/common/networkingcommon/mocks"
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 @@ -10,13 +10,13 @@ import (
"github.com/juju/charm/v7"
"github.com/juju/collections/set"
"github.com/juju/errors"
"github.com/juju/mgo/v2/bson"
"github.com/juju/names/v4"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
"github.com/kr/pretty"
gc "gopkg.in/check.v1"
"gopkg.in/juju/environschema.v1"
"gopkg.in/mgo.v2/bson"

"github.com/juju/juju/api"
apiuniter "github.com/juju/juju/api/uniter"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/agent/upgradesteps/upgradesteps_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"github.com/juju/errors"
"github.com/juju/juju/controller"
jujutesting "github.com/juju/juju/testing"
"github.com/juju/mgo/v2/txn"
"github.com/juju/names/v4"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/mgo.v2/txn"

facademocks "github.com/juju/juju/apiserver/facade/mocks"
"github.com/juju/juju/apiserver/facades/agent/upgradesteps"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/client/application/application_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ import (
csparams "github.com/juju/charmrepo/v5/csclient/params"
"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/mgo/v2"
"github.com/juju/names/v4"
jtesting "github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
gc "gopkg.in/check.v1"
"gopkg.in/mgo.v2"

"github.com/juju/juju/apiserver/common"
commontesting "github.com/juju/juju/apiserver/common/testing"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/client/application/charmstore_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/golang/mock/gomock"
"github.com/juju/charm/v7"
"github.com/juju/charmrepo/v5"
"github.com/juju/mgo/v2"
gc "gopkg.in/check.v1"
"gopkg.in/mgo.v2"

"github.com/juju/testing"

Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/client/application/mocks/charmstore_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 apiserver/facades/client/backups/backups.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/mgo/v2"
"github.com/juju/names/v4"
"gopkg.in/mgo.v2"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/facade"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/client/backups/create_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
package backups_test

import (
"github.com/juju/mgo/v2"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/mgo.v2"

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

"github.com/juju/charm/v7"
"github.com/juju/errors"
"github.com/juju/mgo/v2"
"github.com/juju/names/v4"
"github.com/juju/replicaset"
"github.com/juju/version"
"gopkg.in/mgo.v2"

"github.com/juju/juju/controller"
"github.com/juju/juju/core/constraints"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/client/spaces/interface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package spaces

import (
"github.com/juju/collections/set"
"github.com/juju/mgo/v2/txn"
"github.com/juju/names/v4"
"gopkg.in/mgo.v2/txn"

"github.com/juju/juju/apiserver/common/networkingcommon"
"github.com/juju/juju/controller"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/client/spaces/move.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package spaces
import (
"github.com/juju/collections/set"
"github.com/juju/errors"
"github.com/juju/mgo/v2/txn"
"github.com/juju/names/v4"
"gopkg.in/mgo.v2/txn"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/common/networkingcommon"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/client/spaces/move_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ package spaces_test
import (
"github.com/golang/mock/gomock"
"github.com/juju/errors"
"github.com/juju/mgo/v2/txn"
"github.com/juju/names/v4"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/mgo.v2/txn"

netmocks "github.com/juju/juju/apiserver/common/networkingcommon/mocks"
"github.com/juju/juju/apiserver/facades/client/spaces"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/client/spaces/package_mock_test.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 apiserver/facades/client/spaces/remove.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package spaces

import (
"github.com/juju/errors"
"github.com/juju/mgo/v2/txn"
"github.com/juju/names/v4"
"gopkg.in/mgo.v2/txn"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/params"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/client/spaces/remove_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ package spaces_test

import (
"github.com/golang/mock/gomock"
"github.com/juju/mgo/v2/txn"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/mgo.v2/txn"

"github.com/juju/juju/apiserver/facades/client/spaces"
"github.com/juju/juju/core/network"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/client/spaces/rename.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package spaces

import (
"github.com/juju/errors"
"github.com/juju/mgo/v2/txn"
"github.com/juju/names/v4"
"gopkg.in/mgo.v2/txn"

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

"github.com/golang/mock/gomock"
"github.com/juju/errors"
"github.com/juju/mgo/v2/txn"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/mgo.v2/txn"

"github.com/juju/juju/apiserver/facades/client/spaces"
"github.com/juju/juju/controller"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/controller/instancepoller/instancepoller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"github.com/juju/clock"
"github.com/juju/clock/testclock"
"github.com/juju/errors"
"github.com/juju/mgo/v2/txn"
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/mgo.v2/txn"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/common/networkingcommon"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/controller/instancepoller/merge.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"github.com/juju/collections/set"
"github.com/juju/errors"
"github.com/juju/mgo/v2/txn"
jujutxn "github.com/juju/txn"
"gopkg.in/mgo.v2/txn"

"github.com/juju/juju/apiserver/common/networkingcommon"
"github.com/juju/juju/core/network"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/controller/instancepoller/mock_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"github.com/juju/juju/apiserver/common/networkingcommon"

"github.com/juju/errors"
"github.com/juju/mgo/v2/txn"
"github.com/juju/names/v4"
"github.com/juju/testing"
gc "gopkg.in/check.v1"
"gopkg.in/mgo.v2/txn"

"github.com/juju/juju/apiserver/facades/controller/instancepoller"
"github.com/juju/juju/core/instance"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/logsink_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (

"github.com/gorilla/websocket"
"github.com/juju/loggo"
"github.com/juju/mgo/v2/bson"
"github.com/juju/names/v4"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
gc "gopkg.in/check.v1"
"gopkg.in/mgo.v2/bson"

"github.com/juju/juju/apiserver"
"github.com/juju/juju/apiserver/apiserverhttp"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/logtransfer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
"github.com/gorilla/websocket"
"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/mgo/v2/bson"
"github.com/juju/names/v4"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
gc "gopkg.in/check.v1"
"gopkg.in/mgo.v2/bson"

"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/apiserver/websocket/websockettest"
Expand Down
2 changes: 1 addition & 1 deletion cmd/jujud/agent/agenttest/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ import (
"github.com/juju/cmd"
"github.com/juju/cmd/cmdtesting"
"github.com/juju/errors"
"github.com/juju/mgo/v2"
"github.com/juju/names/v4"
"github.com/juju/replicaset"
gitjujutesting "github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/version"
gc "gopkg.in/check.v1"
"gopkg.in/mgo.v2"

"github.com/juju/juju/agent"
agenttools "github.com/juju/juju/agent/tools"
Expand Down
2 changes: 1 addition & 1 deletion cmd/jujud/agent/bootstrap_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ import (
"github.com/juju/collections/set"
"github.com/juju/errors"
"github.com/juju/loggo"
"github.com/juju/mgo/v2"
"github.com/juju/names/v4"
"github.com/juju/os/series"
gitjujutesting "github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
"github.com/juju/version"
gc "gopkg.in/check.v1"
"gopkg.in/mgo.v2"

"github.com/juju/juju/agent"
"github.com/juju/juju/agent/agentbootstrap"
Expand Down
2 changes: 1 addition & 1 deletion cmd/jujud/agent/machine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/juju/errors"
"github.com/juju/gnuflag"
"github.com/juju/loggo"
"github.com/juju/mgo/v2"
"github.com/juju/names/v4"
"github.com/juju/pubsub"
"github.com/juju/replicaset"
Expand All @@ -28,7 +29,6 @@ import (
"github.com/juju/worker/v2"
"github.com/juju/worker/v2/dependency"
"github.com/prometheus/client_golang/prometheus"
"gopkg.in/mgo.v2"
"gopkg.in/natefinch/lumberjack.v2"

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

"github.com/juju/errors"
"gopkg.in/mgo.v2/bson"
"github.com/juju/mgo/v2/bson"
)

var _ Checker = (*MapKeyValueSizeChecker)(nil)
Expand Down
2 changes: 1 addition & 1 deletion featuretests/bakerystorage_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import (
"context"
"time"

"github.com/juju/mgo/v2"
gitjujutesting "github.com/juju/testing"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"
"gopkg.in/macaroon-bakery.v2/bakery"
"gopkg.in/macaroon-bakery.v2/bakery/checkers"
"gopkg.in/macaroon-bakery.v2/bakery/mgorootkeystore"
"gopkg.in/macaroon.v2"
"gopkg.in/mgo.v2"

"github.com/juju/juju/mongo"
"github.com/juju/juju/state/bakerystorage"
Expand Down
2 changes: 1 addition & 1 deletion featuretests/dblog_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import (

"github.com/juju/cmd/cmdtesting"
"github.com/juju/loggo"
"github.com/juju/mgo/v2/bson"
"github.com/juju/names/v4"
jujutesting "github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
"github.com/juju/utils/arch"
"github.com/juju/version"
gc "gopkg.in/check.v1"
"gopkg.in/mgo.v2/bson"

"github.com/juju/juju/controller"

Expand Down
Loading

0 comments on commit 31b06ac

Please sign in to comment.