build: update various go dependencies (#4522)

scionproto · May 14, 2024 · 3f4629d · 3f4629d
1 parent 4c9c342
commit 3f4629d
Show file tree

Hide file tree

Showing 23 changed files with 1,269 additions and 1,329 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -57,7 +57,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
 
 go_register_toolchains(
     nogo = "@//:nogo",
-    version = "1.21.3",
+    version = "1.21.10",
 )
 
 # Gazelle

diff --git a/control/drkey/BUILD.bazel b/control/drkey/BUILD.bazel
@@ -18,7 +18,7 @@ go_library(
         "//pkg/log:go_default_library",
         "//pkg/private/serrors:go_default_library",
         "//private/storage/cleaner:go_default_library",
-        "@com_github_hashicorp_golang_lru//:go_default_library",
+        "@com_github_hashicorp_golang_lru_arc_v2//:go_default_library",
     ],
 )
 

diff --git a/control/drkey/arc.go b/control/drkey/arc.go
@@ -15,20 +15,20 @@
 package drkey
 
 import (
-	lru "github.com/hashicorp/golang-lru"
+	"github.com/hashicorp/golang-lru/arc/v2"
 
 	"github.com/scionproto/scion/pkg/private/serrors"
 )
 
 // Level1ARC maintains an Adaptative Replacement Cache, storing
 // the necessary metadata to prefetch Level1 keys.
 type Level1ARC struct {
-	cache *lru.ARCCache
+	cache *arc.ARCCache[Level1PrefetchInfo, struct{}]
 }
 
 // NewLevel1ARC returns a Level1ARC cache of a given size.
 func NewLevel1ARC(size int) (*Level1ARC, error) {
-	cache, err := lru.NewARC(size)
+	cache, err := arc.NewARC[Level1PrefetchInfo, struct{}](size)
 	if err != nil {
 		return nil, serrors.WrapStr("creating Level1ARC cache", err)
 	}
@@ -47,7 +47,7 @@ func (c *Level1ARC) Update(keyPair Level1PrefetchInfo) {
 func (c *Level1ARC) Info() []Level1PrefetchInfo {
 	list := []Level1PrefetchInfo{}
 	for _, k := range c.cache.Keys() {
-		lvl1Info := k.(Level1PrefetchInfo)
+		lvl1Info := k
 		list = append(list, lvl1Info)
 	}
 	return list

diff --git a/control/mgmtapi/server.gen.go b/control/mgmtapi/server.gen.go
diff --git a/daemon/mgmtapi/server.gen.go b/daemon/mgmtapi/server.gen.go
diff --git a/dispatcher/internal/registration/udptable_test.go b/dispatcher/internal/registration/udptable_test.go
@@ -126,7 +126,7 @@ func TestUDPPortTableInsert(t *testing.T) {
 					_, lookupOk := table.Lookup(address)
 					SoMsg("err", err, ShouldBeNil)
 					SoMsg("address content", retAddress, ShouldResemble, address)
-					SoMsg("address not same object", retAddress, ShouldNotEqual, address)
+					SoMsg("address not same object", retAddress, ShouldNotPointTo, address)
 					SoMsg("lookup ok", lookupOk, ShouldBeTrue)
 				})
 			Convey("Inserting an IPv4 address with a 0 port returns an allocated port",
@@ -146,7 +146,7 @@ func TestUDPPortTableInsert(t *testing.T) {
 					_, lookupOk := table.Lookup(address)
 					SoMsg("err", err, ShouldBeNil)
 					SoMsg("address content", retAddress, ShouldResemble, address)
-					SoMsg("address not same object", retAddress, ShouldNotEqual, address)
+					SoMsg("address not same object", retAddress, ShouldNotPointTo, address)
 					SoMsg("lookup ok", lookupOk, ShouldBeTrue)
 				})
 			Convey("Inserting an IPv6 address with a 0 port returns an allocated port",

diff --git a/doc/command/scion-pki/scion-pki_completion_zsh.rst b/doc/command/scion-pki/scion-pki_completion_zsh.rst
@@ -20,7 +20,7 @@ to enable it.  You can execute the following once:
 
 To load completions in your current shell session:
 
-	source <(scion-pki completion zsh); compdef _scion-pki scion-pki
+	source <(scion-pki completion zsh)
 
 To load completions for every new session, execute once:
 

diff --git a/doc/command/scion/scion_completion_zsh.rst b/doc/command/scion/scion_completion_zsh.rst
@@ -20,7 +20,7 @@ to enable it.  You can execute the following once:
 
 To load completions in your current shell session:
 
-	source <(scion completion zsh); compdef _scion scion
+	source <(scion completion zsh)
 
 To load completions for every new session, execute once: