diff --git a/go.mod b/go.mod index be132c49..9ea4c11a 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 golang.org/x/oauth2 v0.15.0 golang.org/x/sync v0.5.0 - golang.org/x/sys v0.15.0 + golang.org/x/sys v0.18.0 google.golang.org/api v0.154.0 google.golang.org/genproto/googleapis/bytestream v0.0.0-20231212172506-995d672761c0 google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 diff --git a/go.sum b/go.sum index fc7d7341..3628806b 100644 --- a/go.sum +++ b/go.sum @@ -12,6 +12,7 @@ cloud.google.com/go/longrunning v0.5.4/go.mod h1:zqNVncI0BOP8ST6XQD1+VcvuShMmq7+ cloud.google.com/go/storage v1.36.0 h1:P0mOkAcaJxhCTvAkMhxMfrTKiNcub4YmmPBtlhAyTr8= cloud.google.com/go/storage v1.36.0/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/aohorodnyk/mimeheader v0.0.6 h1:WCV4NQjtbqnd2N3FT5MEPesan/lfvaLYmt5v4xSaX/M= github.com/aohorodnyk/mimeheader v0.0.6/go.mod h1:/Gd3t3vszyZYwjNJo2qDxoftZjjVzMdkQZxkiINp3vM= github.com/aws/aws-sdk-go-v2 v1.24.0 h1:890+mqQ+hTpNuw0gGP6/4akolQkSToDJgHfQE7AwGuk= @@ -80,6 +81,7 @@ github.com/go-jose/go-jose/v3 v3.0.1 h1:pWmKFVtt+Jl0vBZTIpz/eAKwsm6LkIxDVVbFHKkc github.com/go-jose/go-jose/v3 v3.0.1/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -140,6 +142,9 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.1/go.mod h1:Rj8lEaVgLiPn1jTMVXEh github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= @@ -153,6 +158,9 @@ github.com/lazybeaver/xorshift v0.0.0-20170702203709-ce511d4823dd/go.mod h1:qXyN github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg= github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -166,6 +174,7 @@ github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lne github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY= github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI= github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/sercand/kuberesolver/v5 v5.1.1 h1:CYH+d67G0sGBj7q5wLK61yzqJJ8gLLC8aeprPTHb6yY= github.com/sercand/kuberesolver/v5 v5.1.1/go.mod h1:Fs1KbKhVRnB2aDWN12NjKCB+RgYMWZJ294T3BtmVCpQ= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -284,6 +293,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/go_dependencies.bzl b/go_dependencies.bzl index b0f2df0b..3d4b5a4b 100644 --- a/go_dependencies.bzl +++ b/go_dependencies.bzl @@ -1513,9 +1513,8 @@ def go_dependencies(): go_repository( name = "org_golang_x_sys", importpath = "golang.org/x/sys", - patches = ["//:patches/org_golang_x_sys/golang-issue-59357.diff"], - sum = "h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=", - version = "v0.15.0", + sum = "h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=", + version = "v0.18.0", ) go_repository( name = "org_golang_x_term", diff --git a/patches/org_golang_x_sys/golang-issue-59357.diff b/patches/org_golang_x_sys/golang-issue-59357.diff deleted file mode 100644 index 2653c053..00000000 --- a/patches/org_golang_x_sys/golang-issue-59357.diff +++ /dev/null @@ -1,181 +0,0 @@ -From 9313951415ca77dcf5e84ba5fa41483b5c16d121 Mon Sep 17 00:00:00 2001 -From: Ilya Hanov -Date: Sat, 30 Sep 2023 12:02:48 +0300 -Subject: [PATCH] unix: add API for fsconfig system call - -Fixes golang/go#59537 - -Change-Id: I8d806ace3adad423c633813455d8f758706cee1d ---- - -diff --git unix/linux/types.go unix/linux/types.go -index 25b9279..b9419f3 100644 ---- unix/linux/types.go -+++ unix/linux/types.go -@@ -972,6 +972,15 @@ - FSPICK_EMPTY_PATH = C.FSPICK_EMPTY_PATH - - FSMOUNT_CLOEXEC = C.FSMOUNT_CLOEXEC -+ -+ FSCONFIG_SET_FLAG = C.FSCONFIG_SET_FLAG -+ FSCONFIG_SET_STRING = C.FSCONFIG_SET_STRING -+ FSCONFIG_SET_BINARY = C.FSCONFIG_SET_BINARY -+ FSCONFIG_SET_PATH = C.FSCONFIG_SET_PATH -+ FSCONFIG_SET_PATH_EMPTY = C.FSCONFIG_SET_PATH_EMPTY -+ FSCONFIG_SET_FD = C.FSCONFIG_SET_FD -+ FSCONFIG_CMD_CREATE = C.FSCONFIG_CMD_CREATE -+ FSCONFIG_CMD_RECONFIGURE = C.FSCONFIG_CMD_RECONFIGURE - ) - - type OpenHow C.struct_open_how -diff --git unix/syscall_linux.go unix/syscall_linux.go -index d844b16..80aadf2 100644 ---- unix/syscall_linux.go -+++ unix/syscall_linux.go -@@ -1840,6 +1840,105 @@ - //sys Fsmount(fd int, flags int, mountAttrs int) (fsfd int, err error) - //sys Fsopen(fsName string, flags int) (fd int, err error) - //sys Fspick(dirfd int, pathName string, flags int) (fd int, err error) -+ -+//sys fsconfig(fd int, cmd uint, key *byte, value *byte, aux int) (err error) -+ -+func fsconfigCommon(fd int, cmd uint, key string, value *byte, aux int) (err error) { -+ var keyp *byte -+ if keyp, err = BytePtrFromString(key); err != nil { -+ return -+ } -+ return fsconfig(fd, cmd, keyp, value, aux) -+} -+ -+// FsconfigSetFlag is equivalent to fsconfig(2) called -+// with cmd == FSCONFIG_SET_FLAG. -+// -+// fd is the filesystem context to act upon. -+// key the parameter key to set. -+func FsconfigSetFlag(fd int, key string) (err error) { -+ return fsconfigCommon(fd, FSCONFIG_SET_FLAG, key, nil, 0) -+} -+ -+// FsconfigSetString is equivalent to fsconfig(2) called -+// with cmd == FSCONFIG_SET_STRING. -+// -+// fd is the filesystem context to act upon. -+// key the parameter key to set. -+// value is the parameter value to set. -+func FsconfigSetString(fd int, key string, value string) (err error) { -+ var valuep *byte -+ if valuep, err = BytePtrFromString(value); err != nil { -+ return -+ } -+ return fsconfigCommon(fd, FSCONFIG_SET_STRING, key, valuep, 0) -+} -+ -+// FsconfigSetBinary is equivalent to fsconfig(2) called -+// with cmd == FSCONFIG_SET_BINARY. -+// -+// fd is the filesystem context to act upon. -+// key the parameter key to set. -+// value is the parameter value to set. -+func FsconfigSetBinary(fd int, key string, value []byte) (err error) { -+ if len(value) == 0 { -+ return EINVAL -+ } -+ return fsconfigCommon(fd, FSCONFIG_SET_BINARY, key, &value[0], len(value)) -+} -+ -+// FsconfigSetPath is equivalent to fsconfig(2) called -+// with cmd == FSCONFIG_SET_PATH. -+// -+// fd is the filesystem context to act upon. -+// key the parameter key to set. -+// path is a non-empty path for specified key. -+// atfd is a file descriptor at which to start lookup from or AT_FDCWD. -+func FsconfigSetPath(fd int, key string, path string, atfd int) (err error) { -+ var valuep *byte -+ if valuep, err = BytePtrFromString(path); err != nil { -+ return -+ } -+ return fsconfigCommon(fd, FSCONFIG_SET_PATH, key, valuep, atfd) -+} -+ -+// FsconfigSetPathEmpty is equivalent to fsconfig(2) called -+// with cmd == FSCONFIG_SET_PATH_EMPTY. The same as -+// FconfigSetPath but with AT_PATH_EMPTY implied. -+func FsconfigSetPathEmpty(fd int, key string, path string, atfd int) (err error) { -+ var valuep *byte -+ if valuep, err = BytePtrFromString(path); err != nil { -+ return -+ } -+ return fsconfigCommon(fd, FSCONFIG_SET_PATH_EMPTY, key, valuep, atfd) -+} -+ -+// FsconfigSetFd is equivalent to fsconfig(2) called -+// with cmd == FSCONFIG_SET_FD. -+// -+// fd is the filesystem context to act upon. -+// key the parameter key to set. -+// value is a file descriptor to be assigned to specified key. -+func FsconfigSetFd(fd int, key string, value int) (err error) { -+ return fsconfigCommon(fd, FSCONFIG_SET_FD, key, nil, value) -+} -+ -+// FsconfigCreate is equivalent to fsconfig(2) called -+// with cmd == FSCONFIG_CMD_CREATE. -+// -+// fd is the filesystem context to act upon. -+func FsconfigCreate(fd int) (err error) { -+ return fsconfig(fd, FSCONFIG_CMD_CREATE, nil, nil, 0) -+} -+ -+// FsconfigReconfigure is equivalent to fsconfig(2) called -+// with cmd == FSCONFIG_CMD_RECONFIGURE. -+// -+// fd is the filesystem context to act upon. -+func FsconfigReconfigure(fd int) (err error) { -+ return fsconfig(fd, FSCONFIG_CMD_RECONFIGURE, nil, nil, 0) -+} -+ - //sys Getdents(fd int, buf []byte) (n int, err error) = SYS_GETDENTS64 - //sysnb Getpgid(pid int) (pgid int, err error) - -diff --git unix/zsyscall_linux.go unix/zsyscall_linux.go -index 14ab34a..dd1720f 100644 ---- unix/zsyscall_linux.go -+++ unix/zsyscall_linux.go -@@ -892,6 +892,16 @@ - - // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT - -+func fsconfig(fd int, cmd uint, key *byte, value *byte, aux int) (err error) { -+ _, _, e1 := Syscall6(SYS_FSCONFIG, uintptr(fd), uintptr(cmd), uintptr(unsafe.Pointer(key)), uintptr(unsafe.Pointer(value)), uintptr(aux), 0) -+ if e1 != 0 { -+ err = errnoErr(e1) -+ } -+ return -+} -+ -+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT -+ - func Getdents(fd int, buf []byte) (n int, err error) { - var _p0 unsafe.Pointer - if len(buf) > 0 { -diff --git unix/ztypes_linux.go unix/ztypes_linux.go -index 18aa70b..3c9bfa2 100644 ---- unix/ztypes_linux.go -+++ unix/ztypes_linux.go -@@ -833,6 +833,15 @@ - FSPICK_EMPTY_PATH = 0x8 - - FSMOUNT_CLOEXEC = 0x1 -+ -+ FSCONFIG_SET_FLAG = 0x0 -+ FSCONFIG_SET_STRING = 0x1 -+ FSCONFIG_SET_BINARY = 0x2 -+ FSCONFIG_SET_PATH = 0x3 -+ FSCONFIG_SET_PATH_EMPTY = 0x4 -+ FSCONFIG_SET_FD = 0x5 -+ FSCONFIG_CMD_CREATE = 0x6 -+ FSCONFIG_CMD_RECONFIGURE = 0x7 - ) - - type OpenHow struct {