From cca7d233631324a95cfc18cffb716111fd09c558 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Scha=CC=88fer?= <101886095+PeterSchafer@users.noreply.github.com> Date: Fri, 17 Nov 2023 15:51:02 +0100 Subject: [PATCH 1/2] fix: possible lsp disconnects on proxy errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit through upgrade of GAF which upgrades go-httpauth which doesn’t print to stdout anymore. --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index c186fb742..4779aa4ab 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 github.com/segmentio/analytics-go v3.1.0+incompatible github.com/shirou/gopsutil v3.21.11+incompatible - github.com/snyk/go-application-framework v0.0.0-20231114142955-fb50b21b5094 + github.com/snyk/go-application-framework v0.0.0-20231117140310-1e2fcc4e82df github.com/sourcegraph/go-lsp v0.0.0-20200429204803-219e11d77f5d github.com/stretchr/testify v1.8.4 github.com/subosito/gotenv v1.6.0 @@ -44,7 +44,7 @@ require ( github.com/jcmturner/goidentity/v6 v6.0.1 // indirect github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect github.com/jcmturner/rpc/v2 v2.0.3 // indirect - github.com/snyk/go-httpauth v0.0.0-20230726132335-d454674305a7 // indirect + github.com/snyk/go-httpauth v0.0.0-20231117135515-eb445fea7530 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect diff --git a/go.sum b/go.sum index 419c45e32..07e5c3001 100644 --- a/go.sum +++ b/go.sum @@ -368,10 +368,10 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/snyk/go-application-framework v0.0.0-20231114142955-fb50b21b5094 h1:+zM9BECjrN5M2I53h97mCavnDaQc30Qk6NBSrGMzuIs= -github.com/snyk/go-application-framework v0.0.0-20231114142955-fb50b21b5094/go.mod h1:YGuE2uaW3PG7Q3CcVpCdu/tOFhv5eUjcTNlYIcw6FDo= -github.com/snyk/go-httpauth v0.0.0-20230726132335-d454674305a7 h1:m8C34vcouY2vEvow2gV/uAZ0LKiV7vhwC5HI15nUDX4= -github.com/snyk/go-httpauth v0.0.0-20230726132335-d454674305a7/go.mod h1:88KbbvGYlmLgee4OcQ19yr0bNpXpOr2kciOthaSzCAg= +github.com/snyk/go-application-framework v0.0.0-20231117140310-1e2fcc4e82df h1:Kx+Lw+4g+P6UHKgfTeSoBHKAKbRDoVaQ6xsMjmxJqvc= +github.com/snyk/go-application-framework v0.0.0-20231117140310-1e2fcc4e82df/go.mod h1:Yz/qxFyfhf0xbA+z8Vzr5IM9IDG+BS+2PiGaP1yAsEw= +github.com/snyk/go-httpauth v0.0.0-20231117135515-eb445fea7530 h1:s9PHNkL6ueYRiAKNfd8OVxlUOqU3qY0VDbgCD1f6WQY= +github.com/snyk/go-httpauth v0.0.0-20231117135515-eb445fea7530/go.mod h1:88KbbvGYlmLgee4OcQ19yr0bNpXpOr2kciOthaSzCAg= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/sourcegraph/go-lsp v0.0.0-20200429204803-219e11d77f5d h1:afLbh+ltiygTOB37ymZVwKlJwWZn+86syPTbrrOAydY= github.com/sourcegraph/go-lsp v0.0.0-20200429204803-219e11d77f5d/go.mod h1:SULmZY7YNBsvNiQbrb/BEDdEJ84TGnfyUQxaHt8t8rY= From 449d5c51e6541013d2546a5a8e93c0c35c7cde0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Scha=CC=88fer?= <101886095+PeterSchafer@users.noreply.github.com> Date: Fri, 17 Nov 2023 18:22:53 +0100 Subject: [PATCH 2/2] chore: update to final GAF commit --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4779aa4ab..364dfb622 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 github.com/segmentio/analytics-go v3.1.0+incompatible github.com/shirou/gopsutil v3.21.11+incompatible - github.com/snyk/go-application-framework v0.0.0-20231117140310-1e2fcc4e82df + github.com/snyk/go-application-framework v0.0.0-20231117172046-78850b04ac34 github.com/sourcegraph/go-lsp v0.0.0-20200429204803-219e11d77f5d github.com/stretchr/testify v1.8.4 github.com/subosito/gotenv v1.6.0 diff --git a/go.sum b/go.sum index 07e5c3001..876926f71 100644 --- a/go.sum +++ b/go.sum @@ -368,8 +368,8 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/snyk/go-application-framework v0.0.0-20231117140310-1e2fcc4e82df h1:Kx+Lw+4g+P6UHKgfTeSoBHKAKbRDoVaQ6xsMjmxJqvc= -github.com/snyk/go-application-framework v0.0.0-20231117140310-1e2fcc4e82df/go.mod h1:Yz/qxFyfhf0xbA+z8Vzr5IM9IDG+BS+2PiGaP1yAsEw= +github.com/snyk/go-application-framework v0.0.0-20231117172046-78850b04ac34 h1:HqIcp46MUaRNANt3x/KKZEOoNlPFigqBThcZWJsMMKQ= +github.com/snyk/go-application-framework v0.0.0-20231117172046-78850b04ac34/go.mod h1:Yz/qxFyfhf0xbA+z8Vzr5IM9IDG+BS+2PiGaP1yAsEw= github.com/snyk/go-httpauth v0.0.0-20231117135515-eb445fea7530 h1:s9PHNkL6ueYRiAKNfd8OVxlUOqU3qY0VDbgCD1f6WQY= github.com/snyk/go-httpauth v0.0.0-20231117135515-eb445fea7530/go.mod h1:88KbbvGYlmLgee4OcQ19yr0bNpXpOr2kciOthaSzCAg= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=