Merge pull request #2189 from ripienaar/go_1_22

(misc) Update to go1.22 and update dependencies
choria-io · Aug 15, 2024 · 1ef1974 · 1ef1974
2 parents a1dacb7 + 0fc921c
commit 1ef1974
Show file tree

Hide file tree

Showing 33 changed files with 186 additions and 205 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -255,4 +255,4 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.SPACES_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.SPACES_SECRET_ACCESS_KEY }}
           SOURCE_DIR: artifacts/foss
-          DEST_DIR: release
+          DEST_DIR: release
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -5,7 +5,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go: ["1.21", "1.22"]
+        go: ["1.22", "1.23"]
 
     runs-on: ubuntu-latest
     steps:

diff --git a/aagent/machine/info.go b/aagent/machine/info.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022, R.I. Pienaar and the Choria Project contributors
+// Copyright (c) 2019-2024, R.I. Pienaar and the Choria Project contributors
 //
 // SPDX-License-Identifier: Apache-2.0
 
@@ -8,7 +8,7 @@ import (
 	"crypto/md5"
 	"fmt"
 	"io"
-	"math/rand"
+	"math/rand/v2"
 	"os"
 	"strings"
 	"time"
@@ -101,7 +101,7 @@ func randStringRunes(n int) string {
 
 	b := make([]rune, n)
 	for i := range b {
-		b[i] = letterRunes[rand.Intn(len(letterRunes))]
+		b[i] = letterRunes[rand.N(len(letterRunes))]
 	}
 	return string(b)
 }

diff --git a/aagent/machine/machine.go b/aagent/machine/machine.go
@@ -8,7 +8,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"math/rand"
+	"math/rand/v2"
 	"os"
 	"path/filepath"
 	"sync"
@@ -546,7 +546,7 @@ func (m *Machine) Start(ctx context.Context, wg *sync.WaitGroup) (started chan s
 
 	runf := func() {
 		if m.SplayStart > 0 {
-			sleep := time.Duration(rand.Intn(m.SplayStart)) * time.Second
+			sleep := time.Duration(rand.N(m.SplayStart)) * time.Second
 			m.Infof(m.MachineName, "Sleeping %v before starting Autonomous Agent", sleep)
 
 			t := time.NewTimer(sleep)

diff --git a/aagent/watchers/execwatcher/exec.go b/aagent/watchers/execwatcher/exec.go
@@ -8,7 +8,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"math/rand"
+	"math/rand/v2"
 	"os"
 	"os/exec"
 	"sync"
@@ -168,7 +168,7 @@ func (w *Watcher) intervalWatcher(ctx context.Context, wg *sync.WaitGroup) {
 
 	tick := time.NewTicker(w.interval)
 	if w.properties.GatherInitialState {
-		splay := time.Duration(rand.Intn(30)) * time.Second
+		splay := rand.N(30 * time.Second)
 		w.Infof("Performing initial execution after %v", splay)
 		if splay < 1 {
 			splay = 1

diff --git a/aagent/watchers/metricwatcher/metric.go b/aagent/watchers/metricwatcher/metric.go
@@ -9,7 +9,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"math/rand"
+	"math/rand/v2"
 	"net"
 	"os"
 	"os/exec"
@@ -108,7 +108,7 @@ func (w *Watcher) Run(ctx context.Context, wg *sync.WaitGroup) {
 
 	w.Infof("metric watcher for %s starting", w.properties.Command)
 
-	splay := time.Duration(rand.Intn(int(w.properties.Interval.Seconds()))) * time.Second
+	splay := rand.N(w.properties.Interval)
 	w.Infof("Splaying first check by %v", splay)
 
 	select {

diff --git a/aagent/watchers/nagioswatcher/nagios.go b/aagent/watchers/nagioswatcher/nagios.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022, R.I. Pienaar and the Choria Project contributors
+// Copyright (c) 2020-2024, R.I. Pienaar and the Choria Project contributors
 //
 // SPDX-License-Identifier: Apache-2.0
 
@@ -9,7 +9,7 @@ import (
 	"context"
 	"fmt"
 	"html/template"
-	"math/rand"
+	"math/rand/v2"
 	"os"
 	"os/exec"
 	"strings"
@@ -282,7 +282,7 @@ func (w *Watcher) Run(ctx context.Context, wg *sync.WaitGroup) {
 func (w *Watcher) intervalWatcher(ctx context.Context, wg *sync.WaitGroup) {
 	defer wg.Done()
 
-	splay := time.Duration(rand.Intn(int(w.interval.Seconds()))) * time.Second
+	splay := rand.N(w.interval)
 	w.Infof("Splaying first check by %v", splay)
 
 	select {

diff --git a/aagent/watchers/schedulewatcher/item.go b/aagent/watchers/schedulewatcher/item.go
@@ -1,12 +1,12 @@
-// Copyright (c) 2019-2021, R.I. Pienaar and the Choria Project contributors
+// Copyright (c) 2019-2024, R.I. Pienaar and the Choria Project contributors
 //
 // SPDX-License-Identifier: Apache-2.0
 
 package schedulewatcher
 
 import (
 	"context"
-	"math/rand"
+	"math/rand/v2"
 	"sync"
 	"time"
 
@@ -58,7 +58,7 @@ func (s *scheduleItem) check(ctx context.Context) {
 
 		sleep := time.Duration(0)
 		if s.randomize > 0 {
-			sleep = time.Duration(rand.Int63n(int64(s.randomize)))
+			sleep = rand.N(s.randomize)
 			s.watcher.Infof("Splay sleeping %v before starting schedule", sleep)
 			err := util.InterruptibleSleep(ctx, sleep)
 			if err != nil {

diff --git a/aagent/watchers/timerwatcher/timer.go b/aagent/watchers/timerwatcher/timer.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022, R.I. Pienaar and the Choria Project contributors
+// Copyright (c) 2020-2024, R.I. Pienaar and the Choria Project contributors
 //
 // SPDX-License-Identifier: Apache-2.0
 
@@ -7,7 +7,7 @@ package timerwatcher
 import (
 	"context"
 	"fmt"
-	"math/rand"
+	"math/rand/v2"
 	"sync"
 	"time"
 
@@ -184,7 +184,7 @@ func (w *Watcher) validate() error {
 	}
 
 	if w.properties.Splay {
-		w.properties.Timer = time.Duration(rand.Int63n(int64(w.properties.Timer)))
+		w.properties.Timer = rand.N(w.properties.Timer)
 		w.Infof("Adjusting timer to %v due to splay setting", w.properties.Timer)
 	}
 

diff --git a/backoff/backoff.go b/backoff/backoff.go
@@ -8,7 +8,7 @@ package backoff
 
 import (
 	"context"
-	"math/rand"
+	"math/rand/v2"
 	"time"
 )
 
@@ -103,5 +103,5 @@ func jitter(millis int) int {
 		return 0
 	}
 
-	return millis/2 + rand.Intn(millis)
+	return millis/2 + rand.N(millis)
 }
diff --git a/broker/network/network_jetstream.go b/broker/network/network_jetstream.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2020-2022, R.I. Pienaar and the Choria Project contributors
+// Copyright (c) 2020-2024, R.I. Pienaar and the Choria Project contributors
 //
 // SPDX-License-Identifier: Apache-2.0
 
@@ -8,7 +8,7 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
-	"math/rand"
+	"math/rand/v2"
 	"time"
 
 	"github.com/choria-io/go-choria/backoff"
@@ -55,7 +55,7 @@ func (s *Server) configureSystemStreams(ctx context.Context) error {
 
 	cfg := s.config.Choria
 	if cfg.NetworkEventStoreReplicas == -1 || cfg.NetworkMachineStoreReplicas == -1 || cfg.NetworkStreamAdvisoryReplicas == -1 || cfg.NetworkLeaderElectionReplicas == -1 {
-		delay := time.Duration(rand.Intn(60)+10) * time.Second
+		delay := time.Duration(rand.N(60)+10) * time.Second
 		s.log.Infof("Configuring system streams after %v", delay)
 		err = backoff.Default.Sleep(ctx, delay)
 		if err != nil {

diff --git a/client/aaa_signerclient/discover.go b/client/aaa_signerclient/discover.go
@@ -1,3 +1,7 @@
+// Copyright (c) 2024, R.I. Pienaar and the Choria Project contributors
+//
+// SPDX-License-Identifier: Apache-2.0
+
 // generated code; DO NOT EDIT
 
 package aaa_signerclient
@@ -44,7 +48,7 @@ func (b *BroadcastNS) Discover(ctx context.Context, fw inter.Framework, filters
 		return out
 	}
 
-	if !(b.nodeCache == nil || len(b.nodeCache) == 0) {
+	if len(b.nodeCache) > 0 {
 		return copier(), nil
 	}
 
@@ -97,7 +101,7 @@ func (p *ExternalNS) Discover(ctx context.Context, fw inter.Framework, filters [
 		return out
 	}
 
-	if !(p.nodeCache == nil || len(p.nodeCache) == 0) {
+	if len(p.nodeCache) > 0 {
 		return copier(), nil
 	}
 
@@ -150,7 +154,7 @@ func (p *PuppetDBNS) Discover(ctx context.Context, fw inter.Framework, filters [
 		return out
 	}
 
-	if !(p.nodeCache == nil || len(p.nodeCache) == 0) {
+	if len(p.nodeCache) > 0 {
 		return copier(), nil
 	}
 
@@ -224,7 +228,7 @@ func (p *MetaNS) Discover(ctx context.Context, fw inter.Framework, _ []FilterFun
 		return out
 	}
 
-	if !(p.nodeCache == nil || len(p.nodeCache) == 0) {
+	if len(p.nodeCache) > 0 {
 		return copier(), nil
 	}
 

diff --git a/client/choria_provisionclient/discover.go b/client/choria_provisionclient/discover.go
@@ -1,3 +1,7 @@
+// Copyright (c) 2024, R.I. Pienaar and the Choria Project contributors
+//
+// SPDX-License-Identifier: Apache-2.0
+
 // generated code; DO NOT EDIT
 
 package choria_provisionclient
@@ -44,7 +48,7 @@ func (b *BroadcastNS) Discover(ctx context.Context, fw inter.Framework, filters
 		return out
 	}
 
-	if !(b.nodeCache == nil || len(b.nodeCache) == 0) {
+	if len(b.nodeCache) > 0 {
 		return copier(), nil
 	}
 
@@ -97,7 +101,7 @@ func (p *ExternalNS) Discover(ctx context.Context, fw inter.Framework, filters [
 		return out
 	}
 
-	if !(p.nodeCache == nil || len(p.nodeCache) == 0) {
+	if len(p.nodeCache) > 0 {
 		return copier(), nil
 	}
 
@@ -150,7 +154,7 @@ func (p *PuppetDBNS) Discover(ctx context.Context, fw inter.Framework, filters [
 		return out
 	}
 
-	if !(p.nodeCache == nil || len(p.nodeCache) == 0) {
+	if len(p.nodeCache) > 0 {
 		return copier(), nil
 	}
 
@@ -224,7 +228,7 @@ func (p *MetaNS) Discover(ctx context.Context, fw inter.Framework, _ []FilterFun
 		return out
 	}
 
-	if !(p.nodeCache == nil || len(p.nodeCache) == 0) {
+	if len(p.nodeCache) > 0 {
 		return copier(), nil
 	}
 

diff --git a/client/choria_registryclient/discover.go b/client/choria_registryclient/discover.go
@@ -1,3 +1,7 @@
+// Copyright (c) 2024, R.I. Pienaar and the Choria Project contributors
+//
+// SPDX-License-Identifier: Apache-2.0
+
 // generated code; DO NOT EDIT
 
 package choria_registryclient
@@ -44,7 +48,7 @@ func (b *BroadcastNS) Discover(ctx context.Context, fw inter.Framework, filters
 		return out
 	}
 
-	if !(b.nodeCache == nil || len(b.nodeCache) == 0) {
+	if len(b.nodeCache) > 0 {
 		return copier(), nil
 	}
 
@@ -97,7 +101,7 @@ func (p *ExternalNS) Discover(ctx context.Context, fw inter.Framework, filters [
 		return out
 	}
 
-	if !(p.nodeCache == nil || len(p.nodeCache) == 0) {
+	if len(p.nodeCache) > 0 {
 		return copier(), nil
 	}
 
@@ -150,7 +154,7 @@ func (p *PuppetDBNS) Discover(ctx context.Context, fw inter.Framework, filters [
 		return out
 	}
 
-	if !(p.nodeCache == nil || len(p.nodeCache) == 0) {
+	if len(p.nodeCache) > 0 {
 		return copier(), nil
 	}
 
@@ -224,7 +228,7 @@ func (p *MetaNS) Discover(ctx context.Context, fw inter.Framework, _ []FilterFun
 		return out
 	}
 
-	if !(p.nodeCache == nil || len(p.nodeCache) == 0) {
+	if len(p.nodeCache) > 0 {
 		return copier(), nil
 	}
 

diff --git a/client/choria_utilclient/discover.go b/client/choria_utilclient/discover.go
@@ -1,3 +1,7 @@
+// Copyright (c) 2024, R.I. Pienaar and the Choria Project contributors
+//
+// SPDX-License-Identifier: Apache-2.0
+
 // generated code; DO NOT EDIT
 
 package choria_utilclient
@@ -44,7 +48,7 @@ func (b *BroadcastNS) Discover(ctx context.Context, fw inter.Framework, filters
 		return out
 	}
 
-	if !(b.nodeCache == nil || len(b.nodeCache) == 0) {
+	if len(b.nodeCache) > 0 {
 		return copier(), nil
 	}
 
@@ -97,7 +101,7 @@ func (p *ExternalNS) Discover(ctx context.Context, fw inter.Framework, filters [
 		return out
 	}
 
-	if !(p.nodeCache == nil || len(p.nodeCache) == 0) {
+	if len(p.nodeCache) > 0 {
 		return copier(), nil
 	}
 
@@ -150,7 +154,7 @@ func (p *PuppetDBNS) Discover(ctx context.Context, fw inter.Framework, filters [
 		return out
 	}
 
-	if !(p.nodeCache == nil || len(p.nodeCache) == 0) {
+	if len(p.nodeCache) > 0 {
 		return copier(), nil
 	}
 
@@ -224,7 +228,7 @@ func (p *MetaNS) Discover(ctx context.Context, fw inter.Framework, _ []FilterFun
 		return out
 	}
 
-	if !(p.nodeCache == nil || len(p.nodeCache) == 0) {
+	if len(p.nodeCache) > 0 {
 		return copier(), nil
 	}