From cbe9acf21bd0c3641e31943b3558ee58ba974157 Mon Sep 17 00:00:00 2001 From: Evan Simkowitz Date: Mon, 26 Feb 2024 11:39:04 -0800 Subject: [PATCH] Update go-github to latest version and tidy up dependencies (#337) --- acknowledgements/disclaimers/backend.md | 8 ++++---- waveshell/go.mod | 6 ++++-- waveshell/go.sum | 13 +++++++++---- wavesrv/go.mod | 6 ++++-- wavesrv/go.sum | 15 ++++++++------- wavesrv/pkg/releasechecker/releasechecker.go | 2 +- 6 files changed, 30 insertions(+), 20 deletions(-) diff --git a/acknowledgements/disclaimers/backend.md b/acknowledgements/disclaimers/backend.md index 8d050047..821738c4 100644 --- a/acknowledgements/disclaimers/backend.md +++ b/acknowledgements/disclaimers/backend.md @@ -179,11 +179,11 @@ THE SOFTWARE. ----- -## github.com/google/go-github/v57/github +## github.com/google/go-github/v59/github -* Name: github.com/google/go-github/v57/github -* Version: v57.0.0 -* License: [BSD-3-Clause](https://github.com/google/go-github/blob/v57.0.0/LICENSE) +* Name: github.com/google/go-github/v59/github +* Version: v59.0.0 +* License: [BSD-3-Clause](https://github.com/google/go-github/blob/v59.0.0/LICENSE) ```txt Copyright (c) 2013 The go-github AUTHORS. All rights reserved. diff --git a/waveshell/go.mod b/waveshell/go.mod index a199d79b..80e17c83 100644 --- a/waveshell/go.mod +++ b/waveshell/go.mod @@ -7,7 +7,9 @@ require ( github.com/creack/pty v1.1.18 github.com/fsnotify/fsnotify v1.6.0 github.com/google/uuid v1.3.0 - golang.org/x/mod v0.5.1 - golang.org/x/sys v0.10.0 + github.com/wavetermdev/waveterm/wavesrv v0.0.0-20240226180630-aeb7195eff05 + golang.org/x/crypto v0.17.0 + golang.org/x/mod v0.10.0 + golang.org/x/sys v0.15.0 mvdan.cc/sh/v3 v3.7.0 ) diff --git a/waveshell/go.sum b/waveshell/go.sum index 9897e263..72af9b8f 100644 --- a/waveshell/go.sum +++ b/waveshell/go.sum @@ -11,10 +11,15 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/rogpeppe/go-internal v1.10.1-0.20230524175051-ec119421bb97 h1:3RPlVWzZ/PDqmVuf/FKHARG5EMid/tl7cv54Sw/QRVY= -golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38= -golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +github.com/wavetermdev/waveterm/wavesrv v0.0.0-20240226180630-aeb7195eff05 h1:B59fk0xq5a2/uzegDXHtVMuO+BFMpIFGF6Kcd98NPGA= +github.com/wavetermdev/waveterm/wavesrv v0.0.0-20240226180630-aeb7195eff05/go.mod h1:p1NZ9qM21Y3wqFfthXik0oNTeUGp0xcZAqJ2/DDPiN0= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= +golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= mvdan.cc/sh/v3 v3.7.0 h1:lSTjdP/1xsddtaKfGg7Myu7DnlHItd3/M2tomOcNNBg= mvdan.cc/sh/v3 v3.7.0/go.mod h1:K2gwkaesF/D7av7Kxl0HbF5kGOd2ArupNTX3X44+8l8= diff --git a/wavesrv/go.mod b/wavesrv/go.mod index a9864deb..33371d98 100644 --- a/wavesrv/go.mod +++ b/wavesrv/go.mod @@ -6,12 +6,13 @@ require ( github.com/alessio/shellescape v1.4.1 github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 github.com/creack/pty v1.1.18 - github.com/kevinburke/ssh_config v1.2.0 github.com/golang-migrate/migrate/v4 v4.16.2 + github.com/google/go-github/v59 v59.0.0 github.com/google/uuid v1.3.0 github.com/gorilla/mux v1.8.0 github.com/gorilla/websocket v1.5.0 github.com/jmoiron/sqlx v1.3.5 + github.com/kevinburke/ssh_config v1.2.0 github.com/mattn/go-sqlite3 v1.14.16 github.com/sashabaranov/go-openai v1.9.0 github.com/sawka/txwrap v0.1.2 @@ -23,11 +24,12 @@ require ( ) require ( - github.com/google/go-github/v57 v57.0.0 // indirect + github.com/google/go-querystring v1.1.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect go.uber.org/atomic v1.7.0 // indirect ) replace github.com/wavetermdev/waveterm/waveshell => ../waveshell + replace github.com/kevinburke/ssh_config => github.com/wavetermdev/ssh_config v0.0.0-20240109090616-36c8da3d7376 diff --git a/wavesrv/go.sum b/wavesrv/go.sum index 4f3cde78..ea28360b 100644 --- a/wavesrv/go.sum +++ b/wavesrv/go.sum @@ -12,10 +12,12 @@ github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfC github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/golang-migrate/migrate/v4 v4.16.2 h1:8coYbMKUyInrFk1lfGfRovTLAW7PhWp8qQDT2iKfuoA= github.com/golang-migrate/migrate/v4 v4.16.2/go.mod h1:pfcJX4nPHaVdc5nmdCikFBWtm+UBpiZjRNNsyBbp0/o= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-github/v57 v57.0.0 h1:L+Y3UPTY8ALM8x+TV0lg+IEBI+upibemtBD8Q9u7zHs= -github.com/google/go-github/v57 v57.0.0/go.mod h1:s0omdnye0hvK/ecLvpsGfJMiRt85PimQh4oygmLIxHw= +github.com/google/go-github/v59 v59.0.0 h1:7h6bgpF5as0YQLLkEiVqpgtJqjimMYhBkD4jT5aN3VA= +github.com/google/go-github/v59 v59.0.0/go.mod h1:rJU4R0rQHFVFDOkqGWxfLNo6vEk4dv40oDjhV/gH6wM= +github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= +github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= @@ -46,18 +48,17 @@ github.com/sawka/txwrap v0.1.2/go.mod h1:T3nlw2gVpuolo6/XEetvBbk1oMXnY978YmBFy1U github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/wavetermdev/ssh_config v0.0.0-20240109090616-36c8da3d7376 h1:tFhJgTu7lgd+hldLfPSzDCoWUpXI8wHKR3rxq5jTLkQ= +github.com/wavetermdev/ssh_config v0.0.0-20240109090616-36c8da3d7376/go.mod h1:q2RIzfka+BXARoNexmF9gkxEX7DmvbW9P4hIVx2Kg4M= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= -golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= mvdan.cc/sh/v3 v3.7.0 h1:lSTjdP/1xsddtaKfGg7Myu7DnlHItd3/M2tomOcNNBg= diff --git a/wavesrv/pkg/releasechecker/releasechecker.go b/wavesrv/pkg/releasechecker/releasechecker.go index 0e3db34b..40a7e0aa 100644 --- a/wavesrv/pkg/releasechecker/releasechecker.go +++ b/wavesrv/pkg/releasechecker/releasechecker.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - "github.com/google/go-github/v57/github" + "github.com/google/go-github/v59/github" "golang.org/x/mod/semver" "github.com/wavetermdev/waveterm/wavesrv/pkg/scbase"