Skip to content

Commit 67425b1

Browse files
ericsnowcurrentlyericsnowcurrently
committed
st -> db.
1 parent b92d019 commit 67425b1

File tree

6 files changed

+31
-34
lines changed

6 files changed

+31
-34
lines changed

‎component/all/payload.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@ func (payloads) registerState() {
205205
return payloadstate.NewUnitPayloads(persist, unit, machine), nil
206206
}
207207

208-
newEnvPayloads := func(persist state.PayloadsEnvPersistence) (state.EnvPayloads, error) {
209-
envPersist := persistence.NewEnvPersistence(persist)
208+
newEnvPayloads := func(db state.Persistence, persist state.PayloadsEnvPersistence) (state.EnvPayloads, error) {
209+
envPersist := persistence.NewEnvPersistence(db, persist)
210210
envPayloads := payloadstate.EnvPayloads{
211211
Persist: envPersist,
212212
}

‎payload/persistence/env.go

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@ import (
99
"github.com/juju/juju/payload"
1010
)
1111

12-
// EnvPersistenceBase provides all the information needed to produce
12+
// EnvPersistenceEntities provides all the information needed to produce
1313
// a new EnvPersistence value.
14-
type EnvPersistenceBase interface {
15-
PersistenceBase
16-
14+
type EnvPersistenceEntities interface {
1715
// Machines builds the list of the names that identify
1816
// all machines in State.
1917
Machines() ([]string, error)
@@ -33,41 +31,39 @@ type unitPersistence interface {
3331
// EnvPersistence provides the persistence functionality for the
3432
// Juju environment as a whole.
3533
type EnvPersistence struct {
36-
base EnvPersistenceBase
34+
st EnvPersistenceEntities
3735

38-
newUnitPersist func(base PersistenceBase, name string) unitPersistence
36+
newUnitPersist func(name string) unitPersistence
3937
}
4038

41-
// NewEnvPersistence wraps the base in a new EnvPersistence.
42-
func NewEnvPersistence(base EnvPersistenceBase) *EnvPersistence {
39+
// NewEnvPersistence wraps the "db" in a new EnvPersistence.
40+
func NewEnvPersistence(db PersistenceBase, st EnvPersistenceEntities) *EnvPersistence {
4341
return &EnvPersistence{
44-
base: base,
45-
newUnitPersist: newUnitPersistence,
42+
st: st,
43+
newUnitPersist: func(name string) unitPersistence {
44+
return NewPersistence(db, name)
45+
},
4646
}
4747
}
4848

49-
func newUnitPersistence(base PersistenceBase, unit string) unitPersistence {
50-
return NewPersistence(base, unit)
51-
}
52-
5349
// ListAll returns the list of all payloads in the environment.
5450
func (ep *EnvPersistence) ListAll() ([]payload.FullPayloadInfo, error) {
5551
logger.Tracef("listing all payloads")
5652

57-
machines, err := ep.base.Machines()
53+
machines, err := ep.st.Machines()
5854
if err != nil {
5955
return nil, errors.Trace(err)
6056
}
6157

6258
var payloads []payload.FullPayloadInfo
6359
for _, machine := range machines {
64-
units, err := ep.base.MachineUnits(machine)
60+
units, err := ep.st.MachineUnits(machine)
6561
if err != nil {
6662
return nil, errors.Trace(err)
6763
}
6864

6965
for _, unit := range units {
70-
persist := ep.newUnitPersist(ep.base, unit)
66+
persist := ep.newUnitPersist(unit)
7167

7268
unitPayloads, err := listUnit(persist, unit, machine)
7369
if err != nil {

‎payload/persistence/env_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ func (s *envPersistenceSuite) TestListAllOkay(c *gc.C) {
5656
p2 := s.newPayload("eggs")
5757
s.base.setPayloads(p1, p2)
5858

59-
persist := NewEnvPersistence(s.base)
59+
persist := NewEnvPersistence(s.base, s.base)
6060
persist.newUnitPersist = s.base.newUnitPersistence
6161

6262
payloads, err := persist.ListAll()
@@ -83,7 +83,7 @@ func (s *envPersistenceSuite) TestListAllOkay(c *gc.C) {
8383
func (s *envPersistenceSuite) TestListAllEmpty(c *gc.C) {
8484
s.base.setUnits("0")
8585
s.base.setUnits("1", "a-service/0", "a-service/1")
86-
persist := NewEnvPersistence(s.base)
86+
persist := NewEnvPersistence(s.base, s.base)
8787
persist.newUnitPersist = s.base.newUnitPersistence
8888

8989
payloads, err := persist.ListAll()
@@ -107,7 +107,7 @@ func (s *envPersistenceSuite) TestListAllFailed(c *gc.C) {
107107
failure := errors.Errorf("<failed!>")
108108
s.Stub.SetErrors(failure)
109109

110-
persist := NewEnvPersistence(s.base)
110+
persist := NewEnvPersistence(s.base, s.base)
111111
persist.newUnitPersist = s.base.newUnitPersistence
112112

113113
_, err := persist.ListAll()
@@ -190,8 +190,8 @@ func (s *stubEnvPersistenceBase) setUnits(machine string, units ...string) {
190190
}
191191
}
192192

193-
func (s *stubEnvPersistenceBase) newUnitPersistence(base PersistenceBase, unit string) unitPersistence {
194-
s.stub.AddCall("newUnitPersistence", base, unit)
193+
func (s *stubEnvPersistenceBase) newUnitPersistence(unit string) unitPersistence {
194+
s.stub.AddCall("newUnitPersistence", unit)
195195
s.stub.NextErr() // pop one off
196196

197197
persist, ok := s.unitPersists[unit]

‎payload/persistence/mongo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func (pp Persistence) extractPayload(id string, payloadDocs map[string]payloadDo
3030
}
3131

3232
func (pp Persistence) all(query bson.D, docs interface{}) error {
33-
return errors.Trace(pp.st.All(payloadsC, query, docs))
33+
return errors.Trace(pp.db.All(payloadsC, query, docs))
3434
}
3535

3636
func (pp Persistence) allID(query bson.D, docs interface{}) error {

‎payload/persistence/unit.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ type PersistenceBase interface {
3838
// Persistence exposes the high-level persistence functionality
3939
// related to payloads in Juju.
4040
type Persistence struct {
41-
st PersistenceBase
41+
db PersistenceBase
4242
unit string
4343
}
4444

4545
// NewPersistence builds a new Persistence based on the provided info.
46-
func NewPersistence(st PersistenceBase, unit string) *Persistence {
46+
func NewPersistence(db PersistenceBase, unit string) *Persistence {
4747
return &Persistence{
48-
st: st,
48+
db: db,
4949
unit: unit,
5050
}
5151
}
@@ -83,7 +83,7 @@ func (pp Persistence) Track(id string, pl payload.Payload) error {
8383
}
8484
return ops, nil
8585
}
86-
if err := pp.st.Run(buildTxn); err != nil {
86+
if err := pp.db.Run(buildTxn); err != nil {
8787
return errors.Trace(err)
8888
}
8989
return nil
@@ -112,7 +112,7 @@ func (pp Persistence) SetStatus(id, status string) error {
112112
ops = append(ops, pp.newSetRawStatusOps(name, id, status)...)
113113
return ops, nil
114114
}
115-
if err := pp.st.Run(buildTxn); err != nil {
115+
if err := pp.db.Run(buildTxn); err != nil {
116116
return errors.Trace(err)
117117
}
118118
return nil
@@ -204,7 +204,7 @@ func (pp Persistence) Untrack(id string) error {
204204
ops = append(ops, pp.newRemovePayloadOps(name, id)...)
205205
return ops, nil
206206
}
207-
if err := pp.st.Run(buildTxn); err != nil {
207+
if err := pp.db.Run(buildTxn); err != nil {
208208
return errors.Trace(err)
209209
}
210210
return nil

‎state/payloads.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ type PayloadsEnvPersistence interface {
6161
MachineUnits(machineName string) ([]string, error)
6262
}
6363

64-
type newEnvPayloadsFunc func(PayloadsEnvPersistence) (EnvPayloads, error)
64+
type newEnvPayloadsFunc func(Persistence, PayloadsEnvPersistence) (EnvPayloads, error)
6565
type newUnitPayloadsFunc func(persist Persistence, unit, machine string) (UnitPayloads, error)
6666

6767
// TODO(ericsnow) Merge the 2 vars
@@ -83,11 +83,12 @@ func (st *State) EnvPayloads() (EnvPayloads, error) {
8383
return nil, errors.Errorf("payloads not supported")
8484
}
8585

86+
db := st.newPersistence()
8687
persist := &payloadsEnvPersistence{
87-
Persistence: st.newPersistence(),
88+
Persistence: db,
8889
st: st,
8990
}
90-
envPayloads, err := newEnvPayloads(persist)
91+
envPayloads, err := newEnvPayloads(db, persist)
9192
if err != nil {
9293
return nil, errors.Trace(err)
9394
}

0 commit comments

Comments
 (0)