Skip to content

chore(deps): update dependency codespell to v2.4.2 #331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pohanhuang merged 2 commits into from
Apr 6, 2026
Merged

chore(deps): update dependency codespell to v2.4.2 #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c325db
Update dependency codespell to v2.4.2
renovate-rancher[bot] Mar 11, 2026
09b931f
chore: use containerd to replace docker/docker to avoid cve
pohanhuang Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions cvetools/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"strings"
"time"

"github.com/docker/docker/errdefs"
"github.com/containerd/errdefs"
goDigest "github.com/opencontainers/go-digest"
log "github.com/sirupsen/logrus"

Expand All @@ -28,7 +28,7 @@ import (
)

const (
//max package file size
// max package file size
manifestJson = "manifest.json"
layerJson = "/json"
dockerfile = "root/buildinfo/Dockerfile-"
Expand Down Expand Up @@ -85,8 +85,8 @@ func (s *ScanTools) GetLocalImageMeta(ctx context.Context, repository, tag strin
}

func (s *ScanTools) LoadLocalImage(ctx context.Context, repository, tag, imgPath string, cacher *ImageLayerCacher) (
map[string]*LayerRecord, *scan.ImageInfo, []string, share.ScanErrorCode) {

map[string]*LayerRecord, *scan.ImageInfo, []string, share.ScanErrorCode,
) {
sock, repo := parseSocketFromRepo(repository)
if sock == "" {
sock = s.RtSock
Expand Down Expand Up @@ -131,15 +131,15 @@ func (s *ScanTools) LoadLocalImage(ctx context.Context, repository, tag, imgPath

// create an image file and image layered folders
repoFolder := filepath.Join(imgPath, "repo")
if err := os.MkdirAll(repoFolder, 0755); err != nil {
if err := os.MkdirAll(repoFolder, 0o755); err != nil {
log.WithFields(log.Fields{"error": err}).Error()
return nil, nil, nil, share.ScanErrorCode_ScanErrContainerAPI
}
defer os.RemoveAll(repoFolder)

// save the image
imageFile := filepath.Join(repoFolder, "image.tar")
out, err := os.OpenFile(imageFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0755)
out, err := os.OpenFile(imageFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0o755)
if err == nil {
_, err = io.Copy(out, file)
out.Close()
Expand All @@ -157,7 +157,7 @@ func (s *ScanTools) LoadLocalImage(ctx context.Context, repository, tag, imgPath
return nil, nil, nil, share.ScanErrorCode_ScanErrPackage
}

//log.WithFields(log.Fields{"layers": layers, "blobs": blobs}).Debug()
// log.WithFields(log.Fields{"layers": layers, "blobs": blobs}).Debug()

var downloads []string // download layer requests
cacheLayers := make(map[string]*LayerRecord)
Expand Down Expand Up @@ -333,7 +333,7 @@ func getImageLayers(tmpDir string, imageTar string) ([]string, map[string]string
}
defer reader.Close()

//get the manifest from the image tar
// get the manifest from the image tar
filenames := []string{manifestJson, layerJson, ociLayout}
files, err := tarutil.ExtractFiles(bufio.NewReader(reader), filenames)
if err != nil {
Expand All @@ -356,7 +356,7 @@ func getImageLayers(tmpDir string, imageTar string) ([]string, map[string]string
}
}

//extract all the layers to tar files
// extract all the layers to tar files
if _, err := reader.Seek(0, 0); err != nil {
log.WithFields(log.Fields{"error": err}).Error()
}
Expand All @@ -369,7 +369,6 @@ func getImageLayers(tmpDir string, imageTar string) ([]string, map[string]string
}
return false
}, tmpDir)

if err != nil {
return nil, nil, err
}
Expand Down Expand Up @@ -434,8 +433,8 @@ func getImageLayerIterate(
return nil, share.ScanErrorCode_ScanErrFileSystem
}

//for registry, download all the layers.
//for read all the layers.
// for registry, download all the layers.
// for read all the layers.
for _, layer := range layers {
log.WithFields(log.Fields{"layer": layer}).Debug()

Expand Down Expand Up @@ -466,7 +465,6 @@ func getImageLayerIterate(
}
return false
})

if err != nil {
return nil, share.ScanErrorCode_ScanErrPackage
}
Expand Down Expand Up @@ -556,8 +554,8 @@ func sortLayersBySize(layerMap map[string]int64) []layerSize {
const downloadThrottlingVolume = 400 * 1024 * 1024 // the average could be around this level, decompressed size could be 4x more

func downloadLayers(ctx context.Context, layers []string, sizes map[string]int64, imgPath string,
layerReader func(ctx context.Context, layer string) (interface{}, int64, error)) (map[string]*downloadLayerResult, error) {

layerReader func(ctx context.Context, layer string) (interface{}, int64, error),
) (map[string]*downloadLayerResult, error) {
bHasSizeInfo := (len(sizes) > 0) // sizes data is from schema v2
results := make(map[string]*downloadLayerResult)

Expand Down Expand Up @@ -607,9 +605,9 @@ func downloadLayers(ctx context.Context, layers []string, sizes map[string]int64

layerPath := filepath.Join(imgPath, ml)
if bHasSizeInfo && sl == 0 {
//log.WithFields(log.Fields{"layer": ml}).Debug("skip")
// log.WithFields(log.Fields{"layer": ml}).Debug("skip")
// empty folder
if err := os.MkdirAll(layerPath, 0755); err != nil {
if err := os.MkdirAll(layerPath, 0o755); err != nil {
log.WithFields(log.Fields{"error": err}).Error()
}
done <- &downloadLayerResult{layer: ml, err: nil, Size: 0, TarSize: 0}
Expand All @@ -622,7 +620,7 @@ func downloadLayers(ctx context.Context, layers []string, sizes map[string]int64
if err == nil {
// unpack image data
if _, err = os.Stat(layerPath); os.IsNotExist(err) { // ignored if it was untarred before
err = os.MkdirAll(layerPath, 0755)
err = os.MkdirAll(layerPath, 0o755)
if err != nil {
log.WithFields(log.Fields{"error": err, "path": layerPath}).Error("Failed to make dir")
// local file error, no retry
Expand Down Expand Up @@ -681,8 +679,10 @@ func selectiveFilesFromPath(rootPath string, maxFileSize int64, selected func(st
return data, err
}

const dataTimeout = 10 * time.Minute
const retryTimes = 3
const (
dataTimeout = 10 * time.Minute
retryTimes = 3
)

func layerURL(pathTemplate string, url string, args ...interface{}) string {
pathSuffix := fmt.Sprintf(pathTemplate, args...)
Expand Down Expand Up @@ -745,7 +745,7 @@ func DownloadRemoteImage(ctx context.Context, rc *scan.RegClient, name, imgPath
lr := LayerRecord{}
keepers.Add(cacher.RecordName(layer, &lr)) // reference for write recor
if _, err := cacher.ReadRecordCache(layer, &lr); err == nil {
//log.WithFields(log.Fields{"layer": layer}).Debug("rec")
// log.WithFields(log.Fields{"layer": layer}).Debug("rec")
cacheLayers[layer] = &lr
} else {
downloads = append(downloads, layer)
Expand Down
3 changes: 1 addition & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ toolchain go1.25.8
replace k8s.io/cri-api => k8s.io/cri-api v0.25.16

require (
github.com/docker/docker v28.1.1+incompatible
github.com/containerd/errdefs v1.0.0
github.com/google/uuid v1.6.0
github.com/jedib0t/go-pretty/v6 v6.6.7
github.com/neuvector/neuvector v0.0.0-20260406013240-eba858444676
Expand All @@ -30,7 +30,6 @@ require (
github.com/containerd/containerd/api v1.9.0 // indirect
github.com/containerd/containerd/v2 v2.1.5 // indirect
github.com/containerd/continuity v0.4.5 // indirect
github.com/containerd/errdefs v1.0.0 // indirect
github.com/containerd/errdefs/pkg v0.3.0 // indirect
github.com/containerd/fifo v1.1.0 // indirect
github.com/containerd/log v0.1.0 // indirect
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I=
github.com/docker/docker v28.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94=
github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE=
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
Expand Down
Loading
Loading