Merge pull request juju#10348 from hpidcock/1832779-command-fails-no-active-controller

jujubot · web-flow · commit 68be221465ee · 2019-06-24T01:01:45.000+01:00
juju#10348 ## Description of change `juju upgrade-controller -c <controller-name>` previously would error when there isn't a current-controller set. Additionally, when upgrading an IAAS controller, it would previously upgrade the current-controller, even though the controller specified in the command was different. ## QA steps Quick test: Bootstrap to an IAAS (not k8s) e.g. `juju bootstrap localhost` Remove the current-controller line from `controllers.yaml`. Run `juju upgrade-controller -c localhost-localhost` It should not error with `ERROR No selected controller.` Additional test: Bootstrap 2 controllers with an old version. Check which controller is the current-controller. `juju upgrade-controller -c <not-the-current-controller>` Check that the current-controller is still using the old version. ## Documentation changes N/A ## Bug reference [https://bugs.launchpad.net/juju/+bug/1832779](https://bugs.launchpad.net/juju/+bug/1832779)
diff --git a/cmd/juju/commands/upgradecontroller.go b/cmd/juju/commands/upgradecontroller.go
@@ -268,7 +268,13 @@ func (c *upgradeControllerCommand) upgradeIAASController(ctx *cmd.Context) error
 	}}
 	jcmd.SetClientStore(c.ClientStore())
 	wrapped := modelcmd.Wrap(jcmd)
-	args := append(c.rawArgs, "-m", bootstrap.ControllerModelName)
+	controllerName, err := c.ControllerName()
+	if err != nil {
+		return errors.Trace(err)
+	}
+	fullControllerModelName := modelcmd.JoinModelName(controllerName,
+		bootstrap.ControllerModelName)
+	args := append(c.rawArgs, "-m", fullControllerModelName)
 	if c.vers != "" {
 		args = append(args, "--agent-version", c.vers)
 	}
diff --git a/cmd/juju/commands/upgradecontroller_test.go b/cmd/juju/commands/upgradecontroller_test.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/juju/cmd"
 	"github.com/juju/cmd/cmdtesting"
+	"github.com/juju/errors"
 	"github.com/juju/os/series"
 	jc "github.com/juju/testing/checkers"
 	"github.com/juju/utils/arch"
@@ -23,6 +24,7 @@ import (
 	"github.com/juju/juju/environs/tools"
 	jujutesting "github.com/juju/juju/juju/testing"
 	"github.com/juju/juju/jujuclient"
+	"github.com/juju/juju/jujuclient/jujuclienttesting"
 	coretesting "github.com/juju/juju/testing"
 	jujuversion "github.com/juju/juju/version"
 )
@@ -115,6 +117,51 @@ func (s *UpgradeIAASControllerSuite) TestUpgradeWithRealUpload(c *gc.C) {
 	s.checkToolsUploaded(c, vers, vers.Number)
 }
 
+func (s *UpgradeIAASControllerSuite) TestUpgradeCorrectController(c *gc.C) {
+	badControllerName := "not-the-right-controller"
+	badControllerSelected := errors.New("bad controller selected")
+	upgradeCommand := func(minUpgradeVers map[int]version.Number) cmd.Command {
+		backingStore := s.ControllerStore
+		store := jujuclienttesting.WrapClientStore(backingStore)
+		store.ControllerByNameFunc = func(name string) (*jujuclient.ControllerDetails, error) {
+			if name == badControllerName {
+				return nil, badControllerSelected
+			}
+			return backingStore.ControllerByName(name)
+		}
+		store.CurrentControllerFunc = func() (string, error) {
+			return badControllerName, nil
+		}
+		s.ControllerStore = store
+		cmd := &upgradeControllerCommand{
+			baseUpgradeCommand: baseUpgradeCommand{minMajorUpgradeVersion: minMajorUpgradeVersion},
+		}
+		cmd.SetClientStore(s.ControllerStore)
+		return modelcmd.WrapController(cmd)
+	}
+
+	tests := []upgradeTest{
+		{
+			about:          "latest supported stable release with specified controller",
+			available:      []string{"2.1.0-quantal-amd64", "2.1.2-quantal-i386", "2.1.3-quantal-amd64", "2.1-dev1-quantal-amd64"},
+			currentVersion: "2.0.0-quantal-amd64",
+			agentVersion:   "2.0.0",
+			expectVersion:  "2.1.3",
+			args:           []string{"--controller", "kontroll"},
+		},
+		{
+			about:          "latest supported stable release without specified controller",
+			available:      []string{"2.1.0-quantal-amd64", "2.1.2-quantal-i386", "2.1.3-quantal-amd64", "2.1-dev1-quantal-amd64"},
+			currentVersion: "2.0.0-quantal-amd64",
+			agentVersion:   "2.0.0",
+			expectVersion:  "2.1.3",
+			expectErr:      badControllerSelected.Error(),
+		},
+	}
+
+	s.assertUpgradeTests(c, tests, upgradeCommand)
+}
+
 func (s *UpgradeIAASControllerSuite) TestUpgradeDryRun(c *gc.C) {
 	s.assertUpgradeDryRun(c, "upgrade-controller", s.upgradeControllerCommand)
 }
