@@ -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.
@@ -792,6 +787,12 @@ func (r *Repo) Snapshot() error {
792
787
return r .SnapshotWithExpires (data .DefaultExpires ("snapshot" ))
793
788
}
794
789
790
+ func (r * Repo ) snapshotManifests () []string {
791
+ // Note: root pinning is not supported in Spec 1.0.19.
792
+ // root.json might need to be removed.
793
+ return []string {"root.json" , "targets.json" }
794
+ }
795
+
795
796
func (r * Repo ) SnapshotWithExpires (expires time.Time ) error {
796
797
if ! validExpires (expires ) {
797
798
return ErrInvalidExpires {expires }
@@ -806,12 +807,12 @@ func (r *Repo) SnapshotWithExpires(expires time.Time) error {
806
807
return err
807
808
}
808
809
809
- for _ , name := range snapshotMetadata {
810
- if err := r .verifySignature (name , db ); err != nil {
810
+ for _ , manifestName := range r . snapshotManifests () {
811
+ if err := r .verifySignature (manifestName , db ); err != nil {
811
812
return err
812
813
}
813
814
var err error
814
- snapshot .Meta [name ], err = r .snapshotFileMeta (name )
815
+ snapshot .Meta [manifestName ], err = r .snapshotFileMeta (manifestName )
815
816
if err != nil {
816
817
return err
817
818
}
@@ -936,7 +937,7 @@ func (r *Repo) Commit() error {
936
937
if err != nil {
937
938
return err
938
939
}
939
- for _ , name := range snapshotMetadata {
940
+ for _ , name := range r . snapshotManifests () {
940
941
expected , ok := snapshot .Meta [name ]
941
942
if ! ok {
942
943
return fmt .Errorf ("tuf: snapshot.json missing hash for %s" , name )
0 commit comments