From c380c702c7dc60b7a9831f054000f346d8c69aef Mon Sep 17 00:00:00 2001 From: SuperQ Date: Tue, 31 Dec 2024 15:23:33 +0100 Subject: [PATCH] Chore: Fix up various linting issues In prep to add golangci-lint, fix various linting issues. * Make the `kvm` package a fully-qualified public package. Signed-off-by: SuperQ --- cloud.go | 2 +- cmd/main.go | 2 +- go.mod | 2 +- hw.go | 4 ++-- main.go | 2 +- native.go | 9 +++++---- network.go | 8 ++++---- ntp.go | 2 +- remote_mount.go | 2 +- terminal.go | 8 +++++--- usb.go | 2 +- usb_mass_storage.go | 11 +++++------ wol.go | 2 +- 13 files changed, 29 insertions(+), 27 deletions(-) diff --git a/cloud.go b/cloud.go index db47727..4967e09 100644 --- a/cloud.go +++ b/cloud.go @@ -124,7 +124,7 @@ func runWebsocketClient() error { if err != nil { return err } - defer c.CloseNow() + defer c.CloseNow() //nolint:errcheck logger.Infof("WS connected to %v", wsURL.String()) runCtx, cancelRun := context.WithCancel(context.Background()) defer cancelRun() diff --git a/cmd/main.go b/cmd/main.go index 6080aff..ab44ac9 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -1,7 +1,7 @@ package main import ( - "kvm" + "github.com/jetkvm/kvm" ) func main() { diff --git a/go.mod b/go.mod index 5ddcfb6..04c8e3b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module kvm +module github.com/jetkvm/kvm go 1.21.0 diff --git a/hw.go b/hw.go index efe8f5c..03e9d4b 100644 --- a/hw.go +++ b/hw.go @@ -14,7 +14,7 @@ func extractSerialNumber() (string, error) { return "", err } - r, err := regexp.Compile("Serial\\s*:\\s*(\\S+)") + r, err := regexp.Compile(`Serial\s*:\s*(\S+)`) if err != nil { return "", fmt.Errorf("failed to compile regex: %w", err) } @@ -27,7 +27,7 @@ func extractSerialNumber() (string, error) { return matches[1], nil } -func readOtpEntropy() ([]byte, error) { +func readOtpEntropy() ([]byte, error) { //nolint:unused content, err := os.ReadFile("/sys/bus/nvmem/devices/rockchip-otp0/nvmem") if err != nil { return nil, err diff --git a/main.go b/main.go index f94b24e..5ada1f4 100644 --- a/main.go +++ b/main.go @@ -48,7 +48,7 @@ func Main() { time.Sleep(15 * time.Minute) for { logger.Debugf("UPDATING - Auto update enabled: %v", config.AutoUpdateEnabled) - if config.AutoUpdateEnabled == false { + if !config.AutoUpdateEnabled { return } if currentSession != nil { diff --git a/native.go b/native.go index 89e6803..2ceb63e 100644 --- a/native.go +++ b/native.go @@ -5,7 +5,6 @@ import ( "encoding/json" "fmt" "io" - "kvm/resource" "log" "net" "os" @@ -13,6 +12,8 @@ import ( "sync" "time" + "github.com/jetkvm/kvm/resource" + "github.com/pion/webrtc/v4/pkg/media" ) @@ -90,8 +91,8 @@ func WriteCtrlMessage(message []byte) error { return err } -var nativeCtrlSocketListener net.Listener -var nativeVideoSocketListener net.Listener +var nativeCtrlSocketListener net.Listener //nolint:unused +var nativeVideoSocketListener net.Listener //nolint:unused var ctrlClientConnected = make(chan struct{}) @@ -191,7 +192,7 @@ func handleVideoClient(conn net.Conn) { for { n, err := conn.Read(inboundPacket) if err != nil { - log.Println("error during read: %s", err) + log.Printf("error during read: %s\n", err) return } now := time.Now() diff --git a/network.go b/network.go index f461e45..89b7e82 100644 --- a/network.go +++ b/network.go @@ -28,7 +28,7 @@ type LocalIpInfo struct { func checkNetworkState() { iface, err := netlink.LinkByName("eth0") if err != nil { - fmt.Printf("failed to get eth0 interface: %v\n", err) + fmt.Printf("failed to get eth0 interface: %s\n", err) return } @@ -44,7 +44,7 @@ func checkNetworkState() { addrs, err := netlink.AddrList(iface, nl.FAMILY_ALL) if err != nil { - fmt.Printf("failed to get addresses for eth0: %v\n", err) + fmt.Printf("failed to get addresses for eth0: %s\n", err) } for _, addr := range addrs { @@ -98,7 +98,7 @@ func init() { done := make(chan struct{}) if err := netlink.LinkSubscribe(updates, done); err != nil { - fmt.Println("failed to subscribe to link updates: %v", err) + fmt.Printf("failed to subscribe to link updates: %v\n", err) return } @@ -125,6 +125,6 @@ func init() { fmt.Println("Starting mDNS server") err := startMDNS() if err != nil { - fmt.Println("failed to run mDNS: %v", err) + fmt.Printf("failed to run mDNS: %v\n", err) } } diff --git a/ntp.go b/ntp.go index f785d96..fc53eaa 100644 --- a/ntp.go +++ b/ntp.go @@ -11,7 +11,7 @@ import ( "github.com/beevik/ntp" ) -var timeSynced = false +var timeSynced = false //nolint:unused func TimeSyncLoop() { for { diff --git a/remote_mount.go b/remote_mount.go index e6e7322..5b10695 100644 --- a/remote_mount.go +++ b/remote_mount.go @@ -49,7 +49,7 @@ func (w *WebRTCDiskReader) Read(ctx context.Context, offset int64, size int64) ( if err != nil { return nil, err } - buf := make([]byte, 0) + var buf []byte for { select { case data := <-diskReadChan: diff --git a/terminal.go b/terminal.go index 1a1ac1c..3e64020 100644 --- a/terminal.go +++ b/terminal.go @@ -55,11 +55,13 @@ func handleTerminalChannel(d *webrtc.DataChannel) { var size TerminalSize err := json.Unmarshal([]byte(msg.Data), &size) if err == nil { - pty.Setsize(ptmx, &pty.Winsize{ + err = pty.Setsize(ptmx, &pty.Winsize{ Rows: uint16(size.Rows), Cols: uint16(size.Cols), }) - return + if err == nil { + return + } } logger.Errorf("Failed to parse terminal size: %v", err) } @@ -74,7 +76,7 @@ func handleTerminalChannel(d *webrtc.DataChannel) { ptmx.Close() } if cmd != nil && cmd.Process != nil { - cmd.Process.Kill() + _ = cmd.Process.Kill() } }) } diff --git a/usb.go b/usb.go index 075409a..e92c885 100644 --- a/usb.go +++ b/usb.go @@ -215,7 +215,7 @@ func writeGadgetConfig() error { return nil } -func rebindUsb() error { +func rebindUsb() error { //nolint:unused err := os.WriteFile("/sys/bus/platform/drivers/dwc3/unbind", []byte(udc), 0644) if err != nil { return err diff --git a/usb_mass_storage.go b/usb_mass_storage.go index b897c20..38de417 100644 --- a/usb_mass_storage.go +++ b/usb_mass_storage.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "io" - "kvm/resource" "log" "net/http" "os" @@ -16,12 +15,12 @@ import ( "syscall" "time" + "github.com/jetkvm/kvm/resource" + "github.com/gin-gonic/gin" - - "github.com/psanford/httpreadat" - "github.com/google/uuid" "github.com/pion/webrtc/v4" + "github.com/psanford/httpreadat" ) const massStorageName = "mass_storage.usb0" @@ -60,11 +59,11 @@ func onDiskMessage(msg webrtc.DataChannelMessage) { func mountImage(imagePath string) error { err := setMassStorageImage("") if err != nil { - return fmt.Errorf("Remove Mass Storage Image Error", err) + return fmt.Errorf("Remove Mass Storage Image Error: %w", err) } err = setMassStorageImage(imagePath) if err != nil { - return fmt.Errorf("Set Mass Storage Image Error", err) + return fmt.Errorf("Set Mass Storage Image Error: %w", err) } return nil } diff --git a/wol.go b/wol.go index 43c9e53..f0e68bb 100644 --- a/wol.go +++ b/wol.go @@ -43,7 +43,7 @@ func createMagicPacket(mac net.HardwareAddr) []byte { // Write the target MAC address 16 times for i := 0; i < 16; i++ { - binary.Write(&buf, binary.BigEndian, mac) + _ = binary.Write(&buf, binary.BigEndian, mac) } return buf.Bytes()