diff --git a/hack/validate/vet b/hack/validate/vet index 7ab25fee86..64760489ea 100755 --- a/hack/validate/vet +++ b/hack/validate/vet @@ -4,7 +4,7 @@ export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source "${SCRIPTDIR}/.validate" IFS=$'\n' -files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor/' || true) ) +files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor/' | grep -v '^api/types/container/' || true) ) unset IFS errors=() diff --git a/pkg/system/filesys_windows.go b/pkg/system/filesys_windows.go index 6fa5090d9e..6094f01fd4 100644 --- a/pkg/system/filesys_windows.go +++ b/pkg/system/filesys_windows.go @@ -98,7 +98,7 @@ func mkdirWithACL(name string) error { sddl := "D:P(A;OICI;GA;;;BA)(A;OICI;GA;;;SY)" sd, err := winio.SddlToSecurityDescriptor(sddl) if err != nil { - return &os.PathError{"mkdir", name, err} + return &os.PathError{Op: "mkdir", Path: name, Err: err} } sa.Length = uint32(unsafe.Sizeof(sa)) sa.InheritHandle = 1 @@ -106,12 +106,12 @@ func mkdirWithACL(name string) error { namep, err := syscall.UTF16PtrFromString(name) if err != nil { - return &os.PathError{"mkdir", name, err} + return &os.PathError{Op: "mkdir", Path: name, Err: err} } e := syscall.CreateDirectory(namep, &sa) if e != nil { - return &os.PathError{"mkdir", name, e} + return &os.PathError{Op: "mkdir", Path: name, Err: e} } return nil } @@ -162,13 +162,13 @@ func OpenSequential(name string) (*os.File, error) { // If there is an error, it will be of type *PathError. func OpenFileSequential(name string, flag int, _ os.FileMode) (*os.File, error) { if name == "" { - return nil, &os.PathError{"open", name, syscall.ENOENT} + return nil, &os.PathError{Op: "open", Path: name, Err: syscall.ENOENT} } r, errf := syscallOpenFileSequential(name, flag, 0) if errf == nil { return r, nil } - return nil, &os.PathError{"open", name, errf} + return nil, &os.PathError{Op: "open", Path: name, Err: errf} } func syscallOpenFileSequential(name string, flag int, _ os.FileMode) (file *os.File, err error) { diff --git a/pkg/system/utimes_unix_test.go b/pkg/system/utimes_unix_test.go index 1ee0d099f9..a73ed118c9 100644 --- a/pkg/system/utimes_unix_test.go +++ b/pkg/system/utimes_unix_test.go @@ -41,7 +41,7 @@ func TestLUtimesNano(t *testing.T) { t.Fatal(err) } - ts := []syscall.Timespec{{0, 0}, {0, 0}} + ts := []syscall.Timespec{{Sec: 0, Nsec: 0}, {Sec: 0, Nsec: 0}} if err := LUtimesNano(symlink, ts); err != nil { t.Fatal(err) }