Skip to content

Commit 67a808f

Browse files
ericsnowcurrentlyericsnowcurrently
committed
Rename the workload package to payload.
1 parent 76ff083 commit 67a808f

Some content is hidden

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

74 files changed

+465
-465
lines changed

‎component/all/payload.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ import (
1313
"github.com/juju/juju/apiserver/common"
1414
"github.com/juju/juju/cmd/envcmd"
1515
"github.com/juju/juju/cmd/juju/commands"
16+
"github.com/juju/juju/payload"
17+
"github.com/juju/juju/payload/api/client"
18+
internalclient "github.com/juju/juju/payload/api/internal/client"
19+
internalserver "github.com/juju/juju/payload/api/internal/server"
20+
"github.com/juju/juju/payload/api/server"
21+
"github.com/juju/juju/payload/context"
22+
"github.com/juju/juju/payload/persistence"
23+
payloadstate "github.com/juju/juju/payload/state"
24+
"github.com/juju/juju/payload/status"
1625
"github.com/juju/juju/state"
1726
"github.com/juju/juju/worker/uniter/runner"
1827
"github.com/juju/juju/worker/uniter/runner/jujuc"
19-
"github.com/juju/juju/workload"
20-
"github.com/juju/juju/workload/api/client"
21-
internalclient "github.com/juju/juju/workload/api/internal/client"
22-
internalserver "github.com/juju/juju/workload/api/internal/server"
23-
"github.com/juju/juju/workload/api/server"
24-
"github.com/juju/juju/workload/context"
25-
"github.com/juju/juju/workload/persistence"
26-
payloadstate "github.com/juju/juju/workload/state"
27-
"github.com/juju/juju/workload/status"
2828
)
2929

30-
const payloadsHookContextFacade = workload.ComponentName + "-hook-context"
30+
const payloadsHookContextFacade = payload.ComponentName + "-hook-context"
3131

3232
type payloads struct{}
3333

@@ -55,7 +55,7 @@ func (payloads) newPublicFacade(st *state.State, resources *common.Resources, au
5555

5656
func (c payloads) registerPublicFacade() {
5757
common.RegisterStandardFacade(
58-
workload.ComponentName,
58+
payload.ComponentName,
5959
0,
6060
c.newPublicFacade,
6161
)
@@ -75,7 +75,7 @@ func (payloads) newListAPIClient(cmd *status.ListCommand) (status.ListAPI, error
7575
if err != nil {
7676
return nil, errors.Trace(err)
7777
}
78-
caller := base.NewFacadeCallerForVersion(apiCaller, workload.ComponentName, 0)
78+
caller := base.NewFacadeCallerForVersion(apiCaller, payload.ComponentName, 0)
7979

8080
listAPI := client.NewPublicClient(&facadeCaller{
8181
FacadeCaller: caller,
@@ -85,7 +85,7 @@ func (payloads) newListAPIClient(cmd *status.ListCommand) (status.ListAPI, error
8585
}
8686

8787
func (c payloads) registerPublicCommands() {
88-
if !markRegistered(workload.ComponentName, "public-commands") {
88+
if !markRegistered(payload.ComponentName, "public-commands") {
8989
return
9090
}
9191

@@ -95,11 +95,11 @@ func (c payloads) registerPublicCommands() {
9595
}
9696

9797
func (c payloads) registerHookContext() {
98-
if !markRegistered(workload.ComponentName, "hook-context") {
98+
if !markRegistered(payload.ComponentName, "hook-context") {
9999
return
100100
}
101101

102-
runner.RegisterComponentFunc(workload.ComponentName,
102+
runner.RegisterComponentFunc(payload.ComponentName,
103103
func(config runner.ComponentConfig) (jujuc.ContextComponent, error) {
104104
hctxClient := c.newUnitFacadeClient(config.APICaller)
105105
// TODO(ericsnow) Pass the unit's tag through to the component?
@@ -155,7 +155,7 @@ func (c payloadsHookContext) Component(name string) (context.Component, error) {
155155
}
156156

157157
func (payloads) registerHookContextCommands() {
158-
if !markRegistered(workload.ComponentName, "hook-context-commands") {
158+
if !markRegistered(payload.ComponentName, "hook-context-commands") {
159159
return
160160
}
161161

‎workload/api/client/client.go renamed to ‎payload/api/client/client.go

File renamed without changes.

‎workload/api/client/package_test.go renamed to ‎payload/api/client/package_test.go

File renamed without changes.

‎workload/api/client/public.go renamed to ‎payload/api/client/public.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88

99
"github.com/juju/errors"
1010

11-
"github.com/juju/juju/workload"
12-
"github.com/juju/juju/workload/api"
11+
"github.com/juju/juju/payload"
12+
"github.com/juju/juju/payload/api"
1313
)
1414

1515
type facadeCaller interface {
@@ -35,7 +35,7 @@ func NewPublicClient(raw rawAPI) PublicClient {
3535
}
3636

3737
// ListFull calls the List API server method.
38-
func (c PublicClient) ListFull(patterns ...string) ([]workload.FullPayloadInfo, error) {
38+
func (c PublicClient) ListFull(patterns ...string) ([]payload.FullPayloadInfo, error) {
3939
var result api.EnvListResults
4040

4141
args := api.EnvListArgs{
@@ -45,7 +45,7 @@ func (c PublicClient) ListFull(patterns ...string) ([]workload.FullPayloadInfo,
4545
return nil, errors.Trace(err)
4646
}
4747

48-
payloads := make([]workload.FullPayloadInfo, len(result.Results))
48+
payloads := make([]payload.FullPayloadInfo, len(result.Results))
4949
for i, apiInfo := range result.Results {
5050
payload, err := api.API2Payload(apiInfo)
5151
if err != nil {

‎workload/api/client/public_test.go renamed to ‎payload/api/client/public_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
jc "github.com/juju/testing/checkers"
88
gc "gopkg.in/check.v1"
99

10-
"github.com/juju/juju/workload"
11-
"github.com/juju/juju/workload/api"
12-
"github.com/juju/juju/workload/api/client"
10+
"github.com/juju/juju/payload"
11+
"github.com/juju/juju/payload/api"
12+
"github.com/juju/juju/payload/api/client"
1313
)
1414

1515
type publicSuite struct {
@@ -31,7 +31,7 @@ func (s *publicSuite) SetUpTest(c *gc.C) {
3131
Class: "spam",
3232
Type: "docker",
3333
ID: "idspam",
34-
Status: workload.StateRunning,
34+
Status: payload.StateRunning,
3535
Labels: nil,
3636
Unit: names.NewUnitTag("a-service/0").String(),
3737
Machine: names.NewMachineTag("1").String(),
@@ -52,7 +52,7 @@ func (s *publicSuite) TestListOkay(c *gc.C) {
5252
c.Assert(err, jc.ErrorIsNil)
5353

5454
expected, _ := api.API2Payload(s.payload)
55-
c.Check(payloads, jc.DeepEquals, []workload.FullPayloadInfo{
55+
c.Check(payloads, jc.DeepEquals, []payload.FullPayloadInfo{
5656
expected,
5757
})
5858
}

‎workload/api/data.go renamed to ‎payload/api/data.go

File renamed without changes.

‎workload/api/helpers.go renamed to ‎payload/api/helpers.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
"github.com/juju/names"
99
"gopkg.in/juju/charm.v5"
1010

11-
"github.com/juju/juju/workload"
11+
"github.com/juju/juju/payload"
1212
)
1313

14-
// Payload2api converts a workload.FullPayloadInfo struct into
14+
// Payload2api converts a payload.FullPayloadInfo struct into
1515
// a Payload struct.
16-
func Payload2api(p workload.FullPayloadInfo) Payload {
16+
func Payload2api(p payload.FullPayloadInfo) Payload {
1717
labels := make([]string, len(p.Labels))
1818
copy(labels, p.Labels)
1919

@@ -38,13 +38,13 @@ func Payload2api(p workload.FullPayloadInfo) Payload {
3838
}
3939

4040
// API2Payload converts an API Payload info struct into
41-
// a workload.FullPayloadInfo struct.
42-
func API2Payload(apiInfo Payload) (workload.FullPayloadInfo, error) {
41+
// a payload.FullPayloadInfo struct.
42+
func API2Payload(apiInfo Payload) (payload.FullPayloadInfo, error) {
4343
labels := make([]string, len(apiInfo.Labels))
4444
copy(labels, apiInfo.Labels)
4545

4646
var unit, machine string
47-
var empty workload.FullPayloadInfo
47+
var empty payload.FullPayloadInfo
4848
if apiInfo.Unit != "" {
4949
tag, err := names.ParseUnitTag(apiInfo.Unit)
5050
if err != nil {
@@ -60,8 +60,8 @@ func API2Payload(apiInfo Payload) (workload.FullPayloadInfo, error) {
6060
machine = tag.Id()
6161
}
6262

63-
return workload.FullPayloadInfo{
64-
Payload: workload.Payload{
63+
return payload.FullPayloadInfo{
64+
Payload: payload.Payload{
6565
PayloadClass: charm.PayloadClass{
6666
Name: apiInfo.Class,
6767
Type: apiInfo.Type,

‎workload/api/helpers_test.go renamed to ‎payload/api/helpers_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
gc "gopkg.in/check.v1"
1111
"gopkg.in/juju/charm.v5"
1212

13-
"github.com/juju/juju/workload"
13+
"github.com/juju/juju/payload"
1414
)
1515

1616
type helpersSuite struct {
@@ -20,14 +20,14 @@ type helpersSuite struct {
2020
var _ = gc.Suite(&helpersSuite{})
2121

2222
func (helpersSuite) TestPayload2api(c *gc.C) {
23-
apiPayload := Payload2api(workload.FullPayloadInfo{
24-
Payload: workload.Payload{
23+
apiPayload := Payload2api(payload.FullPayloadInfo{
24+
Payload: payload.Payload{
2525
PayloadClass: charm.PayloadClass{
2626
Name: "spam",
2727
Type: "docker",
2828
},
2929
ID: "idspam",
30-
Status: workload.StateRunning,
30+
Status: payload.StateRunning,
3131
Labels: []string{"a-tag"},
3232
Unit: "a-service/0",
3333
},
@@ -38,33 +38,33 @@ func (helpersSuite) TestPayload2api(c *gc.C) {
3838
Class: "spam",
3939
Type: "docker",
4040
ID: "idspam",
41-
Status: workload.StateRunning,
41+
Status: payload.StateRunning,
4242
Labels: []string{"a-tag"},
4343
Unit: names.NewUnitTag("a-service/0").String(),
4444
Machine: names.NewMachineTag("1").String(),
4545
})
4646
}
4747

4848
func (helpersSuite) TestAPI2Payload(c *gc.C) {
49-
payload, err := API2Payload(Payload{
49+
pl, err := API2Payload(Payload{
5050
Class: "spam",
5151
Type: "docker",
5252
ID: "idspam",
53-
Status: workload.StateRunning,
53+
Status: payload.StateRunning,
5454
Labels: []string{"a-tag"},
5555
Unit: names.NewUnitTag("a-service/0").String(),
5656
Machine: names.NewMachineTag("1").String(),
5757
})
5858
c.Assert(err, jc.ErrorIsNil)
5959

60-
c.Check(payload, jc.DeepEquals, workload.FullPayloadInfo{
61-
Payload: workload.Payload{
60+
c.Check(pl, jc.DeepEquals, payload.FullPayloadInfo{
61+
Payload: payload.Payload{
6262
PayloadClass: charm.PayloadClass{
6363
Name: "spam",
6464
Type: "docker",
6565
},
6666
ID: "idspam",
67-
Status: workload.StateRunning,
67+
Status: payload.StateRunning,
6868
Labels: []string{"a-tag"},
6969
Unit: "a-service/0",
7070
},

‎workload/api/internal/client/client.go renamed to ‎payload/api/internal/client/client.go

File renamed without changes.

‎workload/api/internal/client/package_test.go renamed to ‎payload/api/internal/client/package_test.go

File renamed without changes.

‎workload/api/internal/client/unitfacade.go renamed to ‎payload/api/internal/client/unitfacade.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ package client
66
import (
77
"github.com/juju/errors"
88

9-
"github.com/juju/juju/workload"
10-
"github.com/juju/juju/workload/api/internal"
9+
"github.com/juju/juju/payload"
10+
"github.com/juju/juju/payload/api/internal"
1111
)
1212

1313
type facadeCaller interface {
@@ -26,7 +26,7 @@ func NewUnitFacadeClient(caller facadeCaller) UnitFacadeClient {
2626
}
2727

2828
// Track calls the Track API server method.
29-
func (c UnitFacadeClient) Track(payloads ...workload.Payload) ([]workload.Result, error) {
29+
func (c UnitFacadeClient) Track(payloads ...payload.Payload) ([]payload.Result, error) {
3030
args := internal.Payloads2TrackArgs(payloads)
3131

3232
var rs internal.PayloadResults
@@ -38,7 +38,7 @@ func (c UnitFacadeClient) Track(payloads ...workload.Payload) ([]workload.Result
3838
}
3939

4040
// List calls the List API server method.
41-
func (c UnitFacadeClient) List(fullIDs ...string) ([]workload.Result, error) {
41+
func (c UnitFacadeClient) List(fullIDs ...string) ([]payload.Result, error) {
4242
var ids []string
4343
if len(fullIDs) > 0 {
4444
actual, err := c.lookUp(fullIDs)
@@ -58,7 +58,7 @@ func (c UnitFacadeClient) List(fullIDs ...string) ([]workload.Result, error) {
5858
}
5959

6060
// LookUp calls the LookUp API server method.
61-
func (c UnitFacadeClient) LookUp(fullIDs ...string) ([]workload.Result, error) {
61+
func (c UnitFacadeClient) LookUp(fullIDs ...string) ([]payload.Result, error) {
6262
if len(fullIDs) == 0 {
6363
// Unlike List(), LookUp doesn't fall back to looking up all IDs.
6464
return nil, nil
@@ -74,7 +74,7 @@ func (c UnitFacadeClient) LookUp(fullIDs ...string) ([]workload.Result, error) {
7474
}
7575

7676
// SetStatus calls the SetStatus API server method.
77-
func (c UnitFacadeClient) SetStatus(status string, fullIDs ...string) ([]workload.Result, error) {
77+
func (c UnitFacadeClient) SetStatus(status string, fullIDs ...string) ([]payload.Result, error) {
7878
ids, err := c.lookUp(fullIDs)
7979
if err != nil {
8080
return nil, errors.Trace(err)
@@ -90,7 +90,7 @@ func (c UnitFacadeClient) SetStatus(status string, fullIDs ...string) ([]workloa
9090
}
9191

9292
// Untrack calls the Untrack API server method.
93-
func (c UnitFacadeClient) Untrack(fullIDs ...string) ([]workload.Result, error) {
93+
func (c UnitFacadeClient) Untrack(fullIDs ...string) ([]payload.Result, error) {
9494
logger.Tracef("Calling untrack API: %q", fullIDs)
9595

9696
ids, err := c.lookUp(fullIDs)
@@ -124,8 +124,8 @@ func (c UnitFacadeClient) lookUp(fullIDs []string) ([]string, error) {
124124
return ids, nil
125125
}
126126

127-
func api2results(rs internal.PayloadResults) ([]workload.Result, error) {
128-
var results []workload.Result
127+
func api2results(rs internal.PayloadResults) ([]payload.Result, error) {
128+
var results []payload.Result
129129
for _, r := range rs.Results {
130130
result, err := internal.API2Result(r)
131131
if err != nil {

0 commit comments

Comments
 (0)