From 92621790eb563b282ab2e5ef7557683de3661ee9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 24 Aug 2024 02:24:04 +0000 Subject: [PATCH 1/3] chore(deps): update registry.suse.com/bci/golang docker tag to v1.23 --- Dockerfile.dapper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index fb9fbd8..48500c4 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,4 +1,4 @@ -FROM registry.suse.com/bci/golang:1.22 +FROM registry.suse.com/bci/golang:1.23 ARG DAPPER_HOST_ARCH=amd64 ARG http_proxy From 1edfad737cb02a8054f578cb4b107ef190693a9b Mon Sep 17 00:00:00 2001 From: Derek Su Date: Sat, 7 Sep 2024 13:13:04 +0000 Subject: [PATCH 2/3] chore(dockerfile): update golangci-lint to v1.60.3 Signed-off-by: Derek Su --- Dockerfile.dapper | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 48500c4..347bd08 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -4,6 +4,7 @@ ARG DAPPER_HOST_ARCH=amd64 ARG http_proxy ARG https_proxy ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} +ENV GOLANGCI_LINT_VERSION="v1.60.3" RUN zypper -n addrepo --refresh https://download.opensuse.org/repositories/Base:System/openSUSE_Factory/Base:System.repo && \ zypper --gpg-auto-import-keys ref @@ -14,7 +15,7 @@ RUN zypper -n install glibc glibc-static gcc ca-certificates git wget curl vim l ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm64=arm64 GOLANG_ARCH=GOLANG_ARCH_${ARCH} \ GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash -RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2 +RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCI_LINT_VERSION} ENV DAPPER_SOURCE /go/src/github.com/longhorn/sparse-tools ENV DAPPER_OUTPUT ./bin coverage.out From ad4ecf3240b3cc7d741a8d5cc81e9f31c3454c9e Mon Sep 17 00:00:00 2001 From: Derek Su Date: Sat, 7 Sep 2024 13:41:00 +0000 Subject: [PATCH 3/3] fix: non-constant format string in call to ... Signed-off-by: Derek Su --- sparse/file.go | 2 +- sparse/sfold.go | 2 +- sparse/sprune.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sparse/file.go b/sparse/file.go index 187f13a..17624bd 100644 --- a/sparse/file.go +++ b/sparse/file.go @@ -347,7 +347,7 @@ func GetFiemapRegionExts(file FileIoProcessor, interval Interval, extCount int) _, exts, errno := file.GetFieMap().FiemapRegion(uint32(extCount), uint64(interval.Begin), uint64(interval.End-interval.Begin)) if errno != 0 { log.Error("Failed to call fiemap.Fiemap(extCount)") - return exts, fmt.Errorf(errno.Error()) + return exts, fmt.Errorf("%v", errno) } log.Tracef("Retrieved %v/%v extents from file %v, interval %+v, elapsed %.2fs", diff --git a/sparse/sfold.go b/sparse/sfold.go index cfdfe80..480e59d 100644 --- a/sparse/sfold.go +++ b/sparse/sfold.go @@ -64,7 +64,7 @@ func coalesce(parentFileIo, childFileIo FileIoProcessor, fileSize int64, ops Fil defer func() { if err != nil { - log.Errorf(err.Error()) + log.Errorf("%v", err) updateProgress(progress, atomic.LoadUint32(progress), true, err, progressMutex, ops) } else { updateProgress(progress, progressComplete, true, nil, progressMutex, ops) diff --git a/sparse/sprune.go b/sparse/sprune.go index 773d0af..3940b51 100644 --- a/sparse/sprune.go +++ b/sparse/sprune.go @@ -60,7 +60,7 @@ func prune(parentFileIo, childFileIo FileIoProcessor, fileSize int64, ops FileHa defer func() { if err != nil { - log.Errorf(err.Error()) + log.Errorf("%v", err) updateProgress(progress, atomic.LoadUint32(progress), true, err, progressMutex, ops) } else { updateProgress(progress, progressComplete, true, nil, progressMutex, ops)