← 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/cmd/juju/service/removeservice.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/cmd/juju/service/removeservice.go
5
5
 
6
6
import (
7
7
        "fmt"
8
 
        "net/http"
9
8
 
10
9
        "github.com/juju/cmd"
11
10
        "github.com/juju/errors"
119
118
        }
120
119
 
121
120
        modelUUID := client.ModelUUID()
122
 
        httpClient, err := c.HTTPClient()
123
 
        if err != nil {
124
 
                return errors.Trace(err)
125
 
        }
126
 
        bClient, err := getBudgetAPIClient(httpClient)
127
 
        if err != nil {
128
 
                return errors.Trace(err)
129
 
        }
 
121
        bakeryClient, err := c.BakeryClient()
 
122
        if err != nil {
 
123
                return errors.Trace(err)
 
124
        }
 
125
        budgetClient := getBudgetAPIClient(bakeryClient)
130
126
 
131
 
        resp, err := bClient.DeleteAllocation(modelUUID, c.ServiceName)
 
127
        resp, err := budgetClient.DeleteAllocation(modelUUID, c.ServiceName)
132
128
        if wireformat.IsNotAvail(err) {
133
129
                fmt.Fprintf(ctx.Stdout, "WARNING: Allocation not removed - %s.\n", err.Error())
134
130
        } else if err != nil {
142
138
 
143
139
var getBudgetAPIClient = getBudgetAPIClientImpl
144
140
 
145
 
func getBudgetAPIClientImpl(client *http.Client) (budgetAPIClient, error) {
146
 
        bakeryClient := &httpbakery.Client{Client: client, VisitWebPage: httpbakery.OpenWebBrowser}
147
 
        c := budget.NewClient(bakeryClient)
148
 
        return c, nil
 
141
func getBudgetAPIClientImpl(bakeryClient *httpbakery.Client) budgetAPIClient {
 
142
        return budget.NewClient(bakeryClient)
149
143
}
150
144
 
151
145
type budgetAPIClient interface {