@@ -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.
@@ -830,6 +825,12 @@ func (r *Repo) Snapshot() error {
830
825
return r .SnapshotWithExpires (data .DefaultExpires ("snapshot" ))
831
826
}
832
827
828
+ func (r * Repo ) snapshotManifests () []string {
829
+ // Note: root pinning is not supported in Spec 1.0.19.
830
+ // root.json might need to be removed.
831
+ return []string {"root.json" , "targets.json" }
832
+ }
833
+
833
834
func (r * Repo ) SnapshotWithExpires (expires time.Time ) error {
834
835
if ! validExpires (expires ) {
835
836
return ErrInvalidExpires {expires }
@@ -844,12 +845,12 @@ func (r *Repo) SnapshotWithExpires(expires time.Time) error {
844
845
return err
845
846
}
846
847
847
- for _ , name := range snapshotMetadata {
848
- if err := r .verifySignature (name , db ); err != nil {
848
+ for _ , manifestName := range r . snapshotManifests () {
849
+ if err := r .verifySignature (manifestName , db ); err != nil {
849
850
return err
850
851
}
851
852
var err error
852
- snapshot .Meta [name ], err = r .snapshotFileMeta (name )
853
+ snapshot .Meta [manifestName ], err = r .snapshotFileMeta (manifestName )
853
854
if err != nil {
854
855
return err
855
856
}
@@ -974,7 +975,7 @@ func (r *Repo) Commit() error {
974
975
if err != nil {
975
976
return err
976
977
}
977
- for _ , name := range snapshotMetadata {
978
+ for _ , name := range r . snapshotManifests () {
978
979
expected , ok := snapshot .Meta [name ]
979
980
if ! ok {
980
981
return fmt .Errorf ("tuf: snapshot.json missing hash for %s" , name )
0 commit comments