Merge branch 'upstream/2.7' into 2.7-into-develop

hatched · Jan 20, 2020 · bc58b6f · bc58b6f
2 parents 0b9d2d8 + fc2c63f
commit bc58b6f
Show file tree

Hide file tree

Showing 8 changed files with 1,138 additions and 36 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -123,7 +123,7 @@
 
 [[constraint]]
   name = "github.com/lxc/lxd"
-  revision = "4c2bbb608e7a90a9f175a566b9e638069424f0f7"
+  revision = "3a5f63bc49591c4cb62268f210b07ff8e74b727d"
 
 [[constraint]]
   name = "github.com/oracle/oci-go-sdk"

diff --git a/apiserver/facades/client/client/client.go b/apiserver/facades/client/client/client.go
@@ -415,10 +415,6 @@ func (c *Client) SetModelConstraints(args params.SetConstraints) error {
 
 // AddMachines adds new machines with the supplied parameters.
 func (c *Client) AddMachines(args params.AddMachines) (params.AddMachinesResults, error) {
-	if err := c.checkCanWrite(); err != nil {
-		return params.AddMachinesResults{}, err
-	}
-
 	return c.AddMachinesV2(args)
 }
 
@@ -427,6 +423,9 @@ func (c *Client) AddMachinesV2(args params.AddMachines) (params.AddMachinesResul
 	results := params.AddMachinesResults{
 		Machines: make([]params.AddMachinesResult, len(args.MachineParams)),
 	}
+	if err := c.checkCanWrite(); err != nil {
+		return params.AddMachinesResults{}, err
+	}
 	if err := c.check.ChangeAllowed(); err != nil {
 		return results, errors.Trace(err)
 	}
@@ -442,10 +441,6 @@ func (c *Client) AddMachinesV2(args params.AddMachines) (params.AddMachinesResul
 
 // InjectMachines injects a machine into state with provisioned status.
 func (c *Client) InjectMachines(args params.AddMachines) (params.AddMachinesResults, error) {
-	if err := c.checkCanWrite(); err != nil {
-		return params.AddMachinesResults{}, err
-	}
-
 	return c.AddMachines(args)
 }
 

diff --git a/apiserver/facades/client/client/client_test.go b/apiserver/facades/client/client/client_test.go
@@ -156,6 +156,20 @@ func (s *serverSuite) TestModelInfo(c *gc.C) {
 	c.Assert(info.IsController, gc.Equals, model.IsControllerModel())
 }
 
+func (s *serverSuite) TestAddMachineVariantsReadOnlyDenied(c *gc.C) {
+	user := s.makeLocalModelUser(c, "read", "Read Only")
+	api := s.authClientForState(c, s.State, testing.FakeAuthorizer{Tag: user.UserTag})
+
+	_, err := api.AddMachines(params.AddMachines{})
+	c.Check(err, gc.ErrorMatches, "permission denied")
+
+	_, err = api.AddMachinesV2(params.AddMachines{})
+	c.Check(err, gc.ErrorMatches, "permission denied")
+
+	_, err = api.InjectMachines(params.AddMachines{})
+	c.Check(err, gc.ErrorMatches, "permission denied")
+}
+
 func (s *serverSuite) TestModelUsersInfo(c *gc.C) {
 	testAdmin := s.AdminUserTag(c)
 	owner, err := s.State.UserAccess(testAdmin, s.Model.ModelTag())
@@ -244,7 +258,7 @@ func (a ByUserName) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
 func (a ByUserName) Less(i, j int) bool { return a[i].Result.UserName < a[j].Result.UserName }
 
 func (s *serverSuite) makeLocalModelUser(c *gc.C, username, displayname string) permission.UserAccess {
-	// factory.MakeUser will create an ModelUser for a local user by defalut
+	// factory.MakeUser will create an ModelUser for a local user by default.
 	user := s.Factory.MakeUser(c, &factory.UserParams{Name: username, DisplayName: displayname})
 	modelUser, err := s.State.UserAccess(user.UserTag(), s.Model.ModelTag())
 	c.Assert(err, jc.ErrorIsNil)

diff --git a/container/lxd/container.go b/container/lxd/container.go
@@ -13,8 +13,8 @@ import (
 	"github.com/juju/errors"
 	"github.com/juju/retry"
 	"github.com/juju/utils/arch"
-	"github.com/lxc/lxd/shared"
 	"github.com/lxc/lxd/shared/api"
+	"github.com/lxc/lxd/shared/units"
 	"github.com/lxc/lxd/shared/version"
 
 	"github.com/juju/juju/core/constraints"
@@ -104,7 +104,7 @@ func (c *Container) Mem() uint {
 		return 0
 	}
 
-	bytes, err := shared.ParseByteSizeString(v)
+	bytes, err := units.ParseByteSizeString(v)
 	if err != nil {
 		logger.Errorf("failed to parse %q into bytes, ignoring err: %s", v, err)
 		return 0

diff --git a/container/lxd/mocks/clock_mock.go b/container/lxd/mocks/clock_mock.go