mirror of
https://github.com/moby/buildkit.git
synced 2026-08-07 08:10:44 +00:00
remove deprecated seed calls
Not needed since go1.20 Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
@@ -16,7 +16,6 @@ import (
|
||||
"sync"
|
||||
|
||||
"github.com/containerd/containerd/defaults"
|
||||
"github.com/containerd/containerd/pkg/seed" //nolint:staticcheck // SA1019 deprecated
|
||||
"github.com/containerd/containerd/pkg/userns"
|
||||
"github.com/containerd/containerd/platforms"
|
||||
"github.com/containerd/containerd/remotes/docker"
|
||||
@@ -81,8 +80,6 @@ func init() {
|
||||
apicaps.ExportedProduct = "buildkit"
|
||||
stack.SetVersionInfo(version.Version, version.Revision)
|
||||
|
||||
//nolint:staticcheck // SA1019 deprecated
|
||||
seed.WithTimeAndRand()
|
||||
if reexec.Init() {
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
@@ -22,7 +22,6 @@ import (
|
||||
)
|
||||
|
||||
func init() {
|
||||
rand.Seed(time.Now().UnixNano()) //nolint:staticcheck // Ignore SA1019. No way to get the automatically generated seed since Go 1.20.
|
||||
if debugScheduler {
|
||||
logrus.SetOutput(os.Stdout)
|
||||
logrus.SetLevel(logrus.DebugLevel)
|
||||
|
||||
43
vendor/github.com/containerd/containerd/pkg/seed/seed.go
generated
vendored
43
vendor/github.com/containerd/containerd/pkg/seed/seed.go
generated
vendored
@@ -1,43 +0,0 @@
|
||||
/*
|
||||
Copyright The containerd Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
// Package seed provides an initializer for the global [math/rand] seed.
|
||||
//
|
||||
// Deprecated: Do not rely on the global seed.
|
||||
package seed
|
||||
|
||||
import (
|
||||
"math/rand"
|
||||
"time"
|
||||
)
|
||||
|
||||
// WithTimeAndRand seeds the global math rand generator with nanoseconds
|
||||
// XOR'ed with a crypto component if available for uniqueness.
|
||||
//
|
||||
// Deprecated: Do not rely on the global seed.
|
||||
func WithTimeAndRand() {
|
||||
var (
|
||||
b [4]byte
|
||||
u int64
|
||||
)
|
||||
|
||||
tryReadRandom(b[:])
|
||||
|
||||
// Set higher 32 bits, bottom 32 will be set with nanos
|
||||
u |= (int64(b[0]) << 56) | (int64(b[1]) << 48) | (int64(b[2]) << 40) | (int64(b[3]) << 32)
|
||||
|
||||
rand.Seed(u ^ time.Now().UnixNano())
|
||||
}
|
||||
24
vendor/github.com/containerd/containerd/pkg/seed/seed_linux.go
generated
vendored
24
vendor/github.com/containerd/containerd/pkg/seed/seed_linux.go
generated
vendored
@@ -1,24 +0,0 @@
|
||||
/*
|
||||
Copyright The containerd Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package seed
|
||||
|
||||
import "golang.org/x/sys/unix"
|
||||
|
||||
func tryReadRandom(p []byte) {
|
||||
// Ignore errors, just decreases uniqueness of seed
|
||||
unix.Getrandom(p, unix.GRND_NONBLOCK)
|
||||
}
|
||||
28
vendor/github.com/containerd/containerd/pkg/seed/seed_other.go
generated
vendored
28
vendor/github.com/containerd/containerd/pkg/seed/seed_other.go
generated
vendored
@@ -1,28 +0,0 @@
|
||||
//go:build !linux
|
||||
|
||||
/*
|
||||
Copyright The containerd Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package seed
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"io"
|
||||
)
|
||||
|
||||
func tryReadRandom(p []byte) {
|
||||
io.ReadFull(rand.Reader, p)
|
||||
}
|
||||
1
vendor/modules.txt
vendored
1
vendor/modules.txt
vendored
@@ -314,7 +314,6 @@ github.com/containerd/containerd/pkg/kmutex
|
||||
github.com/containerd/containerd/pkg/randutil
|
||||
github.com/containerd/containerd/pkg/runtimeoptions/v1
|
||||
github.com/containerd/containerd/pkg/seccomp
|
||||
github.com/containerd/containerd/pkg/seed
|
||||
github.com/containerd/containerd/pkg/snapshotters
|
||||
github.com/containerd/containerd/pkg/streaming
|
||||
github.com/containerd/containerd/pkg/transfer
|
||||
|
||||
Reference in New Issue
Block a user