From 13c445bd4582045da017e7f12576a505f9324e42 Mon Sep 17 00:00:00 2001 From: Nick Cabatoff Date: Wed, 22 Jan 2025 14:30:03 -0500 Subject: [PATCH] Websocket lib has moved, see https://coder.com/blog/websocket. (#29386) --- command/agentproxyshared/cache/static_secret_cache_updater.go | 2 +- .../cache/static_secret_cache_updater_test.go | 2 +- command/events.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/command/agentproxyshared/cache/static_secret_cache_updater.go b/command/agentproxyshared/cache/static_secret_cache_updater.go index 9d316deee88d..63f5507051a8 100644 --- a/command/agentproxyshared/cache/static_secret_cache_updater.go +++ b/command/agentproxyshared/cache/static_secret_cache_updater.go @@ -17,6 +17,7 @@ import ( "sync/atomic" "time" + "github.com/coder/websocket" "github.com/hashicorp/go-hclog" "github.com/hashicorp/go-multierror" "github.com/hashicorp/vault/api" @@ -26,7 +27,6 @@ import ( "github.com/hashicorp/vault/helper/useragent" "github.com/hashicorp/vault/sdk/logical" "golang.org/x/exp/maps" - "nhooyr.io/websocket" ) // Example write event (this does not contain all possible fields): diff --git a/command/agentproxyshared/cache/static_secret_cache_updater_test.go b/command/agentproxyshared/cache/static_secret_cache_updater_test.go index a115fe608ba5..4a40b2546efa 100644 --- a/command/agentproxyshared/cache/static_secret_cache_updater_test.go +++ b/command/agentproxyshared/cache/static_secret_cache_updater_test.go @@ -12,6 +12,7 @@ import ( "testing" "time" + "github.com/coder/websocket" "github.com/hashicorp/go-hclog" kv "github.com/hashicorp/vault-plugin-secrets-kv" "github.com/hashicorp/vault/api" @@ -26,7 +27,6 @@ import ( "github.com/hashicorp/vault/vault" "github.com/stretchr/testify/require" "go.uber.org/atomic" - "nhooyr.io/websocket" ) // Avoiding a circular dependency in the test. diff --git a/command/events.go b/command/events.go index 48f1fdd22681..f710fb72c4be 100644 --- a/command/events.go +++ b/command/events.go @@ -11,10 +11,10 @@ import ( "os" "strings" + "github.com/coder/websocket" "github.com/hashicorp/cli" "github.com/hashicorp/vault/api" "github.com/posener/complete" - "nhooyr.io/websocket" ) var ( diff --git a/go.mod b/go.mod index 5f847c269bec..d0dbfa84b04a 100644 --- a/go.mod +++ b/go.mod @@ -55,6 +55,7 @@ require ( github.com/cenkalti/backoff/v3 v3.2.2 github.com/chrismalek/oktasdk-go v0.0.0-20181212195951-3430665dfaa0 github.com/cockroachdb/cockroach-go/v2 v2.3.8 + github.com/coder/websocket v1.8.12 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf github.com/denisenkom/go-mssqldb v0.12.3 github.com/docker/docker v27.2.1+incompatible @@ -232,7 +233,6 @@ require ( k8s.io/apimachinery v0.31.0 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 layeh.com/radius v0.0.0-20231213012653-1006025d24f8 - nhooyr.io/websocket v1.8.11 ) require ( diff --git a/go.sum b/go.sum index 1569eee1366b..1e4c57272ef0 100644 --- a/go.sum +++ b/go.sum @@ -927,6 +927,8 @@ github.com/cockroachdb/cockroach-go/v2 v2.3.8 h1:53yoUo4+EtrC1NrAEgnnad4AS3ntNvG github.com/cockroachdb/cockroach-go/v2 v2.3.8/go.mod h1:9uH5jK4yQ3ZQUT9IXe4I2fHzMIF5+JC/oOdzTRgJYJk= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 h1:sDMmm+q/3+BukdIpxwO365v/Rbspp2Nt5XntgQRXq8Q= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= +github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo= +github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs= github.com/containerd/continuity v0.4.3 h1:6HVkalIp+2u1ZLH1J/pYX2oBVXlJZvh1X1A7bEZ9Su8= github.com/containerd/continuity v0.4.3/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= @@ -3169,8 +3171,6 @@ modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw modernc.org/tcl v1.13.1/go.mod h1:XOLfOwzhkljL4itZkK6T72ckMgvj0BDsnKNdZVUOecw= modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= modernc.org/z v1.5.1/go.mod h1:eWFB510QWW5Th9YGZT81s+LwvaAs3Q2yr4sP0rmLkv8= -nhooyr.io/websocket v1.8.11 h1:f/qXNc2/3DpoSZkHt1DQu6rj4zGC8JmkkLkWss0MgN0= -nhooyr.io/websocket v1.8.11/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=