@@ -28,11 +28,6 @@ var topLevelMetadata = []string{
28
28
"timestamp.json" ,
29
29
}
30
30
31
- var snapshotMetadata = []string {
32
- "root.json" ,
33
- "targets.json" ,
34
- }
35
-
36
31
// TargetsWalkFunc is a function of a target path name and a target payload used to
37
32
// execute some function on each staged target file. For example, it may normalize path
38
33
// names and generate target file metadata with additional custom metadata.
@@ -803,6 +798,12 @@ func (r *Repo) Snapshot() error {
803
798
return r .SnapshotWithExpires (data .DefaultExpires ("snapshot" ))
804
799
}
805
800
801
+ func (r * Repo ) snapshotManifests () []string {
802
+ // Note: root pinning is not supported in Spec 1.0.19.
803
+ // root.json might need to be removed.
804
+ return []string {"root.json" , "targets.json" }
805
+ }
806
+
806
807
func (r * Repo ) SnapshotWithExpires (expires time.Time ) error {
807
808
if ! validExpires (expires ) {
808
809
return ErrInvalidExpires {expires }
@@ -817,12 +818,12 @@ func (r *Repo) SnapshotWithExpires(expires time.Time) error {
817
818
return err
818
819
}
819
820
820
- for _ , name := range snapshotMetadata {
821
- if err := r .verifySignature (name , db ); err != nil {
821
+ for _ , manifestName := range r . snapshotManifests () {
822
+ if err := r .verifySignature (manifestName , db ); err != nil {
822
823
return err
823
824
}
824
825
var err error
825
- snapshot .Meta [name ], err = r .snapshotFileMeta (name )
826
+ snapshot .Meta [manifestName ], err = r .snapshotFileMeta (manifestName )
826
827
if err != nil {
827
828
return err
828
829
}
@@ -949,7 +950,7 @@ func (r *Repo) Commit() error {
949
950
if err != nil {
950
951
return err
951
952
}
952
- for _ , name := range snapshotMetadata {
953
+ for _ , name := range r . snapshotManifests () {
953
954
expected , ok := snapshot .Meta [name ]
954
955
if ! ok {
955
956
return fmt .Errorf ("tuf: snapshot.json missing hash for %s" , name )
0 commit comments