worker: use external worker package

The package gopkg.in/worker.v1 has existed for a while and will soon have some changes that we need in Juju, so use it instead of the locally defined Runner type and delete that. Although large, there are no significant semantic changes introduced by this PR.
zhatin · Mar 7, 2017 · f21749c · f21749c
1 parent 3baa794
commit f21749c
Show file tree

Hide file tree

Showing 282 changed files with 503 additions and 1,142 deletions.
diff --git a/api/migrationminion/client_test.go b/api/migrationminion/client_test.go
@@ -10,13 +10,13 @@ import (
 	jujutesting "github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
+	worker "gopkg.in/juju/worker.v1"
 
 	apitesting "github.com/juju/juju/api/base/testing"
 	"github.com/juju/juju/api/migrationminion"
 	"github.com/juju/juju/apiserver/params"
 	"github.com/juju/juju/core/migration"
 	coretesting "github.com/juju/juju/testing"
-	"github.com/juju/juju/worker"
 )
 
 type ClientSuite struct {

diff --git a/api/watcher/watcher_test.go b/api/watcher/watcher_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/juju/utils"
 	gc "gopkg.in/check.v1"
 	"gopkg.in/juju/names.v2"
+	worker "gopkg.in/juju/worker.v1"
 
 	"github.com/juju/juju/api"
 	"github.com/juju/juju/api/migrationminion"
@@ -22,7 +23,6 @@ import (
 	"github.com/juju/juju/testing/factory"
 	corewatcher "github.com/juju/juju/watcher"
 	"github.com/juju/juju/watcher/watchertest"
-	"github.com/juju/juju/worker"
 )
 
 type watcherSuite struct {

diff --git a/apiserver/client/api_test.go b/apiserver/client/api_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/juju/utils/clock"
 	gc "gopkg.in/check.v1"
 	"gopkg.in/juju/names.v2"
+	worker "gopkg.in/juju/worker.v1"
 
 	"github.com/juju/juju/api"
 	commontesting "github.com/juju/juju/apiserver/common/testing"
@@ -27,7 +28,6 @@ import (
 	"github.com/juju/juju/status"
 	coretesting "github.com/juju/juju/testing"
 	"github.com/juju/juju/testing/factory"
-	"github.com/juju/juju/worker"
 )
 
 type baseSuite struct {

diff --git a/apiserver/client/client_test.go b/apiserver/client/client_test.go
@@ -18,6 +18,7 @@ import (
 	gc "gopkg.in/check.v1"
 	"gopkg.in/juju/charm.v6-unstable"
 	"gopkg.in/juju/names.v2"
+	worker "gopkg.in/juju/worker.v1"
 
 	"github.com/juju/juju/agent"
 	"github.com/juju/juju/apiserver/client"
@@ -42,7 +43,6 @@ import (
 	coretesting "github.com/juju/juju/testing"
 	"github.com/juju/juju/testing/factory"
 	jujuversion "github.com/juju/juju/version"
-	"github.com/juju/juju/worker"
 )
 
 type serverSuite struct {

diff --git a/apiserver/highavailability/highavailability_test.go b/apiserver/highavailability/highavailability_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/juju/errors"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
+	worker "gopkg.in/juju/worker.v1"
 
 	"github.com/juju/juju/apiserver/common"
 	commontesting "github.com/juju/juju/apiserver/common/testing"
@@ -21,7 +22,6 @@ import (
 	"github.com/juju/juju/state/presence"
 	coretesting "github.com/juju/juju/testing"
 	"github.com/juju/juju/testing/factory"
-	"github.com/juju/juju/worker"
 )
 
 func TestAll(t *stdtesting.T) {

diff --git a/apiserver/presence/pinger.go b/apiserver/presence/pinger.go
@@ -11,8 +11,8 @@ import (
 	"github.com/juju/loggo"
 	"github.com/juju/utils/clock"
 	"gopkg.in/juju/names.v2"
+	"gopkg.in/juju/worker.v1"
 
-	"github.com/juju/juju/worker"
 	"github.com/juju/juju/worker/catacomb"
 )
 

diff --git a/apiserver/presence/util_test.go b/apiserver/presence/util_test.go
@@ -13,9 +13,9 @@ import (
 	"github.com/juju/utils/clock"
 	gc "gopkg.in/check.v1"
 	"gopkg.in/juju/names.v2"
+	worker "gopkg.in/juju/worker.v1"
 
 	"github.com/juju/juju/apiserver/presence"
-	"github.com/juju/juju/worker"
 	"github.com/juju/juju/worker/workertest"
 )
 

diff --git a/apiserver/testing/fakenotifywatcher.go b/apiserver/testing/fakenotifywatcher.go
@@ -4,8 +4,9 @@
 package testing
 
 import (
+	worker "gopkg.in/juju/worker.v1"
+
 	"github.com/juju/juju/state"
-	"github.com/juju/juju/worker"
 	"github.com/juju/juju/worker/workertest"
 )
 

diff --git a/cmd/jujud/agent/agent_test.go b/cmd/jujud/agent/agent_test.go
@@ -8,6 +8,7 @@ import (
 	jc "github.com/juju/testing/checkers"
 	"github.com/juju/utils/series"
 	gc "gopkg.in/check.v1"
+	worker "gopkg.in/juju/worker.v1"
 
 	"github.com/juju/juju/cmd/jujud/agent/agenttest"
 	cmdutil "github.com/juju/juju/cmd/jujud/util"
@@ -16,7 +17,6 @@ import (
 	"github.com/juju/juju/mongo"
 	"github.com/juju/juju/network"
 	coretesting "github.com/juju/juju/testing"
-	"github.com/juju/juju/worker"
 	"github.com/juju/juju/worker/proxyupdater"
 )
 

diff --git a/cmd/jujud/agent/engine/agent.go b/cmd/jujud/agent/engine/agent.go
@@ -4,8 +4,9 @@
 package engine
 
 import (
+	worker "gopkg.in/juju/worker.v1"
+
 	"github.com/juju/juju/agent"
-	"github.com/juju/juju/worker"
 	"github.com/juju/juju/worker/dependency"
 )
 

diff --git a/cmd/jujud/agent/engine/agent_test.go b/cmd/jujud/agent/engine/agent_test.go
@@ -8,10 +8,10 @@ import (
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
+	worker "gopkg.in/juju/worker.v1"
 
 	"github.com/juju/juju/agent"
 	"github.com/juju/juju/cmd/jujud/agent/engine"
-	"github.com/juju/juju/worker"
 	"github.com/juju/juju/worker/dependency"
 	dt "github.com/juju/juju/worker/dependency/testing"
 )

diff --git a/cmd/jujud/agent/engine/api.go b/cmd/jujud/agent/engine/api.go
@@ -4,8 +4,9 @@
 package engine
 
 import (
+	worker "gopkg.in/juju/worker.v1"
+
 	"github.com/juju/juju/api/base"
-	"github.com/juju/juju/worker"
 	"github.com/juju/juju/worker/dependency"
 )
 

diff --git a/cmd/jujud/agent/engine/api_test.go b/cmd/jujud/agent/engine/api_test.go
@@ -8,10 +8,10 @@ import (
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
+	worker "gopkg.in/juju/worker.v1"
 
 	"github.com/juju/juju/api/base"
 	"github.com/juju/juju/cmd/jujud/agent/engine"
-	"github.com/juju/juju/worker"
 	"github.com/juju/juju/worker/dependency"
 	dt "github.com/juju/juju/worker/dependency/testing"
 )

diff --git a/cmd/jujud/agent/engine/apiagent.go b/cmd/jujud/agent/engine/apiagent.go
@@ -4,9 +4,10 @@
 package engine
 
 import (
+	worker "gopkg.in/juju/worker.v1"
+
 	"github.com/juju/juju/agent"
 	"github.com/juju/juju/api/base"
-	"github.com/juju/juju/worker"
 	"github.com/juju/juju/worker/dependency"
 )
 

diff --git a/cmd/jujud/agent/engine/apiagent_test.go b/cmd/jujud/agent/engine/apiagent_test.go
@@ -8,11 +8,11 @@ import (
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
+	worker "gopkg.in/juju/worker.v1"
 
 	"github.com/juju/juju/agent"
 	"github.com/juju/juju/api/base"
 	"github.com/juju/juju/cmd/jujud/agent/engine"
-	"github.com/juju/juju/worker"
 	"github.com/juju/juju/worker/dependency"
 	dt "github.com/juju/juju/worker/dependency/testing"
 )

diff --git a/cmd/jujud/agent/engine/enginetest/agentapimanifold.go b/cmd/jujud/agent/engine/enginetest/agentapimanifold.go
@@ -4,11 +4,12 @@
 package enginetest
 
 import (
+	worker "gopkg.in/juju/worker.v1"
+
 	"github.com/juju/juju/agent"
 	"github.com/juju/juju/api/base"
 	basetesting "github.com/juju/juju/api/base/testing"
 	"github.com/juju/juju/cmd/jujud/agent/engine"
-	"github.com/juju/juju/worker"
 	"github.com/juju/juju/worker/dependency"
 	dt "github.com/juju/juju/worker/dependency/testing"
 )

diff --git a/cmd/jujud/agent/engine/flag.go b/cmd/jujud/agent/engine/flag.go
@@ -5,8 +5,7 @@ package engine
 
 import (
 	"github.com/juju/errors"
-
-	"github.com/juju/juju/worker"
+	worker "gopkg.in/juju/worker.v1"
 )
 
 // Flag represents a single boolean used to determine whether a given

diff --git a/cmd/jujud/agent/engine/flag_test.go b/cmd/jujud/agent/engine/flag_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
+	worker "gopkg.in/juju/worker.v1"
 
 	"github.com/juju/juju/cmd/jujud/agent/engine"
-	"github.com/juju/juju/worker"
 )
 
 type FlagSuite struct {

diff --git a/cmd/jujud/agent/engine/housing.go b/cmd/jujud/agent/engine/housing.go
@@ -5,8 +5,8 @@ package engine
 
 import (
 	"github.com/juju/errors"
+	worker "gopkg.in/juju/worker.v1"
 
-	"github.com/juju/juju/worker"
 	"github.com/juju/juju/worker/dependency"
 	"github.com/juju/juju/worker/fortress"
 )

diff --git a/cmd/jujud/agent/engine/housing_test.go b/cmd/jujud/agent/engine/housing_test.go
@@ -10,10 +10,10 @@ import (
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
+	worker "gopkg.in/juju/worker.v1"
 
 	"github.com/juju/juju/cmd/jujud/agent/engine"
 	coretesting "github.com/juju/juju/testing"
-	"github.com/juju/juju/worker"
 	"github.com/juju/juju/worker/dependency"
 	dt "github.com/juju/juju/worker/dependency/testing"
 	"github.com/juju/juju/worker/fortress"

diff --git a/cmd/jujud/agent/engine/valueworker.go b/cmd/jujud/agent/engine/valueworker.go
@@ -7,9 +7,8 @@ import (
 	"reflect"
 
 	"github.com/juju/errors"
+	worker "gopkg.in/juju/worker.v1"
 	"gopkg.in/tomb.v1"
-
-	"github.com/juju/juju/worker"
 )
 
 // NewValueWorker returns a degenerate worker that exposes the supplied value

diff --git a/cmd/jujud/agent/engine/valueworker_test.go b/cmd/jujud/agent/engine/valueworker_test.go
@@ -7,9 +7,9 @@ import (
 	"github.com/juju/testing"
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
+	worker "gopkg.in/juju/worker.v1"
 
 	"github.com/juju/juju/cmd/jujud/agent/engine"
-	"github.com/juju/juju/worker"
 )
 
 type ValueWorkerSuite struct {

diff --git a/cmd/jujud/agent/engine_test.go b/cmd/jujud/agent/engine_test.go
@@ -11,13 +11,13 @@ import (
 	"github.com/juju/errors"
 	"github.com/juju/utils/set"
 	gc "gopkg.in/check.v1"
+	worker "gopkg.in/juju/worker.v1"
 	goyaml "gopkg.in/yaml.v2"
 
 	"github.com/juju/juju/cmd/jujud/agent/machine"
 	"github.com/juju/juju/cmd/jujud/agent/model"
 	"github.com/juju/juju/cmd/jujud/agent/unit"
 	coretesting "github.com/juju/juju/testing"
-	"github.com/juju/juju/worker"
 	"github.com/juju/juju/worker/dependency"
 )
 

diff --git a/cmd/jujud/agent/imagemetadataworker_test.go b/cmd/jujud/agent/imagemetadataworker_test.go
@@ -6,14 +6,15 @@ package agent
 import (
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
+	"gopkg.in/juju/worker.v1"
 
 	"github.com/juju/juju/api/imagemetadata"
 	"github.com/juju/juju/environs"
 	"github.com/juju/juju/environs/config"
 	"github.com/juju/juju/environs/simplestreams"
 	"github.com/juju/juju/state"
 	"github.com/juju/juju/testing"
-	"github.com/juju/juju/worker"
+	jworker "github.com/juju/juju/worker"
 )
 
 // MachineMockProviderSuite runs worker tests that depend
@@ -30,7 +31,7 @@ func (s *MachineMockProviderSuite) TestMachineAgentRunsMetadataWorker(c *gc.C) {
 	started := make(chan struct{})
 	newWorker := func(cl *imagemetadata.Client) worker.Worker {
 		close(started)
-		return worker.NewNoOpWorker()
+		return jworker.NewNoOpWorker()
 	}
 	s.PatchValue(&newMetadataUpdater, newWorker)
 	s.PatchValue(&newEnvirons, func(environs.OpenParams) (environs.Environ, error) {

diff --git a/cmd/jujud/agent/introspection.go b/cmd/jujud/agent/introspection.go
@@ -10,9 +10,9 @@ import (
 	"github.com/juju/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	names "gopkg.in/juju/names.v2"
+	worker "gopkg.in/juju/worker.v1"
 
 	"github.com/juju/juju/agent"
-	"github.com/juju/juju/worker"
 	"github.com/juju/juju/worker/dependency"
 	"github.com/juju/juju/worker/introspection"
 )

diff --git a/cmd/jujud/agent/introspection_test.go b/cmd/jujud/agent/introspection_test.go
@@ -12,11 +12,11 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 	"gopkg.in/juju/names.v2"
+	worker "gopkg.in/juju/worker.v1"
 
 	"github.com/juju/juju/agent"
 	cmdutil "github.com/juju/juju/cmd/jujud/util"
 	coretesting "github.com/juju/juju/testing"
-	"github.com/juju/juju/worker"
 	"github.com/juju/juju/worker/dependency"
 	"github.com/juju/juju/worker/introspection"
 )