From 8a1cec3192178f759003c1b94c99d2d551acf6ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Sep 2023 11:04:29 +0200 Subject: [PATCH] Bump github.com/onsi/ginkgo/v2 in /src/rabbitmq-upgrade-preparation (#842) Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.12.0 to 2.12.1. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/ginkgo/compare/v2.12.0...v2.12.1) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/rabbitmq-upgrade-preparation/go.mod | 4 ++-- src/rabbitmq-upgrade-preparation/go.sum | 8 +++---- .../github.com/onsi/ginkgo/v2/CHANGELOG.md | 9 ++++++++ .../onsi/ginkgo/v2/internal/writer.go | 6 ++++- .../onsi/ginkgo/v2/types/version.go | 2 +- .../vendor/golang.org/x/sys/unix/mkerrors.sh | 1 + .../golang.org/x/sys/unix/syscall_linux.go | 23 +++++++++++++++++++ .../golang.org/x/sys/unix/syscall_unix.go | 3 +++ .../golang.org/x/sys/unix/zerrors_linux.go | 17 ++++++++++++++ .../golang.org/x/sys/unix/zsyscall_linux.go | 20 ++++++++++++++++ .../golang.org/x/sys/unix/ztypes_linux.go | 15 ++++++++++++ .../vendor/modules.txt | 4 ++-- 12 files changed, 102 insertions(+), 10 deletions(-) diff --git a/src/rabbitmq-upgrade-preparation/go.mod b/src/rabbitmq-upgrade-preparation/go.mod index 94340418..517a2aba 100644 --- a/src/rabbitmq-upgrade-preparation/go.mod +++ b/src/rabbitmq-upgrade-preparation/go.mod @@ -7,7 +7,7 @@ toolchain go1.21.1 require ( github.com/cenkalti/backoff v2.2.1+incompatible github.com/hashicorp/go-version v1.6.0 - github.com/onsi/ginkgo/v2 v2.12.0 + github.com/onsi/ginkgo/v2 v2.12.1 github.com/onsi/gomega v1.27.10 ) @@ -19,7 +19,7 @@ require ( github.com/kr/pretty v0.3.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect golang.org/x/net v0.14.0 // indirect - golang.org/x/sys v0.11.0 // indirect + golang.org/x/sys v0.12.0 // indirect golang.org/x/text v0.12.0 // indirect golang.org/x/tools v0.12.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect diff --git a/src/rabbitmq-upgrade-preparation/go.sum b/src/rabbitmq-upgrade-preparation/go.sum index 7a754898..d00d26e0 100644 --- a/src/rabbitmq-upgrade-preparation/go.sum +++ b/src/rabbitmq-upgrade-preparation/go.sum @@ -28,8 +28,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/onsi/ginkgo/v2 v2.12.0 h1:UIVDowFPwpg6yMUpPjGkYvf06K3RAiJXUhCxEwQVHRI= -github.com/onsi/ginkgo/v2 v2.12.0/go.mod h1:ZNEzXISYlqpb8S36iN71ifqLi3vVD1rVJGvWRCJOUpQ= +github.com/onsi/ginkgo/v2 v2.12.1 h1:uHNEO1RP2SpuZApSkel9nEh1/Mu+hmQe7Q+Pepg5OYA= +github.com/onsi/ginkgo/v2 v2.12.1/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= @@ -46,8 +46,8 @@ golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= diff --git a/src/rabbitmq-upgrade-preparation/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md b/src/rabbitmq-upgrade-preparation/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md index 450c8bbd..1eb88b6f 100644 --- a/src/rabbitmq-upgrade-preparation/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md +++ b/src/rabbitmq-upgrade-preparation/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md @@ -1,3 +1,12 @@ +## 2.12.1 + +### Fixes +- Print logr prefix if it exists (#1275) [90d4846] + +### Maintenance +- Bump actions/checkout from 3 to 4 (#1271) [555f543] +- Bump golang.org/x/sys from 0.11.0 to 0.12.0 (#1270) [d867b7d] + ## 2.12.0 ### Features diff --git a/src/rabbitmq-upgrade-preparation/vendor/github.com/onsi/ginkgo/v2/internal/writer.go b/src/rabbitmq-upgrade-preparation/vendor/github.com/onsi/ginkgo/v2/internal/writer.go index 574f172d..aab42d5f 100644 --- a/src/rabbitmq-upgrade-preparation/vendor/github.com/onsi/ginkgo/v2/internal/writer.go +++ b/src/rabbitmq-upgrade-preparation/vendor/github.com/onsi/ginkgo/v2/internal/writer.go @@ -135,6 +135,10 @@ func (w *Writer) Println(a ...interface{}) { func GinkgoLogrFunc(writer *Writer) logr.Logger { return funcr.New(func(prefix, args string) { - writer.Printf("%s\n", args) + if prefix == "" { + writer.Printf("%s\n", args) + } else { + writer.Printf("%s %s\n", prefix, args) + } }, funcr.Options{}) } diff --git a/src/rabbitmq-upgrade-preparation/vendor/github.com/onsi/ginkgo/v2/types/version.go b/src/rabbitmq-upgrade-preparation/vendor/github.com/onsi/ginkgo/v2/types/version.go index 21fb22b6..04545630 100644 --- a/src/rabbitmq-upgrade-preparation/vendor/github.com/onsi/ginkgo/v2/types/version.go +++ b/src/rabbitmq-upgrade-preparation/vendor/github.com/onsi/ginkgo/v2/types/version.go @@ -1,3 +1,3 @@ package types -const VERSION = "2.12.0" +const VERSION = "2.12.1" diff --git a/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/mkerrors.sh b/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/mkerrors.sh index 8f775faf..47fa6a7e 100644 --- a/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/mkerrors.sh +++ b/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/mkerrors.sh @@ -583,6 +583,7 @@ ccflags="$@" $2 ~ /^PERF_/ || $2 ~ /^SECCOMP_MODE_/ || $2 ~ /^SEEK_/ || + $2 ~ /^SCHED_/ || $2 ~ /^SPLICE_/ || $2 ~ /^SYNC_FILE_RANGE_/ || $2 !~ /IOC_MAGIC/ && diff --git a/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/syscall_linux.go b/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/syscall_linux.go index a730878e..0ba03019 100644 --- a/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/syscall_linux.go +++ b/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/syscall_linux.go @@ -2471,6 +2471,29 @@ func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask * return pselect6(nfd, r, w, e, mutableTimeout, kernelMask) } +//sys schedSetattr(pid int, attr *SchedAttr, flags uint) (err error) +//sys schedGetattr(pid int, attr *SchedAttr, size uint, flags uint) (err error) + +// SchedSetAttr is a wrapper for sched_setattr(2) syscall. +// https://man7.org/linux/man-pages/man2/sched_setattr.2.html +func SchedSetAttr(pid int, attr *SchedAttr, flags uint) error { + if attr == nil { + return EINVAL + } + attr.Size = SizeofSchedAttr + return schedSetattr(pid, attr, flags) +} + +// SchedGetAttr is a wrapper for sched_getattr(2) syscall. +// https://man7.org/linux/man-pages/man2/sched_getattr.2.html +func SchedGetAttr(pid int, flags uint) (*SchedAttr, error) { + attr := &SchedAttr{} + if err := schedGetattr(pid, attr, SizeofSchedAttr, flags); err != nil { + return nil, err + } + return attr, nil +} + /* * Unimplemented */ diff --git a/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/syscall_unix.go b/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/syscall_unix.go index 8bb30e7c..f6eda270 100644 --- a/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/syscall_unix.go +++ b/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/syscall_unix.go @@ -549,6 +549,9 @@ func SetNonblock(fd int, nonblocking bool) (err error) { if err != nil { return err } + if (flag&O_NONBLOCK != 0) == nonblocking { + return nil + } if nonblocking { flag |= O_NONBLOCK } else { diff --git a/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/zerrors_linux.go b/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/zerrors_linux.go index 3784f402..0787a043 100644 --- a/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/zerrors_linux.go +++ b/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/zerrors_linux.go @@ -2821,6 +2821,23 @@ const ( RWF_SUPPORTED = 0x1f RWF_SYNC = 0x4 RWF_WRITE_LIFE_NOT_SET = 0x0 + SCHED_BATCH = 0x3 + SCHED_DEADLINE = 0x6 + SCHED_FIFO = 0x1 + SCHED_FLAG_ALL = 0x7f + SCHED_FLAG_DL_OVERRUN = 0x4 + SCHED_FLAG_KEEP_ALL = 0x18 + SCHED_FLAG_KEEP_PARAMS = 0x10 + SCHED_FLAG_KEEP_POLICY = 0x8 + SCHED_FLAG_RECLAIM = 0x2 + SCHED_FLAG_RESET_ON_FORK = 0x1 + SCHED_FLAG_UTIL_CLAMP = 0x60 + SCHED_FLAG_UTIL_CLAMP_MAX = 0x40 + SCHED_FLAG_UTIL_CLAMP_MIN = 0x20 + SCHED_IDLE = 0x5 + SCHED_NORMAL = 0x0 + SCHED_RESET_ON_FORK = 0x40000000 + SCHED_RR = 0x2 SCM_CREDENTIALS = 0x2 SCM_RIGHTS = 0x1 SCM_TIMESTAMP = 0x1d diff --git a/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/zsyscall_linux.go b/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/zsyscall_linux.go index a07321be..14ab34a5 100644 --- a/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/zsyscall_linux.go +++ b/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/zsyscall_linux.go @@ -2197,3 +2197,23 @@ func getresgid(rgid *_C_int, egid *_C_int, sgid *_C_int) { RawSyscallNoError(SYS_GETRESGID, uintptr(unsafe.Pointer(rgid)), uintptr(unsafe.Pointer(egid)), uintptr(unsafe.Pointer(sgid))) return } + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func schedSetattr(pid int, attr *SchedAttr, flags uint) (err error) { + _, _, e1 := Syscall(SYS_SCHED_SETATTR, uintptr(pid), uintptr(unsafe.Pointer(attr)), uintptr(flags)) + if e1 != 0 { + err = errnoErr(e1) + } + return +} + +// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT + +func schedGetattr(pid int, attr *SchedAttr, size uint, flags uint) (err error) { + _, _, e1 := Syscall6(SYS_SCHED_GETATTR, uintptr(pid), uintptr(unsafe.Pointer(attr)), uintptr(size), uintptr(flags), 0, 0) + if e1 != 0 { + err = errnoErr(e1) + } + return +} diff --git a/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/ztypes_linux.go b/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/ztypes_linux.go index 26ef52aa..494493c7 100644 --- a/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/ztypes_linux.go +++ b/src/rabbitmq-upgrade-preparation/vendor/golang.org/x/sys/unix/ztypes_linux.go @@ -5868,3 +5868,18 @@ const ( VIRTIO_NET_HDR_GSO_UDP_L4 = 0x5 VIRTIO_NET_HDR_GSO_ECN = 0x80 ) + +type SchedAttr struct { + Size uint32 + Policy uint32 + Flags uint64 + Nice int32 + Priority uint32 + Runtime uint64 + Deadline uint64 + Period uint64 + Util_min uint32 + Util_max uint32 +} + +const SizeofSchedAttr = 0x38 diff --git a/src/rabbitmq-upgrade-preparation/vendor/modules.txt b/src/rabbitmq-upgrade-preparation/vendor/modules.txt index 3c33defa..fa447146 100644 --- a/src/rabbitmq-upgrade-preparation/vendor/modules.txt +++ b/src/rabbitmq-upgrade-preparation/vendor/modules.txt @@ -23,7 +23,7 @@ github.com/google/pprof/profile github.com/hashicorp/go-version # github.com/kr/pretty v0.3.0 ## explicit; go 1.12 -# github.com/onsi/ginkgo/v2 v2.12.0 +# github.com/onsi/ginkgo/v2 v2.12.1 ## explicit; go 1.18 github.com/onsi/ginkgo/v2 github.com/onsi/ginkgo/v2/config @@ -67,7 +67,7 @@ golang.org/x/net/context golang.org/x/net/html golang.org/x/net/html/atom golang.org/x/net/html/charset -# golang.org/x/sys v0.11.0 +# golang.org/x/sys v0.12.0 ## explicit; go 1.17 golang.org/x/sys/unix # golang.org/x/text v0.12.0