← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/resource/resourceadapters/opener.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/resource/resourceadapters/opener.go
6
6
import (
7
7
        "github.com/juju/errors"
8
8
        "github.com/juju/names"
 
9
        "gopkg.in/macaroon.v1"
9
10
 
10
11
        "github.com/juju/juju/resource"
11
12
        "github.com/juju/juju/resource/charmstore"
15
16
// resourceOpener is an implementation of server.ResourceOpener.
16
17
type resourceOpener struct {
17
18
        st     corestate.Resources
 
19
        csMac  *macaroon.Macaroon
18
20
        userID names.Tag
19
21
        unit   resource.Unit
20
22
}
26
28
        }
27
29
        cURL, _ := ro.unit.CharmURL()
28
30
 
29
 
        csOpener := newCharmstoreOpener(cURL)
 
31
        // TODO(ericsnow) We will need an actual macaroon here.
 
32
        csOpener := newCharmstoreOpener(cURL, ro.csMac)
30
33
        client, err := csOpener.NewClient()
31
34
        if err != nil {
32
35
                return resource.Opened{}, errors.Trace(err)