Merge pull request #272 from tri-adam/set-prim-fix

fix: set descriptor timestamp(s) in SetPrimPart
sylabs · Mar 9, 2023 · 868c239 · 868c239
2 parents 5a9464b + 3d0d786
commit 868c239
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 # LICENSE
 
-Copyright (c) 2018-2022, Sylabs Inc. All rights reserved.
+Copyright (c) 2018-2023, Sylabs Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

diff --git a/pkg/sif/create.go b/pkg/sif/create.go
@@ -636,9 +636,6 @@ func (f *FileImage) SetPrimPart(id uint32, opts ...SetOpt) error {
 	if err != nil && !errors.Is(err, ErrObjectNotFound) {
 		return fmt.Errorf("%w", err)
 	}
-
-	f.h.Arch = getSIFArch(arch)
-
 	extra := partition{
 		Fstype:   fs,
 		Parttype: PartPrimSys,
@@ -649,6 +646,8 @@ func (f *FileImage) SetPrimPart(id uint32, opts ...SetOpt) error {
 		return fmt.Errorf("%w", err)
 	}
 
+	descr.ModifiedAt = so.t.Unix()
+
 	if olddescr != nil {
 		oldfs, _, oldarch, err := olddescr.getPartitionMetadata()
 		if err != nil {
@@ -664,12 +663,15 @@ func (f *FileImage) SetPrimPart(id uint32, opts ...SetOpt) error {
 		if err := olddescr.setExtra(oldextra); err != nil {
 			return fmt.Errorf("%w", err)
 		}
+
+		olddescr.ModifiedAt = so.t.Unix()
 	}
 
 	if err := f.writeDescriptors(); err != nil {
 		return fmt.Errorf("%w", err)
 	}
 
+	f.h.Arch = getSIFArch(arch)
 	f.h.ModifiedAt = so.t.Unix()
 
 	if err := f.writeHeader(); err != nil {

diff --git a/pkg/sif/create_test.go b/pkg/sif/create_test.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021, Sylabs Inc. All rights reserved.
+// Copyright (c) 2018-2023, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -326,7 +326,6 @@ func TestAddObject(t *testing.T) {
 			},
 			di: getDescriptorInput(t, DataGeneric, []byte{0xfa, 0xce}),
 			opts: []AddOpt{
-				OptAddDeterministic(),
 				OptAddWithTime(time.Unix(946702800, 0)),
 			},
 		},
@@ -505,7 +504,6 @@ func TestDeleteObject(t *testing.T) {
 			},
 			id: 1,
 			opts: []DeleteOpt{
-				OptDeleteDeterministic(),
 				OptDeleteWithTime(time.Unix(946702800, 0)),
 			},
 		},
@@ -571,13 +569,15 @@ func TestSetPrimPart(t *testing.T) {
 				OptCreateDeterministic(),
 				OptCreateWithDescriptors(
 					getDescriptorInput(t, DataPartition, []byte{0xfa, 0xce},
-						OptPartitionMetadata(FsRaw, PartSystem, "386"),
+						OptPartitionMetadata(FsRaw, PartPrimSys, "386"),
+					),
+					getDescriptorInput(t, DataPartition, []byte{0xfe, 0xed},
+						OptPartitionMetadata(FsRaw, PartSystem, "amd64"),
 					),
 				),
 			},
-			id: 1,
+			id: 2,
 			opts: []SetOpt{
-				OptSetDeterministic(),
 				OptSetWithTime(time.Unix(946702800, 0)),
 			},
 		},

diff --git a/pkg/sif/testdata/TestSetPrimPart/WithTime.golden b/pkg/sif/testdata/TestSetPrimPart/WithTime.golden