docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use constant for targets role 

Signed-off-by: Hu Keping <hukeping@huawei.com>
This commit is contained in:
HuKeping 2016-03-28 23:41:46 +08:00
parent 67b0ec3771
commit ddff581bd8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/client.go
View File

@ -341,7 +341,7 @@ func addChange(cl *changelist.FileChangelist, c changelist.Change, roles ...stri
// AddTarget creates new changelist entries to add a target to the given roles // AddTarget creates new changelist entries to add a target to the given roles
// in the repository when the changelist gets applied at publish time. // in the repository when the changelist gets applied at publish time.
// If roles are unspecified, the default role is "targets". // If roles are unspecified, the default role is "targets"
func (r *NotaryRepository) AddTarget(target *Target, roles ...string) error { func (r *NotaryRepository) AddTarget(target *Target, roles ...string) error {
cl, err := changelist.NewFileChangelist(filepath.Join(r.tufRepoPath, "changelist")) cl, err := changelist.NewFileChangelist(filepath.Join(r.tufRepoPath, "changelist"))
@ -672,7 +672,7 @@ func (r *NotaryRepository) bootstrapRepo() error {
if err != nil { if err != nil {
return err return err
} }
targetsJSON, err := r.fileStore.GetMeta("targets", -1) targetsJSON, err := r.fileStore.GetMeta(data.CanonicalTargetsRole, -1)
if err != nil { if err != nil {
return err return err
} }
@ -681,7 +681,7 @@ func (r *NotaryRepository) bootstrapRepo() error {
if err != nil { if err != nil {
return err return err
} }
tufRepo.SetTargets("targets", targets) tufRepo.SetTargets(data.CanonicalTargetsRole, targets)
snapshotJSON, err := r.fileStore.GetMeta(data.CanonicalSnapshotRole, -1) snapshotJSON, err := r.fileStore.GetMeta(data.CanonicalSnapshotRole, -1)
if err == nil { if err == nil {
@ -714,7 +714,7 @@ func (r *NotaryRepository) saveMetadata(ignoreSnapshot bool) error {
targetsToSave := make(map[string][]byte) targetsToSave := make(map[string][]byte)
for t := range r.tufRepo.Targets { for t := range r.tufRepo.Targets {
signedTargets, err := r.tufRepo.SignTargets(t, data.DefaultExpires("targets")) signedTargets, err := r.tufRepo.SignTargets(t, data.DefaultExpires(data.CanonicalTargetsRole))
if err != nil { if err != nil {
return err return err
} }

2
tuf/client/client.go
View File

@ -75,7 +75,7 @@ func (c *Client) update() error {
return err return err
} }
// will always need top level targets at a minimum // will always need top level targets at a minimum
err = c.downloadTargets("targets") err = c.downloadTargets(data.CanonicalTargetsRole)
if err != nil { if err != nil {
logrus.Debugf("Client Update (Targets): %s", err.Error()) logrus.Debugf("Client Update (Targets): %s", err.Error())
return err return err