← Back to branch summary

~juju-qa/ubuntu/xenial/juju/2.0-rc2

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/apiserver/client/client.go

  • Committer: Nicholas Skaggs
  • Date: 2016-09-30 14:39:30 UTC
  • mfrom: (1.8.1)
  • Revision ID: nicholas.skaggs@canonical.com-20160930143930-vwwhrefh6ftckccy
import upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/apiserver/client/client.go
15
15
        "github.com/juju/juju/apiserver/facade"
16
16
        "github.com/juju/juju/apiserver/modelconfig"
17
17
        "github.com/juju/juju/apiserver/params"
18
 
        "github.com/juju/juju/core/description"
19
18
        "github.com/juju/juju/environs"
20
19
        "github.com/juju/juju/environs/config"
21
20
        "github.com/juju/juju/environs/manual"
22
21
        "github.com/juju/juju/instance"
23
22
        "github.com/juju/juju/network"
 
23
        "github.com/juju/juju/permission"
24
24
        "github.com/juju/juju/state"
25
25
        "github.com/juju/juju/state/stateenvirons"
26
26
        jujuversion "github.com/juju/juju/version"
62
62
}
63
63
 
64
64
func (c *Client) checkCanRead() error {
65
 
        canRead, err := c.api.auth.HasPermission(description.ReadAccess, c.api.stateAccessor.ModelTag())
 
65
        canRead, err := c.api.auth.HasPermission(permission.ReadAccess, c.api.stateAccessor.ModelTag())
66
66
        if err != nil {
67
67
                return errors.Trace(err)
68
68
        }
73
73
}
74
74
 
75
75
func (c *Client) checkCanWrite() error {
76
 
        canWrite, err := c.api.auth.HasPermission(description.WriteAccess, c.api.stateAccessor.ModelTag())
 
76
        canWrite, err := c.api.auth.HasPermission(permission.WriteAccess, c.api.stateAccessor.ModelTag())
77
77
        if err != nil {
78
78
                return errors.Trace(err)
79
79
        }
431
431
        }
432
432
        info := params.ModelInfo{
433
433
                DefaultSeries: config.PreferredSeries(conf),
434
 
                Cloud:         model.Cloud(),
 
434
                CloudTag:      names.NewCloudTag(model.Cloud()).String(),
435
435
                CloudRegion:   model.CloudRegion(),
436
436
                ProviderType:  conf.Type(),
437
437
                Name:          conf.Name(),
445
445
        return info, nil
446
446
}
447
447
 
448
 
func modelInfo(st *state.State, user description.UserAccess) (params.ModelUserInfo, error) {
 
448
func modelInfo(st *state.State, user permission.UserAccess) (params.ModelUserInfo, error) {
449
449
        return common.ModelUserInfo(user, st)
450
450
}
451
451