sif: satisfy linter

Signed-off-by: Yannick Cote <ycote@redhat.com>

sif/internal/sif_util.go

@@ -14,9 +14,7 @@ import (
 	"strings"
 
 	"github.com/containers/image/v5/sif/sif"
-	"github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
-	uuid "github.com/satori/go.uuid"
 
 	imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
 )
@@ -31,7 +29,6 @@ type SifImage struct {
 	env       *sif.Descriptor
 	envReader *io.SectionReader
 	envlist   []string
-	diffID    digest.Digest
 }
 
 func LoadSIFImage(path string) (image SifImage, err error) {
@@ -154,7 +151,9 @@ func (image *SifImage) generateConfig() error {
 	if len(image.cmdlist) == 0 && len(image.envlist) == 0 {
 		image.cmdlist = append(image.cmdlist, "bash")
 	} else {
-		image.generateRunscript()
+		if err = image.generateRunscript(); err != nil {
+			return errors.Wrap(err, "generating runscript")
+		}
 		image.cmdlist = []string{"/podman/runscript"}
 	}
 
@@ -237,20 +236,3 @@ func (image SifImage) SquashFSToTarLayer(tempdir string) (tarpath string, err er
 	}
 	return filepath.Join(tempdir, tarFilename), nil
 }
-
-func createSIF() error {
-	cinfo := sif.CreateInfo{
-		Pathname:   "container.sif",
-		Launchstr:  sif.HdrLaunch,
-		Sifversion: sif.HdrVersion,
-		ID:         uuid.NewV4(),
-	}
-
-	image, err := sif.CreateContainer(cinfo)
-	if err != nil {
-		return err
-	}
-	fmt.Printf("SIF: %+v\n", image)
-
-	return nil
-}

sif/sif/create.go

@@ -159,11 +159,11 @@ func createDescriptor(fimg *FileImage, input DescriptorInput) (err error) {
 
 	// look for a free entry in the descriptor table
 	for idx, v = range fimg.DescrArr {
-		if v.Used == false {
+		if !v.Used {
 			break
 		}
 	}
-	if int64(idx) == fimg.Header.Dtotal-1 && fimg.DescrArr[idx].Used == true {
+	if int64(idx) == fimg.Header.Dtotal-1 && fimg.DescrArr[idx].Used {
 		return fmt.Errorf("no descriptor table free entry, warning: header.Dfree was > 0")
 	}
 
@@ -349,11 +349,7 @@ func (fimg *FileImage) AddObject(input DescriptorInput) error {
 
 // descrIsLast return true if passed descriptor's object is the last in a SIF file
 func objectIsLast(fimg *FileImage, descr *Descriptor) bool {
-	if fimg.Filesize == descr.Fileoff+descr.Filelen {
-		return true
-	}
-
-	return false
+	return fimg.Filesize == descr.Fileoff+descr.Filelen
 }
 
 // compactAtDescr joins data objects leading and following "descr" by compacting a SIF file
@@ -361,7 +357,7 @@ func compactAtDescr(fimg *FileImage, descr *Descriptor) error {
 	var prev Descriptor
 
 	for _, v := range fimg.DescrArr {
-		if v.Used == false || v.ID == descr.ID {
+		if !v.Used || v.ID == descr.ID {
 			continue
 		} else {
 			if v.Fileoff > prev.Fileoff {
@@ -370,7 +366,7 @@ func compactAtDescr(fimg *FileImage, descr *Descriptor) error {
 		}
 	}
 	// make sure it's not the only used descriptor first
-	if prev.Used == true {
+	if prev.Used {
 		if err := fimg.Fp.Truncate(prev.Fileoff + prev.Filelen); err != nil {
 			return err
 		}

sif/sif/load.go

@@ -79,7 +79,7 @@ func (fimg *FileImage) mapFile(rdonly bool) error {
 		return fmt.Errorf("file is to big to be mapped")
 	}
 
-	if rdonly == false {
+	if !rdonly {
 		prot = syscall.PROT_WRITE
 		flags = syscall.MAP_SHARED
 	}
@@ -110,7 +110,7 @@ func (fimg *FileImage) mapFile(rdonly bool) error {
 }
 
 func (fimg *FileImage) unmapFile() error {
-	if fimg.Amodebuf == true {
+	if fimg.Amodebuf {
 		return nil
 	}
 	if err := syscall.Munmap(fimg.Filedata); err != nil {
@@ -207,7 +207,7 @@ func LoadContainerReader(b *bytes.Reader) (fimg FileImage, err error) {
 
 	// in the case where the reader buffer doesn't include descriptor data, we
 	// don't return an error and DescrArr will be set to nil
-	readDescriptors(&fimg)
+	_ = readDescriptors(&fimg)
 
 	return fimg, nil
 }

sif/sif/lookup.go

@@ -85,7 +85,7 @@ func (fimg *FileImage) GetFromDescrID(id uint32) (*Descriptor, int, error) {
 	var match = -1
 
 	for i, v := range fimg.DescrArr {
-		if v.Used == false {
+		if !v.Used {
 			continue
 		} else {
 			if v.ID == id {
@@ -111,7 +111,7 @@ func (fimg *FileImage) GetPartFromGroup(groupid uint32) ([]*Descriptor, []int, e
 	var count int
 
 	for i, v := range fimg.DescrArr {
-		if v.Used == false {
+		if !v.Used {
 			continue
 		} else {
 			if v.Datatype == DataPartition && v.Groupid == groupid {
@@ -136,7 +136,7 @@ func (fimg *FileImage) GetSignFromGroup(groupid uint32) ([]*Descriptor, []int, e
 	var count int
 
 	for i, v := range fimg.DescrArr {
-		if v.Used == false {
+		if !v.Used {
 			continue
 		} else {
 			if v.Datatype == DataSignature && v.Groupid == groupid {
@@ -161,7 +161,7 @@ func (fimg *FileImage) GetFromLinkedDescr(ID uint32) ([]*Descriptor, []int, erro
 	var count int
 
 	for i, v := range fimg.DescrArr {
-		if v.Used == false {
+		if !v.Used {
 			continue
 		} else {
 			if v.Link == ID {
@@ -186,7 +186,7 @@ func (fimg *FileImage) GetFromDescr(descr Descriptor) ([]*Descriptor, []int, err
 	var count int
 
 	for i, v := range fimg.DescrArr {
-		if v.Used == false {
+		if !v.Used {
 			continue
 		} else {
 			if descr.Datatype != 0 && descr.Datatype != v.Datatype {
@@ -245,8 +245,11 @@ func (fimg *FileImage) GetFromDescr(descr Descriptor) ([]*Descriptor, []int, err
 
 // GetData return a memory mapped byte slice mirroring the data object in a SIF file.
 func (descr *Descriptor) GetData(fimg *FileImage) []byte {
-	if fimg.Amodebuf == true {
-		fimg.Fp.Seek(descr.Fileoff, 0)
+	if fimg.Amodebuf {
+		_, err := fimg.Fp.Seek(descr.Fileoff, 0)
+		if err != nil {
+			return nil
+		}
 		data := make([]byte, descr.Filelen)
 		if n, _ := fimg.Fp.Read(data); int64(n) != descr.Filelen {
 			return nil
@@ -354,7 +357,7 @@ func (fimg *FileImage) GetPartPrimSys() (*Descriptor, int, error) {
 	index := -1
 
 	for i, v := range fimg.DescrArr {
-		if v.Used == false {
+		if !v.Used {
 			continue
 		} else {
 			if v.Datatype == DataPartition {

sif/sif_transport.go

@@ -63,7 +63,7 @@ func (ref sifReference) Transport() types.ImageTransport {
 // StringWithinTransport returns a string representation of the reference, which MUST be such that
 // reference.Transport().ParseReference(reference.StringWithinTransport()) returns an equivalent reference.
 func (ref sifReference) StringWithinTransport() string {
-	return fmt.Sprintf("%s", ref.file)
+	return ref.file
 }
 
 // DockerReference returns a Docker reference associated with this reference