Lint fixes (inamedparam)

cmd/rigtest/rigtest.go

@@ -26,17 +26,17 @@ import (
 )
 
 type TestingT interface {
-	Errorf(format string, args ...interface{})
+	Errorf(format string, args ...any)
 	FailNow()
 }
 
 type testRunner struct{}
 
-func (t testRunner) Run(name string, args ...interface{}) {
+func (t testRunner) Run(name string, args ...any) {
 	fmt.Println("* Running test:", fmt.Sprintf(name, args...))
 }
 
-func (t testRunner) Errorf(format string, args ...interface{}) {
+func (t testRunner) Errorf(format string, args ...any) {
 	println(fmt.Sprintf(format, args...))
 }
 

connection.go

@@ -4,6 +4,7 @@ package rig
 
 import (
 	"crypto/sha256"
+	"encoding/hex"
 	"fmt"
 	"io"
 	"os"
@@ -28,9 +29,9 @@ type client interface {
 	Connect() error
 	Disconnect()
 	IsWindows() bool
-	Exec(string, ...exec.Option) error
-	ExecStreams(string, io.ReadCloser, io.Writer, io.Writer, ...exec.Option) (waiter, error)
-	ExecInteractive(string) error
+	Exec(cmd string, opts ...exec.Option) error
+	ExecStreams(cmd string, stdin io.ReadCloser, stdout io.Writer, stderr io.Writer, opts ...exec.Option) (waiter, error)
+	ExecInteractive(cmd string) error
 	String() string
 	Protocol() string
 	IPAddress() string
@@ -387,7 +388,7 @@ func (c *Connection) Upload(src, dst string, _ ...exec.Option) error {
 		return fmt.Errorf("%w: validate %s checksum: %w", ErrUploadFailed, dst, err)
 	}
 
-	if remoteSum != fmt.Sprintf("%x", shasum.Sum(nil)) {
+	if remoteSum != hex.EncodeToString(shasum.Sum(nil)) {
 		return fmt.Errorf("%w: checksum mismatch", ErrUploadFailed)
 	}
 

examples/os/stock/stock.go

@@ -21,7 +21,7 @@ import (
 )
 
 type configurer interface {
-	Pwd(os.Host) string
+	Pwd(host os.Host) string
 }
 
 // Host is a host that utilizes rig for connections
@@ -39,7 +39,11 @@ func (h *Host) LoadOS() error {
 		return err
 	}
 
-	h.Configurer = bf().(configurer)
+	c, ok := bf().(configurer)
+	if !ok {
+		return fmt.Errorf("OS %s does not support configurer interface", *h.OSVersion)
+	}
+	h.Configurer = c
 
 	return nil
 }

examples/upload/upload.go

@@ -14,8 +14,8 @@ import (
 )
 
 type configurer interface {
-	Pwd(os.Host) string
-	CheckPrivilege(os.Host) error
+	Pwd(host os.Host) string
+	CheckPrivilege(host os.Host) error
 }
 
 // Host is a host that utilizes rig for connections
@@ -33,7 +33,11 @@ func (h *Host) LoadOS() error {
 		return err
 	}
 
-	h.Configurer = bf().(configurer)
+	c, ok := bf().(configurer)
+	if !ok {
+		return fmt.Errorf("OS %s does not support configurer interface", *h.OSVersion)
+	}
+	h.Configurer = c
 
 	return nil
 }

exec/exec.go

@@ -20,17 +20,17 @@ var (
 	Confirm = false
 
 	// DebugFunc can be replaced to direct the output of exec logging into your own function (standard sprintf interface)
-	DebugFunc = func(s string, args ...interface{}) {
+	DebugFunc = func(s string, args ...any) {
 		log.Debugf(s, args...)
 	}
 
 	// InfoFunc can be replaced to direct the output of exec logging into your own function (standard sprintf interface)
-	InfoFunc = func(s string, args ...interface{}) {
+	InfoFunc = func(s string, args ...any) {
 		log.Infof(s, args...)
 	}
 
 	// ErrorFunc can be replaced to direct the output of exec logging into your own function (standard sprintf interface)
-	ErrorFunc = func(s string, args ...interface{}) {
+	ErrorFunc = func(s string, args ...any) {
 		log.Errorf(s, args...)
 	}
 
@@ -69,7 +69,7 @@ type Options struct {
 }
 
 type host interface {
-	Sudo(string) (string, error)
+	Sudo(cmd string) (string, error)
 }
 
 // Command returns the command wrapped in a sudo if sudo is enabled or the original command
@@ -117,21 +117,21 @@ func (o *Options) LogStdin(prefix string) {
 }
 
 // LogDebugf is a conditional debug logger
-func (o *Options) LogDebugf(s string, args ...interface{}) {
+func (o *Options) LogDebugf(s string, args ...any) {
 	if o.LogDebug {
 		DebugFunc(s, args...)
 	}
 }
 
 // LogInfof is a conditional info logger
-func (o *Options) LogInfof(s string, args ...interface{}) {
+func (o *Options) LogInfof(s string, args ...any) {
 	if o.LogInfo {
 		InfoFunc(s, args...)
 	}
 }
 
 // LogErrorf is a conditional error logger
-func (o *Options) LogErrorf(s string, args ...interface{}) {
+func (o *Options) LogErrorf(s string, args ...any) {
 	if o.LogError {
 		ErrorFunc(s, args...)
 	}

log/log.go

@@ -5,38 +5,38 @@ import "fmt"
 
 // Logger interface should be implemented by the logging library you wish to use
 type Logger interface {
-	Tracef(string, ...interface{})
-	Debugf(string, ...interface{})
-	Infof(string, ...interface{})
-	Warnf(string, ...interface{})
-	Errorf(string, ...interface{})
+	Tracef(msg string, args ...any)
+	Debugf(msg string, args ...any)
+	Infof(msg string, args ...any)
+	Warnf(msg string, args ...any)
+	Errorf(msg string, args ...any)
 }
 
 // Log can be assigned a proper logger, such as logrus configured to your liking.
 var Log Logger
 
 // Tracef logs a trace level log message
-func Tracef(t string, args ...interface{}) {
+func Tracef(t string, args ...any) {
 	Log.Tracef(t, args...)
 }
 
 // Debugf logs a debug level log message
-func Debugf(t string, args ...interface{}) {
+func Debugf(t string, args ...any) {
 	Log.Debugf(t, args...)
 }
 
 // Infof logs an info level log message
-func Infof(t string, args ...interface{}) {
+func Infof(t string, args ...any) {
 	Log.Infof(t, args...)
 }
 
 // Errorf logs an error level log message
-func Errorf(t string, args ...interface{}) {
+func Errorf(t string, args ...any) {
 	Log.Errorf(t, args...)
 }
 
 // Warnf logs a warn level log message
-func Warnf(t string, args ...interface{}) {
+func Warnf(t string, args ...any) {
 	Log.Warnf(t, args...)
 }
 
@@ -46,26 +46,26 @@ type StdLog struct {
 }
 
 // Tracef prints a debug level log message
-func (l *StdLog) Tracef(t string, args ...interface{}) {
+func (l *StdLog) Tracef(t string, args ...any) {
 	fmt.Println("TRACE", fmt.Sprintf(t, args...))
 }
 
 // Debugf prints a debug level log message
-func (l *StdLog) Debugf(t string, args ...interface{}) {
+func (l *StdLog) Debugf(t string, args ...any) {
 	fmt.Println("DEBUG", fmt.Sprintf(t, args...))
 }
 
 // Infof prints an info level log message
-func (l *StdLog) Infof(t string, args ...interface{}) {
+func (l *StdLog) Infof(t string, args ...any) {
 	fmt.Println("INFO ", fmt.Sprintf(t, args...))
 }
 
 // Warnf prints a warn level log message
-func (l *StdLog) Warnf(t string, args ...interface{}) {
+func (l *StdLog) Warnf(t string, args ...any) {
 	fmt.Println("WARN", fmt.Sprintf(t, args...))
 }
 
 // Errorf prints an error level log message
-func (l *StdLog) Errorf(t string, args ...interface{}) {
+func (l *StdLog) Errorf(t string, args ...any) {
 	fmt.Println("ERROR", fmt.Sprintf(t, args...))
 }

os/host.go

@@ -7,10 +7,10 @@ import (
 // Host is an interface to a host object that has the functions needed by the various OS support packages
 type Host interface {
 	Upload(source, destination string, opts ...exec.Option) error
-	Exec(string, ...exec.Option) error
-	ExecOutput(string, ...exec.Option) (string, error)
-	Execf(string, ...interface{}) error
-	ExecOutputf(string, ...interface{}) (string, error)
+	Exec(cmd string, opts ...exec.Option) error
+	ExecOutput(cmd string, opts ...exec.Option) (string, error)
+	Execf(cmd string, argsOrOpts ...any) error
+	ExecOutputf(cmd string, argsOrOpts ...any) (string, error)
 	String() string
-	Sudo(string) (string, error)
+	Sudo(cmd string) (string, error)
 }

os/initsystem/host.go

@@ -3,7 +3,7 @@ package initsystem
 
 // Host interface for init system
 type Host interface {
-	Execf(string, ...interface{}) error
-	ExecOutputf(string, ...interface{}) (string, error)
-	Sudo(string) (string, error)
+	Execf(cmd string, args ...any) error
+	ExecOutputf(cmd string, args ...any) (string, error)
+	Sudo(cmd string) (string, error)
 }

os/linux.go

@@ -19,16 +19,16 @@ type Linux struct{}
 
 // initSystem interface defines an init system - the OS's system to manage services (systemd, openrc for example)
 type initSystem interface {
-	StartService(initsystem.Host, string) error
-	StopService(initsystem.Host, string) error
-	RestartService(initsystem.Host, string) error
-	DisableService(initsystem.Host, string) error
-	EnableService(initsystem.Host, string) error
-	ServiceIsRunning(initsystem.Host, string) bool
-	ServiceScriptPath(initsystem.Host, string) (string, error)
-	DaemonReload(initsystem.Host) error
-	ServiceEnvironmentPath(initsystem.Host, string) (string, error)
-	ServiceEnvironmentContent(map[string]string) string
+	StartService(host initsystem.Host, service string) error
+	StopService(host initsystem.Host, service string) error
+	RestartService(host initsystem.Host, service string) error
+	DisableService(host initsystem.Host, service string) error
+	EnableService(host initsystem.Host, service string) error
+	ServiceIsRunning(host initsystem.Host, service string) bool
+	ServiceScriptPath(host initsystem.Host, service string) (string, error)
+	DaemonReload(host initsystem.Host) error
+	ServiceEnvironmentPath(host initsystem.Host, srvice string) (string, error)
+	ServiceEnvironmentContent(envs map[string]string) string
 }
 
 // ErrInitSystemNotSupported is returned when the init system is not supported

os/linux/alpine.go

@@ -21,7 +21,7 @@ func init() {
 		func(os rig.OSVersion) bool {
 			return os.ID == "alpine"
 		},
-		func() interface{} {
+		func() any {
 			return &Alpine{}
 		},
 	)

os/linux/archlinux.go

@@ -20,7 +20,7 @@ func init() {
 		func(os rig.OSVersion) bool {
 			return os.IDLike == "arch"
 		},
-		func() interface{} {
+		func() any {
 			return Archlinux{}
 		},
 	)

os/linux/debian.go

@@ -21,7 +21,7 @@ func init() {
 		func(os rig.OSVersion) bool {
 			return os.ID == "debian"
 		},
-		func() interface{} {
+		func() any {
 			return Debian{}
 		},
 	)

os/linux/enterpriselinux/centos.go

@@ -17,7 +17,7 @@ func init() {
 		func(os rig.OSVersion) bool {
 			return os.ID == "centos"
 		},
-		func() interface{} {
+		func() any {
 			return CentOS{}
 		},
 	)

os/linux/enterpriselinux/oracle.go

@@ -16,7 +16,7 @@ func init() {
 		func(os rig.OSVersion) bool {
 			return os.ID == "ol"
 		},
-		func() interface{} {
+		func() any {
 			return OracleLinux{}
 		},
 	)

os/linux/enterpriselinux/rhel.go

@@ -16,7 +16,7 @@ func init() {
 		func(os rig.OSVersion) bool {
 			return os.ID == "rhel"
 		},
-		func() interface{} {
+		func() any {
 			return RHEL{}
 		},
 	)

os/linux/sles.go

@@ -31,7 +31,7 @@ func init() {
 		func(os rig.OSVersion) bool {
 			return os.ID == "sles"
 		},
-		func() interface{} {
+		func() any {
 			return SLES{}
 		},
 	)

os/linux/ubuntu.go

@@ -16,7 +16,7 @@ func init() {
 		func(os rig.OSVersion) bool {
 			return os.ID == "ubuntu"
 		},
-		func() interface{} {
+		func() any {
 			return Ubuntu{}
 		},
 	)

os/mac/darwin.go

@@ -133,7 +133,7 @@ func init() {
 		func(os rig.OSVersion) bool {
 			return os.ID == "darwin"
 		},
-		func() interface{} {
+		func() any {
 			return Darwin{}
 		},
 	)

os/registry/registry.go

@@ -11,7 +11,7 @@ import (
 var ErrOSModuleNotFound = errors.New("os support module not found")
 
 type (
-	buildFunc = func() interface{}
+	buildFunc = func() any
 	matchFunc = func(rig.OSVersion) bool
 )
 

os/windows/windows2019.go

@@ -19,7 +19,7 @@ func init() {
 		func(os rig.OSVersion) bool {
 			return os.ID == "windows" && strings.HasPrefix(os.Version, "10.0.")
 		},
-		func() interface{} {
+		func() any {
 			return Windows2019{}
 		},
 	)

pkg/rigfs/posixfsys.go

@@ -208,7 +208,7 @@ func (f *PosixFile) CopyFromN(src io.Reader, num int64, alt io.Writer) (int64, e
 	}
 	var ddCmd string
 	if f.pos+num >= f.size {
-		if _, err := f.fsys.helper("truncate", f.path, fmt.Sprintf("%d", f.pos)); err != nil {
+		if _, err := f.fsys.helper("truncate", f.path, strconv.FormatInt(f.pos, 10)); err != nil {
 			return 0, fmt.Errorf("%w: truncate %s for writing: %w", ErrCommandFailed, f.path, err)
 		}
 		ddCmd = fmt.Sprintf("dd if=/dev/stdin of=%s bs=16M oflag=append conv=notrunc", shellescape.Quote(f.path))