@@ -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.
@@ -812,6 +807,12 @@ func (r *Repo) Snapshot() error {
812
807
return r .SnapshotWithExpires (data .DefaultExpires ("snapshot" ))
813
808
}
814
809
810
+ func (r * Repo ) snapshotManifests () []string {
811
+ // Note: root pinning is not supported in Spec 1.0.19.
812
+ // root.json might need to be removed.
813
+ return []string {"root.json" , "targets.json" }
814
+ }
815
+
815
816
func (r * Repo ) SnapshotWithExpires (expires time.Time ) error {
816
817
if ! validExpires (expires ) {
817
818
return ErrInvalidExpires {expires }
@@ -826,12 +827,12 @@ func (r *Repo) SnapshotWithExpires(expires time.Time) error {
826
827
return err
827
828
}
828
829
829
- for _ , name := range snapshotMetadata {
830
- if err := r .verifySignature (name , db ); err != nil {
830
+ for _ , manifestName := range r . snapshotManifests () {
831
+ if err := r .verifySignature (manifestName , db ); err != nil {
831
832
return err
832
833
}
833
834
var err error
834
- snapshot .Meta [name ], err = r .snapshotFileMeta (name )
835
+ snapshot .Meta [manifestName ], err = r .snapshotFileMeta (manifestName )
835
836
if err != nil {
836
837
return err
837
838
}
@@ -958,7 +959,7 @@ func (r *Repo) Commit() error {
958
959
if err != nil {
959
960
return err
960
961
}
961
- for _ , name := range snapshotMetadata {
962
+ for _ , name := range r . snapshotManifests () {
962
963
expected , ok := snapshot .Meta [name ]
963
964
if ! ok {
964
965
return fmt .Errorf ("tuf: snapshot.json missing hash for %s" , name )
0 commit comments