🤖 Make linter happy

c0ffee · Jul 26, 2022 · 9ca5401 · 9ca5401
1 parent 5eef667
commit 9ca5401
Show file tree

Hide file tree

Showing 30 changed files with 209 additions and 159 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -9,4 +9,15 @@ linters:
     - gofmt # check fmt
     - goheader # Check license headers, only checks files in current year
     - goimports # check imports
-    - gocyclo # check complexity
+    - gocyclo # check complexity
+    - govet
+    - gosimple
+    - deadcode
+    - ineffassign
+    - unused
+    - varcheck
+    - staticcheck
+    - typecheck
+    - structcheck
+    - godot
+    - misspell
diff --git a/cmd/agent/main.go b/cmd/agent/main.go
@@ -1,8 +1,6 @@
 package main
 
 import (
-	//"fmt"
-
 	"context"
 	"encoding/json"
 	"fmt"
@@ -268,7 +266,7 @@ This command is meant to be used from the boot GRUB menu, but can be started man
 		Description: `
 Starts c3os recovery mode.
 
-In recovery mode a QR code will be printed out on the screen which should be used in conjuction with "c3os bridge". Pass by the QR code as snapshot
+In recovery mode a QR code will be printed out on the screen which should be used in conjunction with "c3os bridge". Pass by the QR code as snapshot
 to the bridge to connect over the machine which runs the "c3os recovery" command.
 
 See also https://docs.c3os.io/after_install/recovery_mode/ for documentation.

diff --git a/cmd/cli/bridge.go b/cmd/cli/bridge.go
@@ -112,7 +112,7 @@ func bridge(c *cli.Context) error {
 		return err
 	}
 
-	go api.API(ctx, c.String("api"), 5*time.Second, 20*time.Second, e, nil, false)
+	go api.API(ctx, c.String("api"), 5*time.Second, 20*time.Second, e, nil, false) //nolint:errcheck
 
 	return e.Start(ctx)
 }
diff --git a/cmd/cli/main.go b/cmd/cli/main.go
@@ -1,8 +1,6 @@
 package main
 
 import (
-	//"fmt"
-
 	"fmt"
 	"os"
 

diff --git a/cmd/provider/main.go b/cmd/provider/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"fmt"
 	"os"
 
 	"github.com/c3os-io/c3os/internal/provider"
@@ -21,5 +22,9 @@ func main() {
 	// Expected output: string
 	factory.Add(bus.EventChallenge, provider.Challenge)
 
-	factory.Run(pluggable.EventType(os.Args[1]), os.Stdin, os.Stdout)
+	err := factory.Run(pluggable.EventType(os.Args[1]), os.Stdin, os.Stdout)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
 }
diff --git a/internal/agent/agent.go b/internal/agent/agent.go
@@ -13,11 +13,10 @@ import (
 	"github.com/nxadm/tail"
 )
 
-// setup needs edgevpn and k3s installed locally
-// (both k3s and k3s-agent systemd services)
+// setup needs edgevpn and k3s installed locally (both k3s and k3s-agent systemd services).
 func Run(apiAddress string, dir []string, force bool) error {
 
-	os.MkdirAll("/usr/local/.c3os", 0600)
+	os.MkdirAll("/usr/local/.c3os", 0600) //nolint:errcheck
 
 	// Reads config
 	c, err := config.Scan(config.Directories(dir...))
@@ -31,7 +30,7 @@ func Run(apiAddress string, dir []string, force bool) error {
 		return nil
 	}
 
-	os.MkdirAll("/var/log/c3os", 0600)
+	os.MkdirAll("/var/log/c3os", 0600) //nolint:errcheck
 	fileName := filepath.Join("/var/log/c3os", "agent-provider.log")
 	err = ioutil.WriteFile(fileName, []byte{}, os.ModePerm)
 	if err != nil {
@@ -58,7 +57,10 @@ func Run(apiAddress string, dir []string, force bool) error {
 
 		// Re-load providers
 		bus.Manager.LoadProviders()
-		machine.CreateSentinel("bundles")
+		err = machine.CreateSentinel("bundles")
+		if !c.IgnoreBundleErrors && err != nil {
+			return err
+		}
 	}
 
 	_, err = bus.Manager.Publish(events.EventBootstrap, events.BootstrapPayload{APIAddress: apiAddress, Config: c.String(), Logfile: fileName})

diff --git a/internal/agent/config.go b/internal/agent/config.go
@@ -27,7 +27,7 @@ func LoadConfig(path ...string) (*Config, error) {
 	for _, p := range path {
 		f, err := ioutil.ReadFile(p)
 		if err == nil {
-			yaml.Unmarshal(f, cfg)
+			yaml.Unmarshal(f, cfg) //nolint:errcheck
 		}
 	}
 

diff --git a/internal/agent/iconunix.go b/internal/agent/iconunix.go
@@ -1,6 +1,6 @@
 package agent
 
-var DefaultBanner []byte = []byte{
+var DefaultBanner = []byte{
 	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
 	0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00,
 	0x08, 0x06, 0x00, 0x00, 0x00, 0xf4, 0x78, 0xd4, 0xfa, 0x00, 0x00, 0x02,

diff --git a/internal/agent/install.go b/internal/agent/install.go
@@ -28,7 +28,7 @@ func optsToArgs(options map[string]string) (res []string) {
 	for k, v := range options {
 		if k != "device" && k != "cc" && k != "reboot" && k != "poweroff" {
 			res = append(res, fmt.Sprintf("--%s", k))
-			res = append(res, fmt.Sprintf("%s", v))
+			res = append(res, v)
 		}
 	}
 	return
@@ -38,7 +38,7 @@ func Install(dir ...string) error {
 	utils.OnSignal(func() {
 		svc, err := machine.Getty(1)
 		if err == nil {
-			svc.Start()
+			svc.Start() //nolint:errcheck
 		}
 	}, syscall.SIGINT, syscall.SIGTERM)
 
@@ -47,7 +47,7 @@ func Install(dir ...string) error {
 
 	mergeOption := func(cloudConfig string) {
 		c := &config.Config{}
-		yaml.Unmarshal([]byte(cloudConfig), c)
+		yaml.Unmarshal([]byte(cloudConfig), c) //nolint:errcheck
 		for k, v := range c.Options {
 			if k == "cc" {
 				continue
@@ -80,11 +80,14 @@ func Install(dir ...string) error {
 		r["device"] = cc.Install.Device
 		mergeOption(cc.String())
 
-		RunInstall(r)
+		err = RunInstall(r)
+		if err != nil {
+			return err
+		}
 
 		svc, err := machine.Getty(1)
 		if err == nil {
-			svc.Start()
+			svc.Start() //nolint:errcheck
 		}
 
 		return nil
@@ -133,10 +136,10 @@ func Install(dir ...string) error {
 		header = head
 	}
 
-	// What we receive take precedence over the one in the system
-	yaml.Unmarshal([]byte(cc.String()), &ccData)
+	// What we receive take precedence over the one in the system. best-effort
+	yaml.Unmarshal([]byte(cc.String()), &ccData) //nolint:errcheck
 	if exists {
-		yaml.Unmarshal([]byte(cloudConfig), &ccData)
+		yaml.Unmarshal([]byte(cloudConfig), &ccData) //nolint:errcheck
 		if hasHeader, head := config.HasHeader(cloudConfig, ""); hasHeader {
 			header = head
 		}
@@ -150,19 +153,21 @@ func Install(dir ...string) error {
 	r["cc"] = config.AddHeader(header, string(out))
 
 	pterm.Info.Println("Starting installation")
-	utils.SH("elemental run-stage c3os-install.pre")
-	bus.RunHookScript("/usr/bin/c3os-agent.install.pre.hook")
+	utils.SH("elemental run-stage c3os-install.pre")          //nolint:errcheck
+	bus.RunHookScript("/usr/bin/c3os-agent.install.pre.hook") //nolint:errcheck
 
-	RunInstall(r)
+	if err := RunInstall(r); err != nil {
+		return err
+	}
 
 	pterm.Info.Println("Installation completed, press enter to go back to the shell.")
 
-	utils.Prompt("")
+	utils.Prompt("") //nolint:errcheck
 
 	// give tty1 back
 	svc, err := machine.Getty(1)
 	if err == nil {
-		svc.Start()
+		svc.Start() //nolint: errcheck
 	}
 
 	return nil
@@ -185,15 +190,19 @@ func RunInstall(options map[string]string) error {
 	}
 
 	c := &config.Config{}
-	yaml.Unmarshal([]byte(cloudInit), c)
+	yaml.Unmarshal([]byte(cloudInit), c) //nolint:errcheck
 
 	_, reboot := options["reboot"]
 	_, poweroff := options["poweroff"]
 
-	ioutil.WriteFile(f.Name(), []byte(cloudInit), os.ModePerm)
+	err := ioutil.WriteFile(f.Name(), []byte(cloudInit), os.ModePerm)
+	if err != nil {
+		fmt.Printf("could not write cloud init: %s\n", err.Error())
+		os.Exit(1)
+	}
 	args := []string{"install"}
 	args = append(args, optsToArgs(options)...)
-	args = append(args, "-c", f.Name(), fmt.Sprintf("%s", device))
+	args = append(args, "-c", f.Name(), device)
 
 	cmd := exec.Command("elemental", args...)
 	cmd.Env = os.Environ()
@@ -204,8 +213,8 @@ func RunInstall(options map[string]string) error {
 		fmt.Println(err)
 		os.Exit(1)
 	}
-	utils.SH("elemental run-stage c3os-install.after")
-	bus.RunHookScript("/usr/bin/c3os-agent.install.after.hook")
+	utils.SH("elemental run-stage c3os-install.after")          //nolint:errcheck
+	bus.RunHookScript("/usr/bin/c3os-agent.install.after.hook") //nolint:errcheck
 
 	if reboot || c.Install != nil && c.Install.Reboot {
 		utils.Reboot()

diff --git a/internal/agent/recovery.go b/internal/agent/recovery.go
@@ -76,7 +76,9 @@ func Recovery() error {
 	serviceUUID := utils.RandStringRunes(10)
 	generatedPassword := utils.RandStringRunes(7)
 
-	startRecoveryService(ctx, tk, serviceUUID, recoveryAddr, "fatal")
+	if err := startRecoveryService(ctx, tk, serviceUUID, recoveryAddr, "fatal"); err != nil {
+		return err
+	}
 
 	cmd.PrintText(agentConfig.Branding.Recovery, "Recovery")
 
@@ -90,12 +92,12 @@ func Recovery() error {
 	go sshServer(recoveryAddr, generatedPassword)
 
 	// Wait for user input and go back to shell
-	utils.Prompt("")
+	utils.Prompt("") //nolint:errcheck
 	cancel()
 	// give tty1 back
 	svc, err := machine.Getty(1)
 	if err == nil {
-		svc.Start()
+		svc.Start() //nolint:errcheck
 	}
 
 	return nil
@@ -117,13 +119,13 @@ func sshServer(listenAdddr, password string) {
 				}
 			}()
 			go func() {
-				io.Copy(f, s) // stdin
+				io.Copy(f, s) //nolint:errcheck
 			}()
-			io.Copy(s, f) // stdout
-			cmd.Wait()
+			io.Copy(s, f) //nolint:errcheck
+			cmd.Wait()    //nolint:errcheck
 		} else {
-			io.WriteString(s, "No PTY requested.\n")
-			s.Exit(1)
+			io.WriteString(s, "No PTY requested.\n") //nolint:errcheck
+			s.Exit(1)                                //nolint:errcheck
 		}
 	})
 

diff --git a/internal/agent/recovery_linux.go b/internal/agent/recovery_linux.go
@@ -7,6 +7,6 @@ import (
 )
 
 func setWinsize(f *os.File, w, h int) {
-	syscall.Syscall(syscall.SYS_IOCTL, f.Fd(), uintptr(syscall.TIOCSWINSZ),
-		uintptr(unsafe.Pointer(&struct{ h, w, x, y uint16 }{uint16(h), uint16(w), 0, 0})))
+	syscall.Syscall(syscall.SYS_IOCTL, f.Fd(), uintptr(syscall.TIOCSWINSZ), //nolint:errcheck
+		uintptr(unsafe.Pointer(&struct{ h, w, x, y uint16 }{uint16(h), uint16(w), 0, 0}))) //nolint:errcheck
 }
diff --git a/internal/agent/reset.go b/internal/agent/reset.go
@@ -28,11 +28,11 @@ func Reset() error {
 	lock := sync.Mutex{}
 	go func() {
 		// Wait for user input and go back to shell
-		utils.Prompt("")
+		utils.Prompt("") //nolint:errcheck
 		// give tty1 back
 		svc, err := machine.Getty(1)
 		if err == nil {
-			svc.Start()
+			svc.Start() //nolint:errcheck
 		}
 
 		lock.Lock()
@@ -61,11 +61,11 @@ func Reset() error {
 	lock2 := sync.Mutex{}
 	go func() {
 		// Wait for user input and go back to shell
-		utils.Prompt("")
+		utils.Prompt("") //nolint:errcheck
 		// give tty1 back
 		svc, err := machine.Getty(1)
 		if err == nil {
-			svc.Start()
+			svc.Start() //nolint:errcheck
 		}
 
 		lock2.Lock()

diff --git a/internal/bus/bus.go b/internal/bus/bus.go
@@ -9,8 +9,8 @@ import (
 	"github.com/mudler/go-pluggable"
 )
 
-// Manager is the bus instance manager, which subscribes plugins to events emitted
-var Manager *Bus = &Bus{
+// Manager is the bus instance manager, which subscribes plugins to events emitted.
+var Manager = &Bus{
 	Manager: pluggable.NewManager(
 		[]pluggable.EventType{
 			bus.EventBootstrap,

diff --git a/internal/cmd/commands.go b/internal/cmd/commands.go
@@ -1,8 +1,6 @@
 package cmd
 
 import (
-	//"fmt"
-
 	"encoding/base64"
 	"fmt"
 	"strconv"

diff --git a/internal/machine/bootcmdline.go b/internal/machine/bootcmdline.go
@@ -84,5 +84,5 @@ func dotToYAML(v map[string]interface{}) ([]byte, error) {
 	if err != nil {
 		errs = multierror.Append(errs, err)
 	}
-	return out, err
+	return out, errs
 }