From daf82fcb53b20c0d200af748c863bd259a89623e Mon Sep 17 00:00:00 2001
From: Stephen Kitt <skitt@redhat.com>
Date: Fri, 3 May 2024 12:57:22 +0200
Subject: [PATCH] Switch to math/rand/v2

This provides more robust functions and defaults than math/rand, and
means we can avoid the complexity of crypto/rand. See
https://go.dev/blog/randv2 for context.

Signed-off-by: Stephen Kitt <skitt@redhat.com>
---
 .../smooth_weighted_round_robin_test.go       | 26 +++++--------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/coredns/loadbalancer/smooth_weighted_round_robin_test.go b/coredns/loadbalancer/smooth_weighted_round_robin_test.go
index ead1b264..92ed6ae0 100644
--- a/coredns/loadbalancer/smooth_weighted_round_robin_test.go
+++ b/coredns/loadbalancer/smooth_weighted_round_robin_test.go
@@ -19,10 +19,7 @@ limitations under the License.
 package loadbalancer_test
 
 import (
-	cryptoRand "crypto/rand"
-	"math/big"
-	"math/rand"
-	"time"
+	"math/rand/v2"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -34,24 +31,12 @@ type server struct {
 	weight int64
 }
 
-//nolint:gosec // This is only used to shuffle the list of resolvers
-var randgen = rand.New(rand.NewSource(time.Now().UnixNano()))
-
 var _ = Describe("Smooth Weighted RR", func() {
 	// Global Vars
 	var servers []server
 	var smoothTestingServers []server
 	var roundRobinServers []server
 	var lb loadbalancer.Interface
-	// Helpers
-	randInt := func() int64 {
-		maxWeight := int64(20)
-		rInt, err := cryptoRand.Int(cryptoRand.Reader, big.NewInt(maxWeight))
-		if err != nil {
-			return int64(10)
-		}
-		return rInt.Int64()
-	}
 
 	addServer := func(s server) {
 		err := lb.Add(s.name, s.weight)
@@ -126,10 +111,11 @@ var _ = Describe("Smooth Weighted RR", func() {
 			{name: "server2", weight: 1},
 			{name: "server3", weight: 1},
 		}
+		maxWeight := int64(20)
 		servers = []server{
-			{name: "server1", weight: randInt()},
-			{name: "server2", weight: randInt()},
-			{name: "server3", weight: randInt()},
+			{name: "server1", weight: rand.N(maxWeight)},
+			{name: "server2", weight: rand.N(maxWeight)},
+			{name: "server3", weight: rand.N(maxWeight)},
 		}
 		roundRobinServers = []server{
 			{name: "server1", weight: 1},
@@ -137,7 +123,7 @@ var _ = Describe("Smooth Weighted RR", func() {
 			{name: "server3", weight: 1},
 		}
 
-		randgen.Shuffle(len(servers), func(i, j int) { servers[i], servers[j] = servers[j], servers[i] })
+		rand.Shuffle(len(servers), func(i, j int) { servers[i], servers[j] = servers[j], servers[i] })
 	})
 
 	When("first created", func() {