Skip to content

Commit

Permalink
Migrate gopkg.in/juju/worker to github.com/juju/worker
Browse files Browse the repository at this point in the history
  • Loading branch information
@wallyworld
wallyworld committed Apr 24, 2020
1 parent d59b863 commit 52c9e3b
Show file tree
Hide file tree
Showing 509 changed files with 896 additions and 885 deletions.
2 changes: 1 addition & 1 deletion api/crossmodelrelations/crossmodelrelations_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"github.com/juju/errors"
jujutesting "github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/worker/v2/workertest"
gc "gopkg.in/check.v1"
"gopkg.in/juju/worker.v1/workertest"
"gopkg.in/macaroon-bakery.v2/bakery"
"gopkg.in/macaroon.v2"

Expand Down
2 changes: 1 addition & 1 deletion api/migrationminion/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/juju/errors"
jujutesting "github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/worker/v2"
gc "gopkg.in/check.v1"
"gopkg.in/juju/worker.v1"

apitesting "github.com/juju/juju/api/base/testing"
"github.com/juju/juju/api/migrationminion"
Expand Down
4 changes: 2 additions & 2 deletions api/watcher/watcher_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"github.com/juju/names/v4"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
"github.com/juju/worker/v2"
"github.com/juju/worker/v2/workertest"
gc "gopkg.in/check.v1"
"gopkg.in/juju/worker.v1"
"gopkg.in/juju/worker.v1/workertest"
"gopkg.in/macaroon-bakery.v2/bakery"
"gopkg.in/macaroon-bakery.v2/bakery/checkers"
"gopkg.in/macaroon.v2"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/apiserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"github.com/juju/pubsub"
"github.com/juju/ratelimit"
"github.com/juju/utils"
"github.com/juju/worker/v2/dependency"
"github.com/prometheus/client_golang/prometheus"
"gopkg.in/juju/worker.v1/dependency"
"gopkg.in/tomb.v2"

"github.com/juju/juju/apiserver/apiserverhttp"
Expand Down
4 changes: 2 additions & 2 deletions apiserver/apiserver_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"github.com/juju/names/v4"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
"github.com/juju/worker/v2/dependency"
"github.com/juju/worker/v2/workertest"
gc "gopkg.in/check.v1"
"gopkg.in/juju/worker.v1/dependency"
"gopkg.in/juju/worker.v1/workertest"

"github.com/juju/juju/api"
"github.com/juju/juju/apiserver"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/basesuite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"github.com/juju/pubsub"
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/worker/v2/workertest"
"github.com/prometheus/client_golang/prometheus"
gc "gopkg.in/check.v1"
"gopkg.in/juju/worker.v1/workertest"

"github.com/juju/juju/api"
"github.com/juju/juju/apiserver"
Expand Down
4 changes: 2 additions & 2 deletions apiserver/common/firewall/egressaddresswatcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package firewall
import (
"github.com/juju/collections/set"
"github.com/juju/errors"
"gopkg.in/juju/worker.v1"
"gopkg.in/juju/worker.v1/catacomb"
"github.com/juju/worker/v2"
"github.com/juju/worker/v2/catacomb"

"github.com/juju/juju/core/watcher"
"github.com/juju/juju/network"
Expand Down
4 changes: 2 additions & 2 deletions apiserver/common/relationunitswatcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ package common

import (
"github.com/juju/errors"
"gopkg.in/juju/worker.v1"
"gopkg.in/juju/worker.v1/catacomb"
"github.com/juju/worker/v2"
"github.com/juju/worker/v2/catacomb"

"github.com/juju/juju/apiserver/params"
"github.com/juju/juju/core/watcher"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/agent/caasoperator/operator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/juju/names/v4"
jc "github.com/juju/testing/checkers"
"github.com/juju/version"
"github.com/juju/worker/v2/workertest"
gc "gopkg.in/check.v1"
"gopkg.in/juju/worker.v1/workertest"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/facades/agent/caasoperator"
Expand Down
4 changes: 2 additions & 2 deletions apiserver/facades/agent/caasoperator/watcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package caasoperator
import (
"github.com/juju/collections/set"
"github.com/juju/errors"
"gopkg.in/juju/worker.v1"
"gopkg.in/juju/worker.v1/catacomb"
"github.com/juju/worker/v2"
"github.com/juju/worker/v2/catacomb"

corewatcher "github.com/juju/juju/core/watcher"
"github.com/juju/juju/state"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/agent/logger/logger_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package logger_test
import (
"github.com/juju/names/v4"
jc "github.com/juju/testing/checkers"
"github.com/juju/worker/v2/workertest"
gc "gopkg.in/check.v1"
"gopkg.in/juju/worker.v1/workertest"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/facade"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/agent/proxyupdater/proxyupdater_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/juju/names/v4"
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/worker/v2/workertest"
gc "gopkg.in/check.v1"
"gopkg.in/juju/worker.v1/workertest"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/facades/agent/proxyupdater"
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,8 +6,8 @@ package uniter
import (
"github.com/juju/collections/set"
"github.com/juju/errors"
"github.com/juju/worker/v2/catacomb"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/worker.v1/catacomb"

"github.com/juju/juju/state"
)
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/client/controller/controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"github.com/juju/pubsub"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils"
"github.com/juju/worker/v2/workertest"
"github.com/prometheus/client_golang/prometheus"
gc "gopkg.in/check.v1"
"gopkg.in/juju/worker.v1/workertest"
"gopkg.in/macaroon.v2"

"github.com/juju/juju/apiserver"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/controller/caasfirewaller/firewaller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package caasfirewaller_test
import (
"github.com/juju/names/v4"
jc "github.com/juju/testing/checkers"
"github.com/juju/worker/v2/workertest"
gc "gopkg.in/check.v1"
"gopkg.in/juju/worker.v1/workertest"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/facades/controller/caasfirewaller"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/facades/controller/caasunitprovisioner/provisioner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/juju/clock/testclock"
"github.com/juju/names/v4"
jc "github.com/juju/testing/checkers"
"github.com/juju/worker/v2/workertest"
gc "gopkg.in/check.v1"
"gopkg.in/juju/charm.v6"
"gopkg.in/juju/worker.v1/workertest"

"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/apiserver/facades/controller/caasunitprovisioner"
Expand Down
2 changes: 1 addition & 1 deletion apiserver/shared_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/juju/loggo"
"github.com/juju/pubsub"
jc "github.com/juju/testing/checkers"
"github.com/juju/worker/v2/workertest"
"github.com/prometheus/client_golang/prometheus"
gc "gopkg.in/check.v1"
"gopkg.in/juju/worker.v1/workertest"

corecontroller "github.com/juju/juju/controller"
"github.com/juju/juju/core/cache"
Expand Down
4 changes: 2 additions & 2 deletions apiserver/testing/fakenotifywatcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package testing

import (
"gopkg.in/juju/worker.v1"
"gopkg.in/juju/worker.v1/workertest"
"github.com/juju/worker/v2"
"github.com/juju/worker/v2/workertest"

"github.com/juju/juju/state"
)
Expand Down
2 changes: 1 addition & 1 deletion caas/kubernetes/provider/bootstrap_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
jujuclock "github.com/juju/clock"
"github.com/juju/errors"
jc "github.com/juju/testing/checkers"
"github.com/juju/worker/v2/workertest"
gc "gopkg.in/check.v1"
"gopkg.in/juju/worker.v1/workertest"
apps "k8s.io/api/apps/v1"
core "k8s.io/api/core/v1"
k8sstorage "k8s.io/api/storage/v1"
Expand Down
2 changes: 1 addition & 1 deletion caas/kubernetes/provider/k8s_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"github.com/juju/names/v4"
jc "github.com/juju/testing/checkers"
"github.com/juju/version"
"github.com/juju/worker/v2/workertest"
gc "gopkg.in/check.v1"
"gopkg.in/juju/worker.v1/workertest"
admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
apps "k8s.io/api/apps/v1"
appsv1 "k8s.io/api/apps/v1"
Expand Down
2 changes: 1 addition & 1 deletion caas/kubernetes/provider/k8swatcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

jujuclock "github.com/juju/clock"
"github.com/juju/juju/core/watcher"
"gopkg.in/juju/worker.v1/catacomb"
"github.com/juju/worker/v2/catacomb"

"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/watch"
Expand Down
2 changes: 1 addition & 1 deletion caas/kubernetes/provider/teardown_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/juju/errors"
jc "github.com/juju/testing/checkers"
"github.com/juju/worker/v2/workertest"
gc "gopkg.in/check.v1"
"gopkg.in/juju/worker.v1/workertest"
admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
core "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
Expand Down
2 changes: 1 addition & 1 deletion cmd/juju/application/upgradecharm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
"github.com/juju/gnuflag"
"github.com/juju/names/v4"
"github.com/juju/version"
"github.com/juju/worker/v2/catacomb"
"gopkg.in/juju/charm.v6"
charmresource "gopkg.in/juju/charm.v6/resource"
"gopkg.in/juju/charmrepo.v4"
csclientparams "gopkg.in/juju/charmrepo.v4/csclient/params"
"gopkg.in/juju/worker.v1/catacomb"
"gopkg.in/macaroon-bakery.v2/httpbakery"
"gopkg.in/macaroon.v2"

Expand Down
2 changes: 1 addition & 1 deletion cmd/juju/machine/export_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package machine

import (
"github.com/juju/cmd"
"gopkg.in/juju/worker.v1/catacomb"
"github.com/juju/worker/v2/catacomb"

"github.com/juju/juju/api"
"github.com/juju/juju/cmd/modelcmd"
Expand Down
2 changes: 1 addition & 1 deletion cmd/juju/machine/upgradeseries.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/juju/gnuflag"
"github.com/juju/names/v4"
"github.com/juju/os/series"
"gopkg.in/juju/worker.v1/catacomb"
"github.com/juju/worker/v2/catacomb"

"github.com/juju/juju/api"
"github.com/juju/juju/api/machinemanager"
Expand Down
2 changes: 1 addition & 1 deletion cmd/jujud/agent/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/juju/loggo"
"github.com/juju/names/v4"
"github.com/juju/version"
"gopkg.in/juju/worker.v1/dependency"
"github.com/juju/worker/v2/dependency"

"github.com/juju/juju/agent"
"github.com/juju/juju/cmd/jujud/util"
Expand Down
2 changes: 1 addition & 1 deletion cmd/jujud/agent/agent_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/juju/loggo"
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/worker/v2"
gc "gopkg.in/check.v1"
"gopkg.in/juju/worker.v1"

"github.com/juju/juju/agent"
"github.com/juju/juju/cmd/jujud/agent/agenttest"
Expand Down
4 changes: 2 additions & 2 deletions cmd/jujud/agent/agenttest/engine.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/juju/collections/set"
"github.com/juju/errors"
jc "github.com/juju/testing/checkers"
"github.com/juju/worker/v2"
"github.com/juju/worker/v2/dependency"
gc "gopkg.in/check.v1"
"gopkg.in/juju/worker.v1"
"gopkg.in/juju/worker.v1/dependency"
goyaml "gopkg.in/yaml.v2"

coretesting "github.com/juju/juju/testing"
Expand Down
4 changes: 2 additions & 2 deletions cmd/jujud/agent/caasoperator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"github.com/juju/loggo"
"github.com/juju/names/v4"
"github.com/juju/utils/voyeur"
"github.com/juju/worker/v2"
"github.com/juju/worker/v2/dependency"
"github.com/prometheus/client_golang/prometheus"
"gopkg.in/juju/worker.v1"
"gopkg.in/juju/worker.v1/dependency"

"github.com/juju/juju/agent"
"github.com/juju/juju/api/base"
Expand Down
4 changes: 2 additions & 2 deletions cmd/jujud/agent/caasoperator/manifolds.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/juju/loggo"
"github.com/juju/utils/voyeur"
"github.com/juju/version"
"github.com/juju/worker/v2"
"github.com/juju/worker/v2/dependency"
"github.com/prometheus/client_golang/prometheus"
"gopkg.in/juju/worker.v1"
"gopkg.in/juju/worker.v1/dependency"

coreagent "github.com/juju/juju/agent"
"github.com/juju/juju/api"
Expand Down
4 changes: 2 additions & 2 deletions cmd/jujud/agent/caasoperator_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"github.com/juju/names/v4"
jc "github.com/juju/testing/checkers"
"github.com/juju/utils/voyeur"
"github.com/juju/worker/v2"
"github.com/juju/worker/v2/dependency"
gc "gopkg.in/check.v1"
"gopkg.in/juju/worker.v1"
"gopkg.in/juju/worker.v1/dependency"
"gopkg.in/natefinch/lumberjack.v2"

"github.com/juju/juju/caas/kubernetes/provider/exec"
Expand Down
4 changes: 2 additions & 2 deletions cmd/jujud/agent/engine/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package engine

import (
"gopkg.in/juju/worker.v1"
"gopkg.in/juju/worker.v1/dependency"
"github.com/juju/worker/v2"
"github.com/juju/worker/v2/dependency"

"github.com/juju/juju/agent"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/jujud/agent/engine/agent_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"github.com/juju/errors"
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/worker/v2"
"github.com/juju/worker/v2/dependency"
dt "github.com/juju/worker/v2/dependency/testing"
gc "gopkg.in/check.v1"
"gopkg.in/juju/worker.v1"
"gopkg.in/juju/worker.v1/dependency"
dt "gopkg.in/juju/worker.v1/dependency/testing"

"github.com/juju/juju/agent"
"github.com/juju/juju/cmd/jujud/agent/engine"
Expand Down
4 changes: 2 additions & 2 deletions cmd/jujud/agent/engine/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package engine

import (
"gopkg.in/juju/worker.v1"
"gopkg.in/juju/worker.v1/dependency"
"github.com/juju/worker/v2"
"github.com/juju/worker/v2/dependency"

"github.com/juju/juju/api/base"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/jujud/agent/engine/api_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"github.com/juju/errors"
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
"github.com/juju/worker/v2"
"github.com/juju/worker/v2/dependency"
dt "github.com/juju/worker/v2/dependency/testing"
gc "gopkg.in/check.v1"
"gopkg.in/juju/worker.v1"
"gopkg.in/juju/worker.v1/dependency"
dt "gopkg.in/juju/worker.v1/dependency/testing"

"github.com/juju/juju/api/base"
"github.com/juju/juju/cmd/jujud/agent/engine"
Expand Down
4 changes: 2 additions & 2 deletions cmd/jujud/agent/engine/apiagent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package engine

import (
"gopkg.in/juju/worker.v1"
"gopkg.in/juju/worker.v1/dependency"
"github.com/juju/worker/v2"
"github.com/juju/worker/v2/dependency"

"github.com/juju/juju/agent"
"github.com/juju/juju/api/base"
Expand Down
Loading

0 comments on commit 52c9e3b

Please sign in to comment.