From 6c9c55774b71b83c7bc15bc1ee56306f0eb9109e Mon Sep 17 00:00:00 2001 From: Andrei Pechkurov <37772591+puzpuzpuz@users.noreply.github.com> Date: Wed, 29 Nov 2023 17:47:14 +0300 Subject: [PATCH] Update xsync to v3.0.2 (#1597) Co-authored-by: Kristoffer Dalby --- flake.nix | 6 +++--- go.mod | 2 +- go.sum | 4 ++-- integration/scenario.go | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index d03a0006..1f85489b 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ # When updating go.mod or go.sum, a new sha will need to be calculated, # update this if you have a mismatch after doing a change to thos files. - vendorSha256 = "sha256-SYb2LCCZT/p1UHwB1b0IHPfk6Sxh3UYkR4r+KjkL4F8="; + vendorHash = "sha256-p5PwNc7M5+kEMkAzpBgU3UEtb0wpXsSEMPPMnqsSh9I="; ldflags = ["-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}"]; }; @@ -47,7 +47,7 @@ sha256 = "sha256-2K9KAg8iSubiTbujyFGN3yggrL+EDyeUCs9OOta/19A="; }; - vendorSha256 = "sha256-rxYuzn4ezAxaeDhxd8qdOzt+CKYIh03A9zKNdzILq18="; + vendorHash = "sha256-rxYuzn4ezAxaeDhxd8qdOzt+CKYIh03A9zKNdzILq18="; nativeBuildInputs = [pkgs.installShellFiles]; }; @@ -69,7 +69,7 @@ sha256 = "sha256-lnNdsDCpeSHtl2lC1IhUw11t3cnGF+37qSM7HDvKLls="; }; - vendorSha256 = "sha256-dGdnDuRbwg8fU7uB5GaHEWa/zI3w06onqjturvooJQA="; + vendorHash = "sha256-dGdnDuRbwg8fU7uB5GaHEWa/zI3w06onqjturvooJQA="; nativeBuildInputs = [pkgs.installShellFiles]; diff --git a/go.mod b/go.mod index 1e2c8502..db2e110c 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/prometheus/client_golang v1.17.0 github.com/prometheus/common v0.44.0 github.com/pterm/pterm v0.12.58 - github.com/puzpuzpuz/xsync/v2 v2.4.0 + github.com/puzpuzpuz/xsync/v3 v3.0.2 github.com/rs/zerolog v1.29.0 github.com/samber/lo v1.38.1 github.com/spf13/cobra v1.7.0 diff --git a/go.sum b/go.sum index ed9d3d7e..5dee8492 100644 --- a/go.sum +++ b/go.sum @@ -429,8 +429,8 @@ github.com/pterm/pterm v0.12.36/go.mod h1:NjiL09hFhT/vWjQHSj1athJpx6H8cjpHXNAK5b github.com/pterm/pterm v0.12.40/go.mod h1:ffwPLwlbXxP+rxT0GsgDTzS3y3rmpAO1NMjUkGTYf8s= github.com/pterm/pterm v0.12.58 h1:MEImvkbvty8JvoJH64bJ+CvoCkcuRw2iBIJvRwAEgHI= github.com/pterm/pterm v0.12.58/go.mod h1:Ro9CV954hiaxt3mcpDx4a8XF5EmRDlIIpPdlfCKF9fE= -github.com/puzpuzpuz/xsync/v2 v2.4.0 h1:5sXAMHrtx1bg9nbRZTOn8T4MkWe5V+o8yKRH02Eznag= -github.com/puzpuzpuz/xsync/v2 v2.4.0/go.mod h1:gD2H2krq/w52MfPLE+Uy64TzJDVY7lP2znR9qmR35kU= +github.com/puzpuzpuz/xsync/v3 v3.0.2 h1:3yESHrRFYr6xzkz61LLkvNiPFXxJEAABanTQpKbAaew= +github.com/puzpuzpuz/xsync/v3 v3.0.2/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= diff --git a/integration/scenario.go b/integration/scenario.go index 4f7ef006..5e0ccf14 100644 --- a/integration/scenario.go +++ b/integration/scenario.go @@ -14,7 +14,7 @@ import ( "github.com/juanfont/headscale/integration/hsic" "github.com/juanfont/headscale/integration/tsic" "github.com/ory/dockertest/v3" - "github.com/puzpuzpuz/xsync/v2" + "github.com/puzpuzpuz/xsync/v3" "golang.org/x/sync/errgroup" ) @@ -162,7 +162,7 @@ func NewScenario() (*Scenario, error) { } return &Scenario{ - controlServers: xsync.NewMapOf[ControlServer](), + controlServers: xsync.NewMapOf[string, ControlServer](), users: make(map[string]*User), pool: pool,