Merge pull request from guillaumerose/refactor1

machine: compute sha256 as we are reading the file
This commit is contained in:
OpenShift Merge Robot
2021-08-19 14:50:26 -04:00
committed by GitHub

@ -3,14 +3,14 @@
package machine package machine
import ( import (
"crypto/sha256"
"io/ioutil"
url2 "net/url" url2 "net/url"
"os"
"path/filepath" "path/filepath"
"runtime" "runtime"
"strings" "strings"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/sirupsen/logrus"
) )
// These should eventually be moved into machine/qemu as // These should eventually be moved into machine/qemu as
@ -91,24 +91,23 @@ func UpdateAvailable(d *Download) (bool, error) {
// check the sha of the local image if it exists // check the sha of the local image if it exists
// get the sha of the remote image // get the sha of the remote image
// == dont bother to pull // == dont bother to pull
files, err := ioutil.ReadDir(filepath.Dir(d.LocalPath)) if _, err := os.Stat(d.LocalPath); os.IsNotExist(err) {
if err != nil {
return false, err
}
for _, file := range files {
if filepath.Base(d.LocalPath) == file.Name() {
b, err := ioutil.ReadFile(d.LocalPath)
if err != nil {
return false, err
}
s := sha256.Sum256(b)
sum := digest.NewDigestFromBytes(digest.SHA256, s[:])
if sum.Encoded() == d.Sha256sum {
return true, nil
}
}
}
return false, nil return false, nil
}
fd, err := os.Open(d.LocalPath)
if err != nil {
return false, err
}
defer func() {
if err := fd.Close(); err != nil {
logrus.Error(err)
}
}()
sum, err := digest.SHA256.FromReader(fd)
if err != nil {
return false, err
}
return sum.Encoded() == d.Sha256sum, nil
} }
func getFcosArch() string { func getFcosArch() string {