Skip to content

Commit 19157f9

Browse files
wallyworldwallyworld
committed
Rename service to application part 1
1 parent 5787656 commit 19157f9

File tree

839 files changed

+2531
-2531
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

839 files changed

+2531
-2531
lines changed

‎agent/agent.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ import (
1616

1717
"github.com/juju/errors"
1818
"github.com/juju/loggo"
19-
"github.com/juju/names"
2019
"github.com/juju/utils"
2120
"github.com/juju/utils/series"
2221
"github.com/juju/utils/shell"
2322
"github.com/juju/version"
23+
"gopkg.in/juju/names.v2"
2424

2525
"github.com/juju/juju/api"
2626
"github.com/juju/juju/apiserver/params"

‎agent/agent_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"path/filepath"
1010
"reflect"
1111

12-
"github.com/juju/names"
1312
jc "github.com/juju/testing/checkers"
1413
"github.com/juju/version"
1514
gc "gopkg.in/check.v1"
15+
"gopkg.in/juju/names.v2"
1616

1717
"github.com/juju/juju/agent"
1818
"github.com/juju/juju/api"

‎agent/agentbootstrap/bootstrap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ package agentbootstrap
66
import (
77
"github.com/juju/errors"
88
"github.com/juju/loggo"
9-
"github.com/juju/names"
109
"github.com/juju/utils"
1110
"github.com/juju/utils/series"
11+
"gopkg.in/juju/names.v2"
1212

1313
"github.com/juju/juju/agent"
1414
"github.com/juju/juju/apiserver/params"

‎agent/agentbootstrap/bootstrap_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
"net"
99
"path/filepath"
1010

11-
"github.com/juju/names"
1211
gitjujutesting "github.com/juju/testing"
1312
jc "github.com/juju/testing/checkers"
1413
"github.com/juju/utils"
1514
"github.com/juju/utils/series"
1615
gc "gopkg.in/check.v1"
16+
"gopkg.in/juju/names.v2"
1717

1818
"github.com/juju/juju/agent"
1919
"github.com/juju/juju/agent/agentbootstrap"

‎agent/format-1.18.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"strconv"
1010

1111
"github.com/juju/errors"
12-
"github.com/juju/names"
1312
"github.com/juju/version"
13+
"gopkg.in/juju/names.v2"
1414
goyaml "gopkg.in/yaml.v2"
1515

1616
"github.com/juju/juju/apiserver/params"

‎agent/format_whitebox_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"path/filepath"
1010
"runtime"
1111

12-
"github.com/juju/names"
1312
jc "github.com/juju/testing/checkers"
1413
gc "gopkg.in/check.v1"
14+
"gopkg.in/juju/names.v2"
1515

1616
"github.com/juju/juju/apiserver/params"
1717
"github.com/juju/juju/cloudconfig/cloudinit"

‎agent/identity_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"os"
1010
"runtime"
1111

12-
"github.com/juju/names"
1312
jc "github.com/juju/testing/checkers"
1413
gc "gopkg.in/check.v1"
14+
"gopkg.in/juju/names.v2"
1515

1616
"github.com/juju/juju/apiserver/params"
1717
"github.com/juju/juju/testing"

‎agent/uninstall.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"os"
99
"path/filepath"
1010

11-
"github.com/juju/names"
11+
"gopkg.in/juju/names.v2"
1212
)
1313

1414
const (

‎api/action/client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ func (c *Client) ServiceCharmActions(arg params.Entity) (*charm.Actions, error)
115115
if result.Error != nil {
116116
return none, result.Error
117117
}
118-
if result.ServiceTag != arg.Tag {
119-
return none, errors.Errorf("action results received for wrong service %q", result.ServiceTag)
118+
if result.ApplicationTag != arg.Tag {
119+
return none, errors.Errorf("action results received for wrong service %q", result.ApplicationTag)
120120
}
121121
return result.Actions, nil
122122
}

‎api/action/client_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ package action_test
66
import (
77
"errors"
88

9-
"github.com/juju/names"
109
jc "github.com/juju/testing/checkers"
1110
gc "gopkg.in/check.v1"
1211
"gopkg.in/juju/charm.v6-unstable"
12+
"gopkg.in/juju/names.v2"
1313

1414
"github.com/juju/juju/api/action"
1515
"github.com/juju/juju/apiserver/params"
@@ -38,15 +38,15 @@ func (s *actionSuite) TestServiceCharmActions(c *gc.C) {
3838
description: "result from wrong service",
3939
patchResults: []params.ServiceCharmActionsResult{
4040
{
41-
ServiceTag: names.NewServiceTag("bar").String(),
41+
ApplicationTag: names.NewApplicationTag("bar").String(),
4242
},
4343
},
44-
expectedErr: `action results received for wrong service "service-bar"`,
44+
expectedErr: `action results received for wrong service "application-bar"`,
4545
}, {
4646
description: "some other error",
4747
patchResults: []params.ServiceCharmActionsResult{
4848
{
49-
ServiceTag: names.NewServiceTag("foo").String(),
49+
ApplicationTag: names.NewApplicationTag("foo").String(),
5050
Error: &params.Error{
5151
Message: "something bad",
5252
},
@@ -72,7 +72,7 @@ func (s *actionSuite) TestServiceCharmActions(c *gc.C) {
7272
description: "normal result",
7373
patchResults: []params.ServiceCharmActionsResult{
7474
{
75-
ServiceTag: names.NewServiceTag("foo").String(),
75+
ApplicationTag: names.NewApplicationTag("foo").String(),
7676
Actions: &charm.Actions{
7777
ActionSpecs: map[string]charm.ActionSpec{
7878
"action": {
@@ -103,7 +103,7 @@ func (s *actionSuite) TestServiceCharmActions(c *gc.C) {
103103
c.Logf("test %d: %s", i, t.description)
104104
cleanup := patchServiceCharmActions(c, s.client, t.patchResults, t.patchErr)
105105
defer cleanup()
106-
result, err := s.client.ServiceCharmActions(params.Entity{Tag: names.NewServiceTag("foo").String()})
106+
result, err := s.client.ServiceCharmActions(params.Entity{Tag: names.NewApplicationTag("foo").String()})
107107
if t.expectedErr != "" {
108108
c.Check(err, gc.ErrorMatches, t.expectedErr)
109109
} else {

‎api/agent/facade.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package agent
55

66
import (
77
"github.com/juju/errors"
8-
"github.com/juju/names"
8+
"gopkg.in/juju/names.v2"
99

1010
"github.com/juju/juju/api/base"
1111
"github.com/juju/juju/apiserver/params"

‎api/agent/facade_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ package agent_test
55

66
import (
77
"github.com/juju/errors"
8-
"github.com/juju/names"
98
"github.com/juju/testing"
109
jc "github.com/juju/testing/checkers"
1110
gc "gopkg.in/check.v1"
11+
"gopkg.in/juju/names.v2"
1212

1313
"github.com/juju/juju/api/agent"
1414
"github.com/juju/juju/api/base"
@@ -27,15 +27,15 @@ func (s *FacadeSuite) TestLifeCallError(c *gc.C) {
2727
c.Check(request, gc.Equals, "GetEntities")
2828
c.Check(arg, jc.DeepEquals, params.Entities{
2929
Entities: []params.Entity{{
30-
Tag: "service-omg",
30+
Tag: "application-omg",
3131
}},
3232
})
3333
return errors.New("splat")
3434
})
3535
facade, err := agent.NewConnFacade(apiCaller)
3636
c.Assert(err, jc.ErrorIsNil)
3737

38-
life, err := facade.Life(names.NewServiceTag("omg"))
38+
life, err := facade.Life(names.NewApplicationTag("omg"))
3939
c.Check(err, gc.ErrorMatches, "splat")
4040
c.Check(life, gc.Equals, agent.Life(""))
4141
}
@@ -45,7 +45,7 @@ func (s *FacadeSuite) TestLifeNoResult(c *gc.C) {
4545
facade, err := agent.NewConnFacade(lifeChecker(c, result))
4646
c.Assert(err, jc.ErrorIsNil)
4747

48-
life, err := facade.Life(names.NewServiceTag("omg"))
48+
life, err := facade.Life(names.NewApplicationTag("omg"))
4949
c.Check(err, gc.ErrorMatches, "expected 1 result, got 0")
5050
c.Check(life, gc.Equals, agent.Life(""))
5151
}
@@ -57,7 +57,7 @@ func (s *FacadeSuite) TestLifeOversizedResult(c *gc.C) {
5757
facade, err := agent.NewConnFacade(lifeChecker(c, result))
5858
c.Assert(err, jc.ErrorIsNil)
5959

60-
life, err := facade.Life(names.NewServiceTag("omg"))
60+
life, err := facade.Life(names.NewApplicationTag("omg"))
6161
c.Check(err, gc.ErrorMatches, "expected 1 result, got 2")
6262
c.Check(life, gc.Equals, agent.Life(""))
6363
}
@@ -130,7 +130,7 @@ func (s *FacadeSuite) TestSetPasswordCallError(c *gc.C) {
130130
c.Check(request, gc.Equals, "SetPasswords")
131131
c.Check(arg, jc.DeepEquals, params.EntityPasswords{
132132
Changes: []params.EntityPassword{{
133-
Tag: "service-omg",
133+
Tag: "application-omg",
134134
Password: "seekr1t",
135135
}},
136136
})
@@ -139,7 +139,7 @@ func (s *FacadeSuite) TestSetPasswordCallError(c *gc.C) {
139139
facade, err := agent.NewConnFacade(apiCaller)
140140
c.Assert(err, jc.ErrorIsNil)
141141

142-
err = facade.SetPassword(names.NewServiceTag("omg"), "seekr1t")
142+
err = facade.SetPassword(names.NewApplicationTag("omg"), "seekr1t")
143143
c.Check(err, gc.ErrorMatches, "splat")
144144
}
145145

@@ -148,7 +148,7 @@ func (s *FacadeSuite) TestSetPasswordNoResult(c *gc.C) {
148148
facade, err := agent.NewConnFacade(passwordChecker(c, result))
149149
c.Assert(err, jc.ErrorIsNil)
150150

151-
err = facade.SetPassword(names.NewServiceTag("omg"), "blah")
151+
err = facade.SetPassword(names.NewApplicationTag("omg"), "blah")
152152
c.Check(err, gc.ErrorMatches, "expected 1 result, got 0")
153153
}
154154

@@ -159,7 +159,7 @@ func (s *FacadeSuite) TestSetPasswordOversizedResult(c *gc.C) {
159159
facade, err := agent.NewConnFacade(passwordChecker(c, result))
160160
c.Assert(err, jc.ErrorIsNil)
161161

162-
err = facade.SetPassword(names.NewServiceTag("omg"), "blah")
162+
err = facade.SetPassword(names.NewApplicationTag("omg"), "blah")
163163
c.Check(err, gc.ErrorMatches, "expected 1 result, got 2")
164164
}
165165

@@ -207,7 +207,7 @@ func testLifeAPIResult(c *gc.C, result params.AgentGetEntitiesResult) (agent.Lif
207207
}))
208208
c.Assert(err, jc.ErrorIsNil)
209209

210-
return facade.Life(names.NewServiceTag("omg"))
210+
return facade.Life(names.NewApplicationTag("omg"))
211211
}
212212

213213
func lifeChecker(c *gc.C, result params.AgentGetEntitiesResults) base.APICaller {
@@ -225,7 +225,7 @@ func testPasswordAPIResult(c *gc.C, result params.ErrorResult) error {
225225
}))
226226
c.Assert(err, jc.ErrorIsNil)
227227

228-
return facade.SetPassword(names.NewServiceTag("omg"), "blah")
228+
return facade.SetPassword(names.NewApplicationTag("omg"), "blah")
229229
}
230230

231231
func passwordChecker(c *gc.C, result params.ErrorResults) base.APICaller {

‎api/agent/machine_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import (
88
stdtesting "testing"
99

1010
"github.com/juju/errors"
11-
"github.com/juju/names"
1211
jc "github.com/juju/testing/checkers"
1312
gc "gopkg.in/check.v1"
13+
"gopkg.in/juju/names.v2"
1414
"gopkg.in/mgo.v2"
1515

1616
"github.com/juju/juju/api"

‎api/agent/state.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package agent
66
import (
77
"fmt"
88

9-
"github.com/juju/names"
9+
"gopkg.in/juju/names.v2"
1010

1111
"github.com/juju/juju/api/base"
1212
"github.com/juju/juju/api/common"

‎api/agent/unit_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ package agent_test
66
import (
77
"fmt"
88

9-
"github.com/juju/names"
109
jc "github.com/juju/testing/checkers"
1110
"github.com/juju/utils"
1211
gc "gopkg.in/check.v1"
12+
"gopkg.in/juju/names.v2"
1313

1414
"github.com/juju/juju/api"
1515
apiagent "github.com/juju/juju/api/agent"

‎api/apiclient.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ import (
1818

1919
"github.com/juju/errors"
2020
"github.com/juju/loggo"
21-
"github.com/juju/names"
2221
"github.com/juju/utils"
2322
"github.com/juju/utils/parallel"
2423
"github.com/juju/version"
2524
"golang.org/x/net/websocket"
25+
"gopkg.in/juju/names.v2"
2626
"gopkg.in/macaroon-bakery.v1/httpbakery"
2727
"gopkg.in/macaroon.v1"
2828

‎api/apiclient_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
"sync/atomic"
99

1010
"github.com/juju/errors"
11-
"github.com/juju/names"
1211
"github.com/juju/testing"
1312
jc "github.com/juju/testing/checkers"
1413
"github.com/juju/utils/parallel"
1514
"golang.org/x/net/websocket"
1615
gc "gopkg.in/check.v1"
16+
"gopkg.in/juju/names.v2"
1717

1818
"github.com/juju/juju/api"
1919
"github.com/juju/juju/apiserver/params"

‎api/base/caller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
"github.com/juju/errors"
1212
"github.com/juju/httprequest"
13-
"github.com/juju/names"
13+
"gopkg.in/juju/names.v2"
1414
)
1515

1616
// OldAgentError is returned when an api call is not supported

‎api/base/testing/apicaller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88

99
"github.com/juju/errors"
1010
"github.com/juju/httprequest"
11-
"github.com/juju/names"
1211
"github.com/juju/testing"
1312
jc "github.com/juju/testing/checkers"
1413
gc "gopkg.in/check.v1"
14+
"gopkg.in/juju/names.v2"
1515

1616
"github.com/juju/juju/api/base"
1717
coretesting "github.com/juju/juju/testing"

‎api/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import (
1414

1515
"github.com/juju/errors"
1616
"github.com/juju/loggo"
17-
"github.com/juju/names"
1817
"github.com/juju/version"
1918
"golang.org/x/net/websocket"
2019
"gopkg.in/juju/charm.v6-unstable"
2120
csparams "gopkg.in/juju/charmrepo.v2-unstable/csclient/params"
21+
"gopkg.in/juju/names.v2"
2222
"gopkg.in/macaroon.v1"
2323

2424
"github.com/juju/juju/api/base"

‎api/client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import (
1818
"github.com/juju/errors"
1919
"github.com/juju/httprequest"
2020
"github.com/juju/loggo"
21-
"github.com/juju/names"
2221
jc "github.com/juju/testing/checkers"
2322
"github.com/juju/version"
2423
"golang.org/x/net/websocket"
2524
gc "gopkg.in/check.v1"
2625
"gopkg.in/juju/charm.v6-unstable"
26+
"gopkg.in/juju/names.v2"
2727

2828
"github.com/juju/juju/api"
2929
"github.com/juju/juju/api/base"

‎api/common/life.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package common
55

66
import (
77
"github.com/juju/errors"
8-
"github.com/juju/names"
8+
"gopkg.in/juju/names.v2"
99

1010
"github.com/juju/juju/api/base"
1111
"github.com/juju/juju/apiserver/params"

‎api/common/watch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package common
66
import (
77
"fmt"
88

9-
"github.com/juju/names"
9+
"gopkg.in/juju/names.v2"
1010

1111
"github.com/juju/juju/api/base"
1212
apiwatcher "github.com/juju/juju/api/watcher"

‎api/controller/controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package controller
66
import (
77
"github.com/juju/errors"
88
"github.com/juju/loggo"
9-
"github.com/juju/names"
9+
"gopkg.in/juju/names.v2"
1010

1111
"github.com/juju/juju/api"
1212
"github.com/juju/juju/api/base"

0 commit comments

Comments
 (0)