Merge pull request #1947 from alexandear/linter-enable-nolintlint-gosimple-bodyclose

.golangci.yml: enable and fix nolintlint, bodyclose, gosimple

Author: AkihiroSuda

.golangci.yml

@@ -32,7 +32,7 @@ linters:
   # - prealloc
   - typecheck
   # - asciicheck
-  # - bodyclose
+  - bodyclose
   # - dogsled
   # - dupl
   # - errcheck
@@ -58,14 +58,14 @@ linters:
   # - gomodguard
   # - goprintffuncname
   # - gosec (gas)
-  # - gosimple (megacheck)
+  - gosimple
   # - interfacer
   # - lll
   # - maligned
   # - nestif
   # - nlreturn
   # - noctx
-  # - nolintlint
+  - nolintlint
   # - rowserrcheck
   # - scopelint
   # - sqlclosecheck

cmd/limactl/edit.go

@@ -85,7 +85,7 @@ func editAction(cmd *cobra.Command, args []string) error {
 		logrus.Info("Aborting, as requested by saving the file with empty content")
 		return nil
 	}
-	if bytes.Compare(yBytes, yContent) == 0 {
+	if bytes.Equal(yBytes, yContent) {
 		logrus.Info("Aborting, no changes made to the instance")
 		return nil
 	}

pkg/osutil/osutil_linux.go

@@ -11,7 +11,7 @@ const UnixPathMax = 108
 // Stat is a selection of syscall.Stat_t
 type Stat struct {
 	Uid uint32 //nolint:revive
-	Gid uint32 //nolint:revive
+	Gid uint32
 }
 
 func SysStat(fi fs.FileInfo) (Stat, bool) {

pkg/osutil/osutil_others.go

@@ -14,7 +14,7 @@ const UnixPathMax = 104
 // Stat is a selection of syscall.Stat_t
 type Stat struct {
 	Uid uint32 //nolint:revive
-	Gid uint32 //nolint:revive
+	Gid uint32
 }
 
 func SysStat(fi fs.FileInfo) (Stat, bool) {

pkg/osutil/osutil_windows.go

@@ -14,7 +14,7 @@ const UnixPathMax = 108
 // Stat is a selection of syscall.Stat_t
 type Stat struct {
 	Uid uint32 //nolint:revive
-	Gid uint32 //nolint:revive
+	Gid uint32
 }
 
 func SysStat(_ fs.FileInfo) (Stat, bool) {

pkg/osutil/user.go

@@ -18,13 +18,13 @@ type User struct {
 	User  string
 	Uid   uint32 //nolint:revive
 	Group string
-	Gid   uint32 //nolint:revive
+	Gid   uint32
 	Home  string
 }
 
 type Group struct {
 	Name string
-	Gid  uint32 //nolint:revive
+	Gid  uint32
 }
 
 var users map[string]User
@@ -77,7 +77,7 @@ func LookupGroup(name string) (Group, error) {
 const (
 	fallbackUser = "lima"
 	fallbackUid  = 1000 //nolint:revive
-	fallbackGid  = 1000 //nolint:revive
+	fallbackGid  = 1000
 )
 
 var cache struct {