Skip to content

Commit 3f4629d

Browse files
authored
build: update various go dependencies (scionproto#4522)
1 parent 4c9c342 commit 3f4629d

File tree

23 files changed

+1269
-1329
lines changed

23 files changed

+1269
-1329
lines changed

WORKSPACE

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
5757

5858
go_register_toolchains(
5959
nogo = "@//:nogo",
60-
version = "1.21.3",
60+
version = "1.21.10",
6161
)
6262

6363
# Gazelle

control/drkey/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ go_library(
1818
"//pkg/log:go_default_library",
1919
"//pkg/private/serrors:go_default_library",
2020
"//private/storage/cleaner:go_default_library",
21-
"@com_github_hashicorp_golang_lru//:go_default_library",
21+
"@com_github_hashicorp_golang_lru_arc_v2//:go_default_library",
2222
],
2323
)
2424

control/drkey/arc.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515
package drkey
1616

1717
import (
18-
lru "github.com/hashicorp/golang-lru"
18+
"github.com/hashicorp/golang-lru/arc/v2"
1919

2020
"github.com/scionproto/scion/pkg/private/serrors"
2121
)
2222

2323
// Level1ARC maintains an Adaptative Replacement Cache, storing
2424
// the necessary metadata to prefetch Level1 keys.
2525
type Level1ARC struct {
26-
cache *lru.ARCCache
26+
cache *arc.ARCCache[Level1PrefetchInfo, struct{}]
2727
}
2828

2929
// NewLevel1ARC returns a Level1ARC cache of a given size.
3030
func NewLevel1ARC(size int) (*Level1ARC, error) {
31-
cache, err := lru.NewARC(size)
31+
cache, err := arc.NewARC[Level1PrefetchInfo, struct{}](size)
3232
if err != nil {
3333
return nil, serrors.WrapStr("creating Level1ARC cache", err)
3434
}
@@ -47,7 +47,7 @@ func (c *Level1ARC) Update(keyPair Level1PrefetchInfo) {
4747
func (c *Level1ARC) Info() []Level1PrefetchInfo {
4848
list := []Level1PrefetchInfo{}
4949
for _, k := range c.cache.Keys() {
50-
lvl1Info := k.(Level1PrefetchInfo)
50+
lvl1Info := k
5151
list = append(list, lvl1Info)
5252
}
5353
return list

control/mgmtapi/server.gen.go

+14-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

daemon/mgmtapi/server.gen.go

+11-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dispatcher/internal/registration/udptable_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func TestUDPPortTableInsert(t *testing.T) {
126126
_, lookupOk := table.Lookup(address)
127127
SoMsg("err", err, ShouldBeNil)
128128
SoMsg("address content", retAddress, ShouldResemble, address)
129-
SoMsg("address not same object", retAddress, ShouldNotEqual, address)
129+
SoMsg("address not same object", retAddress, ShouldNotPointTo, address)
130130
SoMsg("lookup ok", lookupOk, ShouldBeTrue)
131131
})
132132
Convey("Inserting an IPv4 address with a 0 port returns an allocated port",
@@ -146,7 +146,7 @@ func TestUDPPortTableInsert(t *testing.T) {
146146
_, lookupOk := table.Lookup(address)
147147
SoMsg("err", err, ShouldBeNil)
148148
SoMsg("address content", retAddress, ShouldResemble, address)
149-
SoMsg("address not same object", retAddress, ShouldNotEqual, address)
149+
SoMsg("address not same object", retAddress, ShouldNotPointTo, address)
150150
SoMsg("lookup ok", lookupOk, ShouldBeTrue)
151151
})
152152
Convey("Inserting an IPv6 address with a 0 port returns an allocated port",

doc/command/scion-pki/scion-pki_completion_zsh.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ to enable it. You can execute the following once:
2020

2121
To load completions in your current shell session:
2222

23-
source <(scion-pki completion zsh); compdef _scion-pki scion-pki
23+
source <(scion-pki completion zsh)
2424

2525
To load completions for every new session, execute once:
2626

doc/command/scion/scion_completion_zsh.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ to enable it. You can execute the following once:
2020

2121
To load completions in your current shell session:
2222

23-
source <(scion completion zsh); compdef _scion scion
23+
source <(scion completion zsh)
2424

2525
To load completions for every new session, execute once:
2626

0 commit comments

Comments
 (0)