Merge branch '2.9' into juju-806-remove-connection-uniter-method

sinanawad · Mar 24, 2022 · 6d83a75 · 6d83a75
2 parents 1cc4eb2 + 9938c99
commit 6d83a75
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 13 deletions.
diff --git a/api/agent/upgrader/unitupgrader_test.go b/api/agent/upgrader/unitupgrader_test.go
@@ -48,7 +48,7 @@ func (s *unitUpgraderSuite) SetUpTest(c *gc.C) {
 	s.stateAPI = s.OpenAPIAs(c, s.rawUnit.Tag(), password)
 
 	// Create the upgrader facade.
-	s.st = s.stateAPI.Upgrader()
+	s.st = upgrader.NewState(s.stateAPI)
 	c.Assert(s.st, gc.NotNil)
 
 	s.WaitForModelWatchersIdle(c, s.State.ModelUUID())

diff --git a/api/agent/upgrader/upgrader_test.go b/api/agent/upgrader/upgrader_test.go
@@ -39,7 +39,7 @@ func (s *machineUpgraderSuite) SetUpTest(c *gc.C) {
 	s.JujuConnSuite.SetUpTest(c)
 	s.stateAPI, s.rawMachine = s.OpenAPIAsNewMachine(c)
 	// Create the upgrader facade.
-	s.st = s.stateAPI.Upgrader()
+	s.st = upgrader.NewState(s.stateAPI)
 	c.Assert(s.st, gc.NotNil)
 }
 

diff --git a/api/interface.go b/api/interface.go
@@ -21,7 +21,6 @@ import (
 
 	"github.com/juju/juju/api/agent/reboot"
 	"github.com/juju/juju/api/agent/unitassigner"
-	"github.com/juju/juju/api/agent/upgrader"
 	"github.com/juju/juju/api/base"
 	"github.com/juju/juju/api/controller/instancepoller"
 	"github.com/juju/juju/core/network"
@@ -331,7 +330,6 @@ type Connection interface {
 	// will be easy to remove, but until we're using them via manifolds it's
 	// prohibitively ugly to do so.
 	Client() *Client
-	Upgrader() *upgrader.State
 	Reboot() (reboot.State, error)
 	InstancePoller() *instancepoller.API
 	UnitAssigner() unitassigner.API

diff --git a/api/state.go b/api/state.go
@@ -22,7 +22,6 @@ import (
 	"github.com/juju/juju/api/agent/keyupdater"
 	"github.com/juju/juju/api/agent/reboot"
 	"github.com/juju/juju/api/agent/unitassigner"
-	"github.com/juju/juju/api/agent/upgrader"
 	"github.com/juju/juju/api/base"
 	"github.com/juju/juju/api/controller/instancepoller"
 	"github.com/juju/juju/core/network"
@@ -319,11 +318,6 @@ func (st *state) UnitAssigner() unitassigner.API {
 	return unitassigner.New(st)
 }
 
-// Upgrader returns access to the Upgrader API
-func (st *state) Upgrader() *upgrader.State {
-	return upgrader.NewState(st)
-}
-
 // Reboot returns access to the Reboot API
 func (st *state) Reboot() (reboot.State, error) {
 	switch tag := st.authTag.(type) {

diff --git a/cmd/containeragent/initialize/package_test.go b/cmd/containeragent/initialize/package_test.go
@@ -41,7 +41,6 @@ func (*importSuite) TestImports(c *gc.C) {
 		"api/agent/keyupdater",
 		"api/agent/reboot",
 		"api/agent/unitassigner",
-		"api/agent/upgrader",
 		"api/watcher",
 		"apiserver/errors",
 		"rpc/params",

diff --git a/worker/upgrader/upgrader_test.go b/worker/upgrader/upgrader_test.go
@@ -27,6 +27,7 @@ import (
 	"github.com/juju/juju/agent"
 	agenttools "github.com/juju/juju/agent/tools"
 	"github.com/juju/juju/api"
+	upgraderapi "github.com/juju/juju/api/agent/upgrader"
 	agenterrors "github.com/juju/juju/cmd/jujud/agent/errors"
 	coreos "github.com/juju/juju/core/os"
 	"github.com/juju/juju/environs/simplestreams"
@@ -113,7 +114,7 @@ func (s *UpgraderSuite) makeUpgrader(c *gc.C) *upgrader.Upgrader {
 	w, err := upgrader.NewAgentUpgrader(upgrader.Config{
 		Clock:                       s.clock,
 		Logger:                      loggo.GetLogger("test"),
-		State:                       s.state.Upgrader(),
+		State:                       upgraderapi.NewState(s.state),
 		AgentConfig:                 agentConfig(s.machine.Tag(), s.DataDir()),
 		OrigAgentVersion:            s.confVersion,
 		UpgradeStepsWaiter:          s.upgradeStepsComplete,
@@ -489,7 +490,7 @@ func (s *UpgraderSuite) TestChecksSpaceBeforeDownloading(c *gc.C) {
 	u, err := upgrader.NewAgentUpgrader(upgrader.Config{
 		Clock:                       s.clock,
 		Logger:                      loggo.GetLogger("test"),
-		State:                       s.state.Upgrader(),
+		State:                       upgraderapi.NewState(s.state),
 		AgentConfig:                 agentConfig(s.machine.Tag(), s.DataDir()),
 		OrigAgentVersion:            s.confVersion,
 		UpgradeStepsWaiter:          s.upgradeStepsComplete,