upgrade-controller target correct model

cmd/juju/commands/upgradecontroller.go

@@ -23,6 +23,7 @@ import (
 	"github.com/juju/juju/environs/bootstrap"
 	"github.com/juju/juju/environs/config"
 	"github.com/juju/juju/jujuclient"
+	"github.com/juju/juju/permission"
 	"github.com/juju/juju/tools"
 	jujuversion "github.com/juju/juju/version"
 )
@@ -117,20 +118,30 @@ func (c *upgradeControllerCommand) Run(ctx *cmd.Context) (err error) {
 	if err != nil {
 		return errors.Trace(err)
 	}
+	accDetails, err := c.ClientStore().AccountDetails(controllerName)
+	if err != nil {
+		return errors.Trace(err)
+	}
+
+	if !permission.Access(accDetails.LastKnownAccess).EqualOrGreaterControllerAccessThan(permission.SuperuserAccess) {
+		return errors.Errorf("upgrade not possible missing"+
+			" permissions, current level %q, need: %q", accDetails.LastKnownAccess, permission.SuperuserAccess)
+	}
 	controllerModel := jujuclient.JoinOwnerModelName(
 		names.NewUserTag(environs.AdminUser), bootstrap.ControllerModelName)
 	_, err = c.ModelUUIDs([]string{controllerModel})
 	if err != nil {
 		return errors.Annotatef(err, "cannot get controller model uuid")
 	}
 	details, err := c.ClientStore().ModelByName(controllerName, controllerModel)
+	fullControllerModelName := modelcmd.JoinModelName(controllerName, controllerModel)
 	if err != nil {
 		return errors.Trace(err)
 	}
 	if details.ModelType == model.CAAS {
 		return c.upgradeCAASController(ctx)
 	}
-	return c.upgradeIAASController(ctx)
+	return c.upgradeIAASController(ctx, fullControllerModelName)
 }
 
 func (c *upgradeControllerCommand) upgradeCAASController(ctx *cmd.Context) error {
@@ -262,19 +273,13 @@ func initCAASVersions(
 	}, nil
 }
 
-func (c *upgradeControllerCommand) upgradeIAASController(ctx *cmd.Context) error {
+func (c *upgradeControllerCommand) upgradeIAASController(ctx *cmd.Context, controllerModel string) error {
 	jcmd := &upgradeJujuCommand{baseUpgradeCommand: baseUpgradeCommand{
 		upgradeMessage: "upgrade to this version by running\n    juju upgrade-controller",
 	}}
 	jcmd.SetClientStore(c.ClientStore())
 	wrapped := modelcmd.Wrap(jcmd)
-	controllerName, err := c.ControllerName()
-	if err != nil {
-		return errors.Trace(err)
-	}
-	fullControllerModelName := modelcmd.JoinModelName(controllerName,
-		bootstrap.ControllerModelName)
-	args := append(c.rawArgs, "-m", fullControllerModelName)
+	args := append(c.rawArgs, "-m", controllerModel)
 	if c.vers != "" {
 		args = append(args, "--agent-version", c.vers)
 	}

cmd/juju/commands/upgradecontroller_test.go

@@ -5,6 +5,7 @@ package commands
 
 import (
 	"encoding/json"
+	"fmt"
 	"time"
 
 	"github.com/juju/cmd"
@@ -15,6 +16,7 @@ import (
 	"github.com/juju/utils/arch"
 	"github.com/juju/version"
 	gc "gopkg.in/check.v1"
+	"gopkg.in/juju/names.v3"
 
 	"github.com/juju/juju/apiserver/common"
 	apiservertesting "github.com/juju/juju/apiserver/testing"
@@ -25,6 +27,7 @@ import (
 	jujutesting "github.com/juju/juju/juju/testing"
 	"github.com/juju/juju/jujuclient"
 	"github.com/juju/juju/jujuclient/jujuclienttesting"
+	"github.com/juju/juju/permission"
 	coretesting "github.com/juju/juju/testing"
 	jujuversion "github.com/juju/juju/version"
 )
@@ -44,7 +47,6 @@ func (s *UpgradeIAASControllerSuite) SetUpTest(c *gc.C) {
 	s.authoriser = apiservertesting.FakeAuthorizer{
 		Tag: s.AdminUserTag(c),
 	}
-
 	s.CmdBlockHelper = coretesting.NewCmdBlockHelper(s.APIState)
 	c.Assert(s.CmdBlockHelper, gc.NotNil)
 	s.AddCleanup(func(*gc.C) { s.CmdBlockHelper.Close() })
@@ -166,6 +168,50 @@ func (s *UpgradeIAASControllerSuite) TestUpgradeDryRun(c *gc.C) {
 	s.assertUpgradeDryRun(c, "upgrade-controller", s.upgradeControllerCommand)
 }
 
+func (s *UpgradeIAASControllerSuite) TestUpgradeWrongPermissions(c *gc.C) {
+	details, err := s.ControllerStore.AccountDetails("kontroll")
+	c.Assert(err, jc.ErrorIsNil)
+	details.LastKnownAccess = string(permission.ReadAccess)
+	err = s.ControllerStore.UpdateAccount("kontroll", *details)
+	c.Assert(err, jc.ErrorIsNil)
+	com := s.upgradeControllerCommand(nil)
+	err = cmdtesting.InitCommand(com, []string{})
+	c.Assert(err, jc.ErrorIsNil)
+	ctx := cmdtesting.Context(c)
+	err = com.Run(ctx)
+	expectedErrMsg := fmt.Sprintf("upgrade not possible missing"+
+		" permissions, current level %q, need: %q", details.LastKnownAccess, permission.SuperuserAccess)
+	c.Assert(err, gc.ErrorMatches, expectedErrMsg)
+}
+
+func (s *UpgradeIAASControllerSuite) TestUpgradeDifferentUser(c *gc.C) {
+	user, err := s.BackingState.AddUser("rick", "rick", "dummy-secret", "admin")
+	c.Assert(err, jc.ErrorIsNil)
+
+	s.authoriser = apiservertesting.FakeAuthorizer{
+		Tag: user.Tag(),
+	}
+	ctag := names.NewControllerTag(s.BackingState.ControllerUUID())
+
+	_, err = s.BackingState.SetUserAccess(user.UserTag(), ctag, permission.SuperuserAccess)
+	c.Assert(err, jc.ErrorIsNil)
+
+	err = s.ControllerStore.UpdateAccount("kontroll", jujuclient.AccountDetails{
+		User:            "rick",
+		LastKnownAccess: string(permission.SuperuserAccess),
+		Password:        "dummy-secret",
+	})
+	c.Assert(err, jc.ErrorIsNil)
+
+	cmd := &upgradeControllerCommand{
+		baseUpgradeCommand: baseUpgradeCommand{minMajorUpgradeVersion: minMajorUpgradeVersion},
+	}
+	cmd.SetClientStore(s.ControllerStore)
+	cmdrun := modelcmd.WrapController(cmd)
+	_, err = cmdtesting.RunCommand(c, cmdrun)
+	c.Assert(err, jc.ErrorIsNil)
+}
+
 type UpgradeCAASControllerSuite struct {
 	UpgradeBaseSuite
 }