← Back to branch summary

~axwalk/juju-core/trunk

« back to all changes in this revision

Viewing changes to state/apiserver/upgrader/upgrader.go

  • Committer: Tarmac
  • Author(s): Dimiter Naydenov
  • Date: 2013-07-30 18:39:16 UTC
  • mfrom: (1548.3.8 081-common-names)
  • Revision ID: tarmac-20130730183916-t2lui5ndotkzqrth
[r=dimitern] names: New package

This introduces a new juju-core/names pacakge,
which contains all name and tag related functions
shared between state and API: IsUnitName, UnitTag,
UnitNameFromTag, MachineTag, MachineIdFromTag,
IsServiceName, etc.

Because of the pacakge name, some functions were
renamed: names.IsUnit, IsService, UnitFromTag,
all refer to names.

In addition, a change was made to these two
functions: UnitNameFromTag and MachineIdFromTag.
Both of them now return (string, error), rather
than just string. The error return is used in
case the passed tag string has an invalid format.
Because of this change, some places needed slight
refactoring, otherwise no other changes where made.

https://codereview.appspot.com/12034043/

R=fwereade, rogpeppe

Show diffs side-by-side

added added

removed removed

Lines of Context:
state/apiserver/upgrader/upgrader.go
8
8
 
9
9
        "launchpad.net/juju-core/agent/tools"
10
10
        "launchpad.net/juju-core/environs"
 
11
        "launchpad.net/juju-core/names"
11
12
        "launchpad.net/juju-core/state"
12
13
        "launchpad.net/juju-core/state/api/params"
13
14
        "launchpad.net/juju-core/state/apiserver/common"
65
66
        if !u.authorizer.AuthOwner(entity.Tag) {
66
67
                return nil, common.ErrPerm
67
68
        }
68
 
        machine, err := u.st.Machine(state.MachineIdFromTag(entity.Tag))
 
69
        id, err := names.MachineFromTag(entity.Tag)
 
70
        if err != nil {
 
71
                return nil, err
 
72
        }
 
73
        machine, err := u.st.Machine(id)
69
74
        if err != nil {
70
75
                return nil, err
71
76
        }