Skip to content

Commit

Permalink
enable gocritic, gosec, gosimple, govet unconvert, unparam, unused an…
Browse files Browse the repository at this point in the history
…d whitespace linters (#72)

Signed-off-by: Matthieu MOREL <[email protected]>
  • Loading branch information
mmorel-35 authored Mar 27, 2023
1 parent 364b2a2 commit df76f81
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
8 changes: 8 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,18 @@ linters:
enable:
- errcheck
- errorlint
- gocritic
- gosec
- gosimple
- govet
- gci
- misspell
- nonamedreturns
- staticcheck
- unconvert
- unparam
- unused
- whitespace

linters-settings:
gci:
Expand Down
11 changes: 6 additions & 5 deletions netns_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func New() (NsHandle, error) {
// and returns a handle to it
func NewNamed(name string) (NsHandle, error) {
if _, err := os.Stat(bindMountPath); os.IsNotExist(err) {
err = os.MkdirAll(bindMountPath, 0755)
err = os.MkdirAll(bindMountPath, 0o755)
if err != nil {
return None(), err
}
Expand All @@ -62,7 +62,7 @@ func NewNamed(name string) (NsHandle, error) {

namedPath := path.Join(bindMountPath, name)

f, err := os.OpenFile(namedPath, os.O_CREATE|os.O_EXCL, 0444)
f, err := os.OpenFile(namedPath, os.O_CREATE|os.O_EXCL, 0o444)
if err != nil {
newNs.Close()
return None(), err
Expand Down Expand Up @@ -217,11 +217,12 @@ func getPidForContainer(id string) (int, error) {
id += "*"

var pidFile string
if cgroupVer == 1 {
switch cgroupVer {
case 1:
pidFile = "tasks"
} else if cgroupVer == 2 {
case 2:
pidFile = "cgroup.procs"
} else {
default:
return -1, fmt.Errorf("Invalid cgroup version '%d'", cgroupVer)
}

Expand Down
8 changes: 2 additions & 6 deletions netns_others.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,9 @@

package netns

import (
"errors"
)
import "errors"

var (
ErrNotImplemented = errors.New("not implemented")
)
var ErrNotImplemented = errors.New("not implemented")

// Setns sets namespace using golang.org/x/sys/unix.Setns on Linux. It
// is not implemented on other platforms.
Expand Down

0 comments on commit df76f81

Please sign in to comment.