← 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/imagemetadata/metadata.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/imagemetadata/metadata.go
14
14
        "github.com/juju/juju/apiserver/common"
15
15
        "github.com/juju/juju/apiserver/facade"
16
16
        "github.com/juju/juju/apiserver/params"
17
 
        "github.com/juju/juju/core/description"
18
17
        "github.com/juju/juju/environs"
19
18
        "github.com/juju/juju/environs/config"
20
19
        envmetadata "github.com/juju/juju/environs/imagemetadata"
21
20
        "github.com/juju/juju/environs/simplestreams"
 
21
        "github.com/juju/juju/permission"
22
22
        "github.com/juju/juju/state"
23
23
        "github.com/juju/juju/state/cloudimagemetadata"
24
24
        "github.com/juju/juju/state/stateenvirons"
73
73
// Returned list contains metadata ordered by priority.
74
74
func (api *API) List(filter params.ImageMetadataFilter) (params.ListCloudImageMetadataResult, error) {
75
75
        if api.authorizer.AuthClient() {
76
 
                admin, err := api.authorizer.HasPermission(description.SuperuserAccess, api.metadata.ControllerTag())
 
76
                admin, err := api.authorizer.HasPermission(permission.SuperuserAccess, api.metadata.ControllerTag())
77
77
                if err != nil {
78
78
                        return params.ListCloudImageMetadataResult{}, errors.Trace(err)
79
79
                }
114
114
func (api *API) Save(metadata params.MetadataSaveParams) (params.ErrorResults, error) {
115
115
        all := make([]params.ErrorResult, len(metadata.Metadata))
116
116
        if api.authorizer.AuthClient() {
117
 
                admin, err := api.authorizer.HasPermission(description.SuperuserAccess, api.metadata.ControllerTag())
 
117
                admin, err := api.authorizer.HasPermission(permission.SuperuserAccess, api.metadata.ControllerTag())
118
118
                if err != nil {
119
119
                        return params.ErrorResults{Results: all}, errors.Trace(err)
120
120
                }
142
142
func (api *API) Delete(images params.MetadataImageIds) (params.ErrorResults, error) {
143
143
        all := make([]params.ErrorResult, len(images.Ids))
144
144
        if api.authorizer.AuthClient() {
145
 
                admin, err := api.authorizer.HasPermission(description.SuperuserAccess, api.metadata.ControllerTag())
 
145
                admin, err := api.authorizer.HasPermission(permission.SuperuserAccess, api.metadata.ControllerTag())
146
146
                if err != nil {
147
147
                        return params.ErrorResults{Results: all}, errors.Trace(err)
148
148
                }
178
178
        results := make([]cloudimagemetadata.Metadata, len(p.Metadata))
179
179
        for i, metadata := range p.Metadata {
180
180
                results[i] = cloudimagemetadata.Metadata{
181
 
                        cloudimagemetadata.MetadataAttributes{
 
181
                        MetadataAttributes: cloudimagemetadata.MetadataAttributes{
182
182
                                Stream:          metadata.Stream,
183
183
                                Region:          metadata.Region,
184
184
                                Version:         metadata.Version,
189
189
                                RootStorageSize: metadata.RootStorageSize,
190
190
                                Source:          metadata.Source,
191
191
                        },
192
 
                        metadata.Priority,
193
 
                        metadata.ImageId,
 
192
                        Priority: metadata.Priority,
 
193
                        ImageId:  metadata.ImageId,
194
194
                }
195
195
                // TODO (anastasiamac 2016-08-24) This is a band-aid solution.
196
196
                // Once correct value is read from simplestreams, this needs to go.
206
206
// updates stored ones accordingly.
207
207
func (api *API) UpdateFromPublishedImages() error {
208
208
        if api.authorizer.AuthClient() {
209
 
                admin, err := api.authorizer.HasPermission(description.SuperuserAccess, api.metadata.ControllerTag())
 
209
                admin, err := api.authorizer.HasPermission(permission.SuperuserAccess, api.metadata.ControllerTag())
210
210
                if err != nil {
211
211
                        return errors.Trace(err)
212
212
                }