Merge pull request #1604 from AkihiroSuda/dev

AkihiroSuda · web-flow · commit cd8734a93019 · 2023-06-06T16:33:08.000+09:00
.golangci.yml: enable staticcheck
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Run golangci-lint
       uses: golangci/golangci-lint-action@v3.5.0
       with:
-        version: v1.51.1
+        version: v1.53.1
         args: --verbose
     - name: Run yamllint
       run: yamllint .
diff --git a/.golangci.yml b/.golangci.yml
@@ -22,7 +22,7 @@ run:
 linters:
   disable-all: true
   enable:
-  - depguard
+  # - depguard # annoying since golangci-lint v1.53.1 https://github.com/golangci/golangci-lint/issues/3877
   - gofmt
   - goimports
   - govet
@@ -69,7 +69,7 @@ linters:
   # - rowserrcheck
   # - scopelint
   # - sqlclosecheck
-  # - staticcheck
+  - staticcheck
   # - stylecheck
   # - testpackage
   # - tparallel
diff --git a/cmd/lima-guestagent/daemon_linux.go b/cmd/lima-guestagent/daemon_linux.go
@@ -24,7 +24,7 @@ func newDaemonCommand() *cobra.Command {
 	return daemonCommand
 }
 
-func daemonAction(cmd *cobra.Command, args []string) error {
+func daemonAction(cmd *cobra.Command, _ []string) error {
 	socket := "/run/lima-guestagent.sock"
 	tick, err := cmd.Flags().GetDuration("tick")
 	if err != nil {
diff --git a/cmd/lima-guestagent/install_systemd_linux.go b/cmd/lima-guestagent/install_systemd_linux.go
@@ -22,7 +22,7 @@ func newInstallSystemdCommand() *cobra.Command {
 	return installSystemdCommand
 }
 
-func installSystemdAction(cmd *cobra.Command, args []string) error {
+func installSystemdAction(_ *cobra.Command, _ []string) error {
 	unit, err := generateSystemdUnit()
 	if err != nil {
 		return err
diff --git a/cmd/limactl/completion.go b/cmd/limactl/completion.go
@@ -5,7 +5,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func bashCompleteInstanceNames(cmd *cobra.Command) ([]string, cobra.ShellCompDirective) {
+func bashCompleteInstanceNames(_ *cobra.Command) ([]string, cobra.ShellCompDirective) {
 	instances, err := store.Instances()
 	if err != nil {
 		return nil, cobra.ShellCompDirectiveDefault
diff --git a/cmd/limactl/debug.go b/cmd/limactl/debug.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"strconv"
+	"time"
 
 	"github.com/lima-vm/lima/pkg/hostagent/dns"
 	"github.com/sirupsen/logrus"
@@ -62,5 +63,6 @@ func debugDNSAction(cmd *cobra.Command, args []string) error {
 	}
 	logrus.Infof("Started srv %+v (UDP %d, TCP %d)", srv, udpLocalPort, tcpLocalPort)
 	for {
+		time.Sleep(time.Hour)
 	}
 }
diff --git a/cmd/limactl/delete.go b/cmd/limactl/delete.go
@@ -59,6 +59,6 @@ func deleteInstance(inst *store.Instance, force bool) error {
 	return nil
 }
 
-func deleteBashComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func deleteBashComplete(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
 	return bashCompleteInstanceNames(cmd)
 }
diff --git a/cmd/limactl/disk.go b/cmd/limactl/disk.go
@@ -97,7 +97,7 @@ func diskCreateAction(cmd *cobra.Command, args []string) error {
 	}
 
 	if err := qemu.CreateDataDisk(diskDir, format, int(diskSize)); err != nil {
-		return err
+		return fmt.Errorf("Failed to create %s disk in %q", format, diskDir)
 	}
 
 	return nil
@@ -297,7 +297,7 @@ $ limactl disk unlock DISK1 DISK2 ...
 	return diskUnlockCommand
 }
 
-func diskUnlockAction(cmd *cobra.Command, args []string) error {
+func diskUnlockAction(_ *cobra.Command, args []string) error {
 	for _, diskName := range args {
 		disk, err := store.InspectDisk(diskName)
 		if err != nil {
diff --git a/cmd/limactl/edit.go b/cmd/limactl/edit.go
@@ -77,7 +77,7 @@ func editAction(cmd *cobra.Command, args []string) error {
 		hdr += "# and an empty file will abort the edit.\n"
 		hdr += "\n"
 		hdr += editutil.GenerateEditorWarningHeader()
-		yBytes, err = editutil.OpenEditor(instName, yContent, hdr)
+		yBytes, err = editutil.OpenEditor(yContent, hdr)
 		if err != nil {
 			return err
 		}
@@ -138,6 +138,6 @@ func askWhetherToStart() (bool, error) {
 	return ans, nil
 }
 
-func editBashComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func editBashComplete(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
 	return bashCompleteInstanceNames(cmd)
 }
diff --git a/cmd/limactl/factory-reset.go b/cmd/limactl/factory-reset.go
@@ -22,7 +22,7 @@ func newFactoryResetCommand() *cobra.Command {
 	return resetCommand
 }
 
-func factoryResetAction(cmd *cobra.Command, args []string) error {
+func factoryResetAction(_ *cobra.Command, args []string) error {
 	instName := DefaultInstanceName
 	if len(args) > 0 {
 		instName = args[0]
@@ -56,6 +56,6 @@ func factoryResetAction(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func factoryResetBashComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func factoryResetBashComplete(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
 	return bashCompleteInstanceNames(cmd)
 }
diff --git a/cmd/limactl/info.go b/cmd/limactl/info.go
@@ -18,7 +18,7 @@ func newInfoCommand() *cobra.Command {
 	return infoCommand
 }
 
-func infoAction(cmd *cobra.Command, args []string) error {
+func infoAction(cmd *cobra.Command, _ []string) error {
 	info, err := infoutil.GetInfo()
 	if err != nil {
 		return err
diff --git a/cmd/limactl/list.go b/cmd/limactl/list.go
@@ -177,6 +177,6 @@ func listAction(cmd *cobra.Command, args []string) error {
 	return store.PrintInstances(out, instances, format, &options)
 }
 
-func listBashComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func listBashComplete(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
 	return bashCompleteInstanceNames(cmd)
 }
diff --git a/cmd/limactl/prune.go b/cmd/limactl/prune.go
@@ -19,7 +19,7 @@ func newPruneCommand() *cobra.Command {
 	return pruneCommand
 }
 
-func pruneAction(cmd *cobra.Command, args []string) error {
+func pruneAction(_ *cobra.Command, _ []string) error {
 	ucd, err := os.UserCacheDir()
 	if err != nil {
 		return err
diff --git a/cmd/limactl/shell.go b/cmd/limactl/shell.go
@@ -198,7 +198,7 @@ func shellAction(cmd *cobra.Command, args []string) error {
 	return sshCmd.Run()
 }
 
-func shellBashComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func shellBashComplete(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
 	return bashCompleteInstanceNames(cmd)
 }
 
diff --git a/cmd/limactl/show_ssh.go b/cmd/limactl/show_ssh.go
@@ -85,6 +85,6 @@ func showSSHAction(cmd *cobra.Command, args []string) error {
 	return sshutil.Format(w, instName, format, opts)
 }
 
-func showSSHBashComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func showSSHBashComplete(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
 	return bashCompleteInstanceNames(cmd)
 }
diff --git a/cmd/limactl/snapshot.go b/cmd/limactl/snapshot.go
@@ -184,6 +184,6 @@ func snapshotListAction(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func snapshotBashComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func snapshotBashComplete(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
 	return bashCompleteInstanceNames(cmd)
 }
diff --git a/cmd/limactl/start.go b/cmd/limactl/start.go
@@ -321,7 +321,7 @@ func chooseNextCreatorState(st *creatorState) (*creatorState, error) {
 			hdr += "\n"
 			hdr += editutil.GenerateEditorWarningHeader()
 			var err error
-			st.yBytes, err = editutil.OpenEditor(st.instName, st.yBytes, hdr)
+			st.yBytes, err = editutil.OpenEditor(st.yBytes, hdr)
 			if err != nil {
 				return st, err
 			}
@@ -417,7 +417,7 @@ func startAction(cmd *cobra.Command, args []string) error {
 	return start.Start(ctx, inst)
 }
 
-func startBashComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func startBashComplete(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
 	comp, _ := bashCompleteInstanceNames(cmd)
 	if templates, err := templatestore.Templates(); err == nil {
 		for _, f := range templates {
diff --git a/cmd/limactl/stop.go b/cmd/limactl/stop.go
@@ -150,6 +150,6 @@ func stopInstanceForcibly(inst *store.Instance) {
 	}
 }
 
-func stopBashComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func stopBashComplete(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
 	return bashCompleteInstanceNames(cmd)
 }
diff --git a/cmd/limactl/usernet.go b/cmd/limactl/usernet.go
@@ -26,7 +26,7 @@ func newUsernetCommand() *cobra.Command {
 	return hostagentCommand
 }
 
-func usernetAction(cmd *cobra.Command, args []string) error {
+func usernetAction(cmd *cobra.Command, _ []string) error {
 	pidfile, err := cmd.Flags().GetString("pidfile")
 	if err != nil {
 		return err
diff --git a/cmd/limactl/validate.go b/cmd/limactl/validate.go
@@ -20,7 +20,7 @@ func newValidateCommand() *cobra.Command {
 	return validateCommand
 }
 
-func validateAction(cmd *cobra.Command, args []string) error {
+func validateAction(_ *cobra.Command, args []string) error {
 	for _, f := range args {
 		_, err := store.LoadYAMLByFilePath(f)
 		if err != nil {
diff --git a/pkg/cidata/cidata_test.go b/pkg/cidata/cidata_test.go
@@ -13,7 +13,7 @@ import (
 	"gotest.tools/v3/assert"
 )
 
-func fakeLookupIP(host string) []net.IP {
+func fakeLookupIP(_ string) []net.IP {
 	return []net.IP{net.IPv4(127, 0, 0, 0)}
 }
 
diff --git a/pkg/downloader/downloader.go b/pkg/downloader/downloader.go
@@ -477,9 +477,5 @@ func downloadHTTP(localPath, url string, description string, expectedDigest dige
 	if err := os.RemoveAll(localPath); err != nil {
 		return err
 	}
-	if err := os.Rename(localPathTmp, localPath); err != nil {
-		return err
-	}
-
-	return nil
+	return os.Rename(localPathTmp, localPath)
 }
diff --git a/pkg/downloader/downloader_test.go b/pkg/downloader/downloader_test.go
@@ -1,7 +1,6 @@
 package downloader
 
 import (
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -116,7 +115,7 @@ func TestDownloadLocal(t *testing.T) {
 		localTestFile := filepath.Join(t.TempDir(), "some-file")
 		testDownloadFileContents := []byte("TestDownloadLocal")
 
-		ioutil.WriteFile(localTestFile, testDownloadFileContents, 0644)
+		assert.NilError(t, os.WriteFile(localTestFile, testDownloadFileContents, 0644))
 		testLocalFileURL := "file://" + localTestFile
 		wrongDigest := digest.Digest(emptyFileDigest)
 
@@ -143,7 +142,7 @@ func TestDownloadCompressed(t *testing.T) {
 		localPath := filepath.Join(t.TempDir(), t.Name())
 		localFile := filepath.Join(t.TempDir(), "test-file")
 		testDownloadCompressedContents := []byte("TestDownloadCompressed")
-		ioutil.WriteFile(localFile, testDownloadCompressedContents, 0644)
+		assert.NilError(t, os.WriteFile(localFile, testDownloadCompressedContents, 0644))
 		assert.NilError(t, exec.Command("gzip", localFile).Run())
 		localFile += ".gz"
 		testLocalFileURL := "file://" + localFile
diff --git a/pkg/driver/driver.go b/pkg/driver/driver.go
@@ -79,7 +79,7 @@ func (d *BaseDriver) Stop(_ context.Context) error {
 	return nil
 }
 
-func (d *BaseDriver) ChangeDisplayPassword(_ context.Context, password string) error {
+func (d *BaseDriver) ChangeDisplayPassword(_ context.Context, _ string) error {
 	return nil
 }
 
diff --git a/pkg/editutil/editutil.go b/pkg/editutil/editutil.go
@@ -52,7 +52,7 @@ func GenerateEditorWarningHeader() string {
 // OpenEditor opens an editor, and returns the content (not path) of the modified yaml.
 //
 // OpenEditor returns nil when the file was saved as an empty file, optionally with whitespaces.
-func OpenEditor(name string, content []byte, hdr string) ([]byte, error) {
+func OpenEditor(content []byte, hdr string) ([]byte, error) {
 	editor := editorcmd.Detect()
 	if editor == "" {
 		return nil, errors.New("could not detect a text editor binary, try setting $EDITOR")
diff --git a/pkg/guestagent/api/server/server.go b/pkg/guestagent/api/server/server.go
@@ -16,7 +16,7 @@ type Backend struct {
 	Agent guestagent.Agent
 }
 
-func (b *Backend) onError(w http.ResponseWriter, r *http.Request, err error, ec int) {
+func (b *Backend) onError(w http.ResponseWriter, err error, ec int) {
 	w.WriteHeader(ec)
 	w.Header().Set("Content-Type", "application/json")
 	// err may potentially contain credential info (in a future version),
@@ -35,12 +35,12 @@ func (b *Backend) GetInfo(w http.ResponseWriter, r *http.Request) {
 
 	info, err := b.Agent.Info(ctx)
 	if err != nil {
-		b.onError(w, r, err, http.StatusInternalServerError)
+		b.onError(w, err, http.StatusInternalServerError)
 		return
 	}
 	m, err := json.Marshal(info)
 	if err != nil {
-		b.onError(w, r, err, http.StatusInternalServerError)
+		b.onError(w, err, http.StatusInternalServerError)
 		return
 	}
 	w.Header().Set("Content-Type", "application/json")
diff --git a/pkg/guestagent/guestagent_linux.go b/pkg/guestagent/guestagent_linux.go
@@ -173,7 +173,7 @@ func (a *agent) Events(ctx context.Context, ch chan api.Event) {
 	}
 }
 
-func (a *agent) LocalPorts(ctx context.Context) ([]api.IPPort, error) {
+func (a *agent) LocalPorts(_ context.Context) ([]api.IPPort, error) {
 	if cpu.IsBigEndian {
 		return nil, errors.New("big endian architecture is unsupported, because I don't know how /proc/net/tcp looks like on big endian hosts")
 	}
diff --git a/pkg/hostagent/api/server/server.go b/pkg/hostagent/api/server/server.go
@@ -14,7 +14,7 @@ type Backend struct {
 	Agent *hostagent.HostAgent
 }
 
-func (b *Backend) onError(w http.ResponseWriter, r *http.Request, err error, ec int) {
+func (b *Backend) onError(w http.ResponseWriter, err error, ec int) {
 	w.WriteHeader(ec)
 	w.Header().Set("Content-Type", "application/json")
 	// err may potentially contain credential info (in a future version),
@@ -33,12 +33,12 @@ func (b *Backend) GetInfo(w http.ResponseWriter, r *http.Request) {
 
 	info, err := b.Agent.Info(ctx)
 	if err != nil {
-		b.onError(w, r, err, http.StatusInternalServerError)
+		b.onError(w, err, http.StatusInternalServerError)
 		return
 	}
 	m, err := json.Marshal(info)
 	if err != nil {
-		b.onError(w, r, err, http.StatusInternalServerError)
+		b.onError(w, err, http.StatusInternalServerError)
 		return
 	}
 	w.Header().Set("Content-Type", "application/json")
diff --git a/pkg/hostagent/hostagent.go b/pkg/hostagent/hostagent.go
@@ -401,7 +401,7 @@ func (a *HostAgent) startHostAgentRoutines(ctx context.Context) error {
 		return nil
 	})
 	var mErr error
-	if err := a.waitForRequirements(ctx, "essential", a.essentialRequirements()); err != nil {
+	if err := a.waitForRequirements("essential", a.essentialRequirements()); err != nil {
 		mErr = multierror.Append(mErr, err)
 	}
 	if *a.y.SSH.ForwardAgent {
@@ -418,7 +418,7 @@ sudo chown -R "${USER}" /run/host-services`
 		}
 	}
 	if *a.y.MountType == limayaml.REVSSHFS {
-		mounts, err := a.setupMounts(ctx)
+		mounts, err := a.setupMounts()
 		if err != nil {
 			mErr = multierror.Append(mErr, err)
 		}
@@ -450,10 +450,10 @@ sudo chown -R "${USER}" /run/host-services`
 		})
 	}
 	go a.watchGuestAgentEvents(ctx)
-	if err := a.waitForRequirements(ctx, "optional", a.optionalRequirements()); err != nil {
+	if err := a.waitForRequirements("optional", a.optionalRequirements()); err != nil {
 		mErr = multierror.Append(mErr, err)
 	}
-	if err := a.waitForRequirements(ctx, "final", a.finalRequirements()); err != nil {
+	if err := a.waitForRequirements("final", a.finalRequirements()); err != nil {
 		mErr = multierror.Append(mErr, err)
 	}
 	// Copy all config files _after_ the requirements are done
diff --git a/pkg/hostagent/mount.go b/pkg/hostagent/mount.go
diff --git a/pkg/hostagent/requirements.go b/pkg/hostagent/requirements.go
diff --git a/pkg/iso9660util/iso9660util.go b/pkg/iso9660util/iso9660util.go
diff --git a/pkg/networks/reconcile/reconcile.go b/pkg/networks/reconcile/reconcile.go
diff --git a/pkg/networks/usernet/client.go b/pkg/networks/usernet/client.go
diff --git a/pkg/networks/usernet/recoincile.go b/pkg/networks/usernet/recoincile.go
diff --git a/pkg/qemu/qemu_driver.go b/pkg/qemu/qemu_driver.go
diff --git a/pkg/start/start.go b/pkg/start/start.go
diff --git a/pkg/vz/vm_darwin.go b/pkg/vz/vm_darwin.go
diff --git a/pkg/vz/vz_driver_darwin.go b/pkg/vz/vz_driver_darwin.go
diff --git a/pkg/vz/vz_driver_others.go b/pkg/vz/vz_driver_others.go

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ func newDaemonCommand() *cobra.Command {`
`24`	`24`	`return daemonCommand`
`25`	`25`	`}`
`26`	`26`
`27`		`-func daemonAction(cmd *cobra.Command, args []string) error {`
	`27`	`+func daemonAction(cmd *cobra.Command, _ []string) error {`
`28`	`28`	`socket := "/run/lima-guestagent.sock"`
`29`	`29`	`tick, err := cmd.Flags().GetDuration("tick")`
`30`	`30`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ func newInstallSystemdCommand() *cobra.Command {`
`22`	`22`	`return installSystemdCommand`
`23`	`23`	`}`
`24`	`24`
`25`		`-func installSystemdAction(cmd *cobra.Command, args []string) error {`
	`25`	`+func installSystemdAction(_ *cobra.Command, _ []string) error {`
`26`	`26`	`unit, err := generateSystemdUnit()`
`27`	`27`	`if err != nil {`
`28`	`28`	`return err`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"github.com/spf13/cobra"`
`6`	`6`	`)`
`7`	`7`
`8`		`-func bashCompleteInstanceNames(cmd *cobra.Command) ([]string, cobra.ShellCompDirective) {`
	`8`	`+func bashCompleteInstanceNames(_ *cobra.Command) ([]string, cobra.ShellCompDirective) {`
`9`	`9`	`instances, err := store.Instances()`
`10`	`10`	`if err != nil {`
`11`	`11`	`return nil, cobra.ShellCompDirectiveDefault`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package main`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"strconv"`
	`5`	`+ "time"`
`5`	`6`
`6`	`7`	`"github.com/lima-vm/lima/pkg/hostagent/dns"`
`7`	`8`	`"github.com/sirupsen/logrus"`
`@@ -62,5 +63,6 @@ func debugDNSAction(cmd *cobra.Command, args []string) error {`
`62`	`63`	`}`
`63`	`64`	`logrus.Infof("Started srv %+v (UDP %d, TCP %d)", srv, udpLocalPort, tcpLocalPort)`
`64`	`65`	`for {`
	`66`	`+ time.Sleep(time.Hour)`
`65`	`67`	`}`
`66`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,6 @@ func deleteInstance(inst *store.Instance, force bool) error {`
`59`	`59`	`return nil`
`60`	`60`	`}`
`61`	`61`
`62`		`-func deleteBashComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
	`62`	`+func deleteBashComplete(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {`
`63`	`63`	`return bashCompleteInstanceNames(cmd)`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ func diskCreateAction(cmd *cobra.Command, args []string) error {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`if err := qemu.CreateDataDisk(diskDir, format, int(diskSize)); err != nil {`
`100`		`- return err`
	`100`	`+ return fmt.Errorf("Failed to create %s disk in %q", format, diskDir)`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`return nil`
`@@ -297,7 +297,7 @@ $ limactl disk unlock DISK1 DISK2 ...`
`297`	`297`	`return diskUnlockCommand`
`298`	`298`	`}`
`299`	`299`
`300`		`-func diskUnlockAction(cmd *cobra.Command, args []string) error {`
	`300`	`+func diskUnlockAction(_ *cobra.Command, args []string) error {`
`301`	`301`	`for _, diskName := range args {`
`302`	`302`	`disk, err := store.InspectDisk(diskName)`
`303`	`303`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ func editAction(cmd *cobra.Command, args []string) error {`
`77`	`77`	`hdr += "# and an empty file will abort the edit.\n"`
`78`	`78`	`hdr += "\n"`
`79`	`79`	`hdr += editutil.GenerateEditorWarningHeader()`
`80`		`- yBytes, err = editutil.OpenEditor(instName, yContent, hdr)`
	`80`	`+ yBytes, err = editutil.OpenEditor(yContent, hdr)`
`81`	`81`	`if err != nil {`
`82`	`82`	`return err`
`83`	`83`	`}`
`@@ -138,6 +138,6 @@ func askWhetherToStart() (bool, error) {`
`138`	`138`	`return ans, nil`
`139`	`139`	`}`
`140`	`140`
`141`		`-func editBashComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
	`141`	`+func editBashComplete(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {`
`142`	`142`	`return bashCompleteInstanceNames(cmd)`
`143`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ func newFactoryResetCommand() *cobra.Command {`
`22`	`22`	`return resetCommand`
`23`	`23`	`}`
`24`	`24`
`25`		`-func factoryResetAction(cmd *cobra.Command, args []string) error {`
	`25`	`+func factoryResetAction(_ *cobra.Command, args []string) error {`
`26`	`26`	`instName := DefaultInstanceName`
`27`	`27`	`if len(args) > 0 {`
`28`	`28`	`instName = args[0]`
`@@ -56,6 +56,6 @@ func factoryResetAction(cmd *cobra.Command, args []string) error {`
`56`	`56`	`return nil`
`57`	`57`	`}`
`58`	`58`
`59`		`-func factoryResetBashComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
	`59`	`+func factoryResetBashComplete(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {`
`60`	`60`	`return bashCompleteInstanceNames(cmd)`
`61`	`61`	`}`