From f0c4438e702be76536d136e2574df7f355f9bc66 Mon Sep 17 00:00:00 2001 From: Denys Mosiiuk Date: Mon, 15 Dec 2025 23:21:34 +0100 Subject: [PATCH] incus/io: #2636 fix linter complaints in `internal/io` Changes: - Added missing docstrings. - Renamed `min` function parameter to `minimum`. Signed-off-by: Denys Mosiiuk --- .golangci.yml | 4 ++++ internal/io/filesystem_unix.go | 1 + internal/io/readseeker.go | 2 ++ internal/io/writer.go | 1 + internal/rsync/rsync.go | 4 ++-- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index d820c062b..7a90b73ca 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -58,6 +58,10 @@ linters: - linters: - revive source: '^//generate-database:mapper ' + - linters: + - revive + text: "avoid package names that conflict with Go standard library package names" + path: "^internal/io/" - linters: - revive - godot diff --git a/internal/io/filesystem_unix.go b/internal/io/filesystem_unix.go index 264dba313..4cc2e7b88 100644 --- a/internal/io/filesystem_unix.go +++ b/internal/io/filesystem_unix.go @@ -7,6 +7,7 @@ import ( "syscall" ) +// GetOwnerMode returns the file mode, owner UID, and owner GID for the given file. func GetOwnerMode(fInfo os.FileInfo) (os.FileMode, int, int) { mode := fInfo.Mode() uid := int(fInfo.Sys().(*syscall.Stat_t).Uid) diff --git a/internal/io/readseeker.go b/internal/io/readseeker.go index abad61d1e..d10b77267 100644 --- a/internal/io/readseeker.go +++ b/internal/io/readseeker.go @@ -14,10 +14,12 @@ func NewReadSeeker(reader io.Reader, seeker io.Seeker) io.ReadSeeker { return &readSeeker{Reader: reader, Seeker: seeker} } +// Read reads data from the reader. func (r *readSeeker) Read(p []byte) (n int, err error) { return r.Reader.Read(p) } +// Seek seeks to the specified offset. func (r *readSeeker) Seek(offset int64, whence int) (int64, error) { return r.Seeker.Seek(offset, whence) } diff --git a/internal/io/writer.go b/internal/io/writer.go index 5a7e6ef03..e28fb59b2 100644 --- a/internal/io/writer.go +++ b/internal/io/writer.go @@ -5,6 +5,7 @@ import ( "io" ) +// WriteAll copies content of data to specified writer. func WriteAll(w io.Writer, data []byte) error { buf := bytes.NewBuffer(data) diff --git a/internal/rsync/rsync.go b/internal/rsync/rsync.go index 6b2604dad..20b4fa8f1 100644 --- a/internal/rsync/rsync.go +++ b/internal/rsync/rsync.go @@ -440,7 +440,7 @@ func rsyncFeatureArgs(features []string) []string { } // AtLeast compares the local version to a minimum version. -func AtLeast(min string) bool { +func AtLeast(minimum string) bool { // Parse the current version. out, err := subprocess.RunCommand("rsync", "--version") if err != nil { @@ -460,7 +460,7 @@ func AtLeast(min string) bool { } // Load minimum version. - minVer, err := version.NewDottedVersion(min) + minVer, err := version.NewDottedVersion(minimum) if err != nil { return false }