chore: fix //nolint directives

That's the recommended syntax: https://golangci-lint.run/usage/false-positives/ Signed-off-by: Alexey Palazhchenko <alexey.palazhchenko@gmail.com>
siderolabs · Mar 5, 2021 · df52c13 · df52c13
1 parent f3a32ff
commit df52c13
Show file tree

Hide file tree

Showing 254 changed files with 680 additions and 680 deletions.
diff --git a/cmd/installer/cmd/image.go b/cmd/installer/cmd/image.go
@@ -49,7 +49,7 @@ func init() {
 	rootCmd.AddCommand(imageCmd)
 }
 
-//nolint: gocyclo
+//nolint:gocyclo
 func runImageCmd() (err error) {
 	p, err := platform.NewPlatform(options.Platform)
 	if err != nil {
@@ -110,7 +110,7 @@ func runImageCmd() (err error) {
 	return nil
 }
 
-//nolint: gocyclo
+//nolint:gocyclo
 func finalize(platform runtime.Platform, img string) (err error) {
 	dir := filepath.Dir(img)
 

diff --git a/cmd/installer/cmd/iso.go b/cmd/installer/cmd/iso.go
@@ -51,7 +51,7 @@ func init() {
 	rootCmd.AddCommand(isoCmd)
 }
 
-// nolint: gocyclo
+//nolint:gocyclo
 func runISOCmd() error {
 	if err := os.MkdirAll(outputArg, 0o777); err != nil {
 		return err
@@ -73,14 +73,14 @@ func runISOCmd() error {
 		if err != nil {
 			return err
 		}
-		// nolint: errcheck
+		//nolint:errcheck
 		defer from.Close()
 
 		to, err := os.OpenFile(dest, os.O_RDWR|os.O_CREATE, 0o666)
 		if err != nil {
 			return err
 		}
-		// nolint: errcheck
+		//nolint:errcheck
 		defer to.Close()
 
 		_, err = io.Copy(to, from)
@@ -113,14 +113,14 @@ func runISOCmd() error {
 	if err != nil {
 		return err
 	}
-	// nolint: errcheck
+	//nolint:errcheck
 	defer from.Close()
 
 	to, err := os.OpenFile(filepath.Join(outputArg, filepath.Base(out)), os.O_RDWR|os.O_CREATE, 0o666)
 	if err != nil {
 		return err
 	}
-	// nolint: errcheck
+	//nolint:errcheck
 	defer to.Close()
 
 	_, err = io.Copy(to, from)

diff --git a/cmd/installer/pkg/install/install.go b/cmd/installer/pkg/install/install.go
@@ -87,7 +87,7 @@ type Installer struct {
 
 // NewInstaller initializes and returns an Installer.
 //
-// nolint: gocyclo
+//nolint:gocyclo
 func NewInstaller(cmdline *procfs.Cmdline, seq runtime.Sequence, opts *Options) (i *Installer, err error) {
 	i = &Installer{
 		cmdline: cmdline,
@@ -120,7 +120,7 @@ func (i *Installer) probeBootPartition() error {
 			return err
 		}
 
-		defer dev.Close() // nolint:errcheck
+		defer dev.Close() //nolint:errcheck
 
 		if part, err := dev.GetPartition(constants.BootPartitionLabel); err != nil {
 			i.bootPartitionFound = false
@@ -146,7 +146,7 @@ func (i *Installer) probeBootPartition() error {
 			if err := mount.Mount(mountpoints); err != nil {
 				log.Printf("warning: failed to mount boot partition %q: %s", partPath, err)
 			} else {
-				defer mount.Unmount(mountpoints) //nolint: errcheck
+				defer mount.Unmount(mountpoints) //nolint:errcheck
 			}
 		}
 	}
@@ -162,7 +162,7 @@ func (i *Installer) probeBootPartition() error {
 // Install fetches the necessary data locations and copies or extracts
 // to the target locations.
 //
-// nolint: gocyclo
+//nolint:gocyclo
 func (i *Installer) Install(seq runtime.Sequence) (err error) {
 	if i.options.Board != constants.BoardNone {
 		var b runtime.Board
@@ -308,7 +308,7 @@ func (i *Installer) Install(seq runtime.Sequence) (err error) {
 			return err
 		}
 
-		//nolint: errcheck
+		//nolint:errcheck
 		defer meta.Close()
 
 		if ok := meta.LegacyADV.SetTag(adv.Upgrade, i.Current); !ok {

diff --git a/cmd/installer/pkg/install/manifest.go b/cmd/installer/pkg/install/manifest.go
@@ -45,7 +45,7 @@ type Device struct {
 
 // NewManifest initializes and returns a Manifest.
 //
-//nolint: gocyclo
+//nolint:gocyclo
 func NewManifest(label string, sequence runtime.Sequence, bootPartitionFound bool, opts *Options) (manifest *Manifest, err error) {
 	if label == "" {
 		return nil, fmt.Errorf("a label is required, got \"\"")
@@ -189,7 +189,7 @@ func (m *Manifest) checkMounts(device Device) error {
 				return nil
 			}
 
-			defer f.Close() //nolint: errcheck
+			defer f.Close() //nolint:errcheck
 
 			scanner := bufio.NewScanner(f)
 			for scanner.Scan() {
@@ -213,7 +213,7 @@ func (m *Manifest) checkMounts(device Device) error {
 	return nil
 }
 
-//nolint: gocyclo
+//nolint:gocyclo
 func (m *Manifest) executeOnDevice(device Device, targets []*Target) (err error) {
 	if err = m.checkMounts(device); err != nil {
 		return err
@@ -235,7 +235,7 @@ func (m *Manifest) executeOnDevice(device Device, targets []*Target) (err error)
 		return err
 	}
 
-	// nolint: errcheck
+	//nolint:errcheck
 	defer bd.Close()
 
 	var pt *gpt.GPT
@@ -273,7 +273,7 @@ func (m *Manifest) executeOnDevice(device Device, targets []*Target) (err error)
 			return err
 		}
 
-		defer bd.Close() //nolint: errcheck
+		defer bd.Close() //nolint:errcheck
 
 		created = true
 	}
@@ -372,7 +372,7 @@ func (m *Manifest) executeOnDevice(device Device, targets []*Target) (err error)
 	return nil
 }
 
-//nolint: gocyclo
+//nolint:gocyclo
 func (m *Manifest) preserveContents(device Device, targets []*Target) (err error) {
 	anyPreserveContents := false
 
@@ -398,7 +398,7 @@ func (m *Manifest) preserveContents(device Device, targets []*Target) (err error
 		return nil
 	}
 
-	// nolint: errcheck
+	//nolint:errcheck
 	defer bd.Close()
 
 	pt, err := bd.PartitionTable()
@@ -492,7 +492,7 @@ func (m *Manifest) zeroDevice(device Device) (err error) {
 		return err
 	}
 
-	defer bd.Close() //nolint: errcheck
+	defer bd.Close() //nolint:errcheck
 
 	var method string
 
@@ -506,7 +506,7 @@ func (m *Manifest) zeroDevice(device Device) (err error) {
 }
 
 // Partition creates a new partition on the specified device.
-// nolint: dupl, gocyclo
+//nolint:dupl,gocyclo
 func (t *Target) Partition(pt *gpt.GPT, pos int, bd *blockdevice.BlockDevice) (err error) {
 	if t.Skip {
 		part := pt.Partitions().FindByName(t.Label)

diff --git a/cmd/installer/pkg/install/manifest_test.go b/cmd/installer/pkg/install/manifest_test.go
@@ -86,7 +86,7 @@ func (suite *manifestSuite) TearDownTest() {
 }
 
 func (suite *manifestSuite) skipUnderBuildkit() {
-	hostname, _ := os.Hostname() //nolint: errcheck
+	hostname, _ := os.Hostname() //nolint:errcheck
 
 	if hostname == "buildkitsandbox" {
 		suite.T().Skip("test not supported under buildkit as partition devices are not propagated from /dev")
@@ -103,7 +103,7 @@ func (suite *manifestSuite) verifyBlockdevice(manifest *install.Manifest, curren
 	bd, err := blockdevice.Open(suite.loopbackDevice.Name())
 	suite.Require().NoError(err)
 
-	defer bd.Close() //nolint: errcheck
+	defer bd.Close() //nolint:errcheck
 
 	table, err := bd.PartitionTable()
 	suite.Require().NoError(err)
@@ -360,7 +360,7 @@ func (suite *manifestSuite) TestTargetInstall() {
 	dir, err := ioutil.TempDir("", "talostest")
 	suite.Require().NoError(err)
 
-	// nolint: errcheck
+	//nolint:errcheck
 	defer os.RemoveAll(dir)
 
 	// Create a tempfile for local copy
@@ -394,7 +394,7 @@ func (suite *manifestSuite) createTalosLegacyLayout() {
 	bd, err := blockdevice.Open(suite.loopbackDevice.Name())
 	suite.Require().NoError(err)
 
-	defer bd.Close() //nolint: errcheck
+	defer bd.Close() //nolint:errcheck
 
 	// create Talos 0.6 partitions
 	table, err := gpt.New(bd.Device())

diff --git a/cmd/installer/pkg/install/target.go b/cmd/installer/pkg/install/target.go
@@ -26,7 +26,7 @@ import (
 
 // Target represents an installation partition.
 //
-//nolint: golint, maligned
+//nolint:golint,maligned
 type Target struct {
 	*partition.FormatOptions
 	Device string
@@ -175,7 +175,7 @@ func (t *Target) Locate(pt *gpt.GPT) (*gpt.Partition, error) {
 
 // Format creates a filesystem on the device/partition.
 //
-//nolint: gocyclo
+//nolint:gocyclo
 func (t *Target) Format() error {
 	if t.Skip {
 		return nil
@@ -198,7 +198,7 @@ func (t *Target) Save() (err error) {
 			if sourceFile, err = os.Open(asset.Source); err != nil {
 				return err
 			}
-			// nolint: errcheck
+			//nolint:errcheck
 			defer sourceFile.Close()
 
 			if err = os.MkdirAll(filepath.Dir(asset.Destination), os.ModeDir); err != nil {
@@ -209,7 +209,7 @@ func (t *Target) Save() (err error) {
 				return err
 			}
 
-			// nolint: errcheck
+			//nolint:errcheck
 			defer destFile.Close()
 
 			log.Printf("copying %s to %s\n", sourceFile.Name(), destFile.Name())
@@ -294,12 +294,12 @@ func (t *Target) saveRawContents(partPath string) error {
 		return fmt.Errorf("error opening source partition: %q", err)
 	}
 
-	defer src.Close() //nolint: errcheck
+	defer src.Close() //nolint:errcheck
 
 	t.Contents = bytes.NewBuffer(nil)
 
 	zw := gzip.NewWriter(t.Contents)
-	defer zw.Close() //nolint: errcheck
+	defer zw.Close() //nolint:errcheck
 
 	_, err = io.Copy(zw, src)
 	if err != nil {
@@ -348,7 +348,7 @@ func (t *Target) restoreRawContents() error {
 		return fmt.Errorf("error opening source partition: %q", err)
 	}
 
-	defer dst.Close() //nolint: errcheck
+	defer dst.Close() //nolint:errcheck
 
 	zr, err := gzip.NewReader(t.Contents)
 	if err != nil {

diff --git a/cmd/installer/pkg/install/verify.go b/cmd/installer/pkg/install/verify.go
@@ -61,7 +61,7 @@ func VerifyDiskAvailability(devpath, label string) (err error) {
 		return nil
 	}
 
-	// nolint: errcheck
+	//nolint:errcheck
 	defer dev.Close()
 
 	part, err := dev.GetPartition(label)

diff --git a/cmd/installer/pkg/ova/ova.go b/cmd/installer/pkg/ova/ova.go
@@ -27,7 +27,7 @@ SHA256({{ .OVF }})= {{ .OVFSHA }}
 `
 
 // OVF format reference: https://www.dmtf.org/standards/ovf.
-//nolint: lll
+//nolint:lll
 const ovfTpl = `<?xml version="1.0" encoding="UTF-8"?>
 <!--Generated by VMware ovftool 4.3.0 (build-7948156), UTC time: 2019-10-31T01:41:10.540841Z-->
 <!-- Edited by Talos -->
@@ -131,7 +131,7 @@ const ovfTpl = `<?xml version="1.0" encoding="UTF-8"?>
 `
 
 // CreateOVAFromRAW creates an OVA from a RAW disk.
-//nolint: gocyclo
+//nolint:gocyclo
 func CreateOVAFromRAW(name, src, out string) (err error) {
 	dir, err := ioutil.TempDir("/tmp", "talos")
 	if err != nil {
@@ -176,7 +176,7 @@ func CreateOVAFromRAW(name, src, out string) (err error) {
 		return err
 	}
 
-	// nolint: errcheck
+	//nolint:errcheck
 	defer os.RemoveAll(dir)
 
 	if err = ioutil.WriteFile(filepath.Join(dir, name+".mf"), []byte(mf), 0o666); err != nil {

diff --git a/cmd/talosctl/cmd/docs.go b/cmd/talosctl/cmd/docs.go
@@ -76,7 +76,7 @@ var docsCmd = &cobra.Command{
 			if err != nil {
 				return err
 			}
-			// nolint: errcheck
+			//nolint:errcheck
 			defer f.Close()
 
 			if _, err := io.WriteString(f, frontmatter("CLI", cliDescription)); err != nil {

diff --git a/cmd/talosctl/cmd/mgmt/cluster/create.go b/cmd/talosctl/cmd/mgmt/cluster/create.go
@@ -115,7 +115,7 @@ var createCmd = &cobra.Command{
 	},
 }
 
-//nolint: gocyclo
+//nolint:gocyclo
 func create(ctx context.Context) (err error) {
 	if masters < 1 {
 		return fmt.Errorf("number of masters can't be less than 1")
@@ -209,7 +209,7 @@ func create(ctx context.Context) (err error) {
 		return err
 	}
 
-	defer provisioner.Close() //nolint: errcheck
+	defer provisioner.Close() //nolint:errcheck
 
 	// Craft cluster and node requests
 	request := provision.ClusterRequest{
@@ -522,7 +522,7 @@ func create(ctx context.Context) (err error) {
 	}
 
 	clusterAccess := access.NewAdapter(cluster, provisionOptions...)
-	defer clusterAccess.Close() //nolint: errcheck
+	defer clusterAccess.Close() //nolint:errcheck
 
 	if applyConfigEnabled {
 		err = clusterAccess.ApplyConfig(ctx, request.Nodes, os.Stdout)

diff --git a/cmd/talosctl/cmd/mgmt/cluster/destroy.go b/cmd/talosctl/cmd/mgmt/cluster/destroy.go
@@ -30,7 +30,7 @@ func destroy(ctx context.Context) error {
 		return err
 	}
 
-	defer provisioner.Close() //nolint: errcheck
+	defer provisioner.Close() //nolint:errcheck
 
 	cluster, err := provisioner.Reflect(ctx, clusterName, stateDir)
 	if err != nil {

diff --git a/cmd/talosctl/cmd/mgmt/cluster/show.go b/cmd/talosctl/cmd/mgmt/cluster/show.go
@@ -38,7 +38,7 @@ func show(ctx context.Context) error {
 		return err
 	}
 
-	defer provisioner.Close() //nolint: errcheck
+	defer provisioner.Close() //nolint:errcheck
 
 	cluster, err := provisioner.Reflect(ctx, clusterName, stateDir)
 	if err != nil {

diff --git a/cmd/talosctl/cmd/mgmt/config.go b/cmd/talosctl/cmd/mgmt/config.go
@@ -102,7 +102,7 @@ func fixControlPlaneEndpoint(u *url.URL) *url.URL {
 	return u
 }
 
-//nolint: gocyclo
+//nolint:gocyclo
 func genV1Alpha1Config(args []string) error {
 	// If output dir isn't specified, set to the current working dir
 	var err error
@@ -118,7 +118,7 @@ func genV1Alpha1Config(args []string) error {
 		return fmt.Errorf("failed to create output dir: %w", err)
 	}
 
-	var genOptions []generate.GenOption //nolint: prealloc
+	var genOptions []generate.GenOption //nolint:prealloc
 
 	for _, registryMirror := range registryMirrors {
 		components := strings.SplitN(registryMirror, "=", 2)