From d9d6fdd88c132e4ae7289c0f0be2e53fdeeba78c Mon Sep 17 00:00:00 2001 From: Jehiah Czebotar Date: Tue, 11 Jul 2023 12:50:25 -0400 Subject: [PATCH 1/3] golang.org/x/sys v0.10.0 --- go.mod | 7 +++++-- go.sum | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index e26153d97..8a2197ccd 100644 --- a/go.mod +++ b/go.mod @@ -8,14 +8,17 @@ require ( github.com/bitly/timer_metrics v1.0.0 github.com/blang/semver v3.5.1+incompatible github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b - github.com/davecgh/go-spew v1.1.1 // indirect github.com/golang/snappy v0.0.4 github.com/judwhite/go-svc v1.2.1 github.com/julienschmidt/httprouter v1.3.0 github.com/mreiferson/go-options v1.0.0 github.com/nsqio/go-diskqueue v1.1.0 github.com/nsqio/go-nsq v1.1.0 - golang.org/x/sys v0.0.0-20211023085530-d6a326fbbf70 // indirect +) + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + golang.org/x/sys v0.10.0 // indirect ) replace github.com/judwhite/go-svc => github.com/mreiferson/go-svc v1.2.2-0.20210815184239-7a96e00010f6 diff --git a/go.sum b/go.sum index 75530588e..586ab16f8 100644 --- a/go.sum +++ b/go.sum @@ -32,6 +32,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20211023085530-d6a326fbbf70 h1:SeSEfdIxyvwGJliREIJhRPPXvW6sDlLT+UQ3B0hD0NA= golang.org/x/sys v0.0.0-20211023085530-d6a326fbbf70/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= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From c361ec0cb2e616b2e28aba0755d4bbadf7b8ad9d Mon Sep 17 00:00:00 2001 From: Jehiah Czebotar Date: Tue, 11 Jul 2023 12:51:35 -0400 Subject: [PATCH 2/3] github.com/BurntSushi/toml v1.3.2 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 8a2197ccd..247d4c928 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/nsqio/nsq go 1.17 require ( - github.com/BurntSushi/toml v0.4.1 + github.com/BurntSushi/toml v1.3.2 github.com/bitly/go-hostpool v0.1.0 github.com/bitly/timer_metrics v1.0.0 github.com/blang/semver v3.5.1+incompatible diff --git a/go.sum b/go.sum index 586ab16f8..eb4b44846 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw= github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= +github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/bitly/go-hostpool v0.1.0 h1:XKmsF6k5el6xHG3WPJ8U0Ku/ye7njX7W81Ng7O2ioR0= github.com/bitly/go-hostpool v0.1.0/go.mod h1:4gOCgp6+NZnVqlKyZ/iBZFTAJKembaVENUpMkpg42fw= github.com/bitly/timer_metrics v1.0.0 h1:bbszVIl0vT5+/cdZx8L4KOQmM8mC/0y3EBICGSxyhCk= From f1aa9468df99f944c3ed6b9b1073bcc515e9134d Mon Sep 17 00:00:00 2001 From: Matt Reiferson Date: Sun, 16 Jul 2023 13:07:21 -0700 Subject: [PATCH 3/3] *: fix deprecated use of toml.DecodeReader --- apps/nsqd/main_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/nsqd/main_test.go b/apps/nsqd/main_test.go index 4f0837e8a..bef345eed 100644 --- a/apps/nsqd/main_test.go +++ b/apps/nsqd/main_test.go @@ -25,7 +25,7 @@ func TestConfigFlagParsing(t *testing.T) { t.Fatalf("%s", err) } defer f.Close() - toml.DecodeReader(f, &cfg) + toml.NewDecoder(f).Decode(&cfg) cfg["log_level"] = "debug" cfg.Validate()