From 756b71b7d2b0a995a31d070c4226c2c083e7e676 Mon Sep 17 00:00:00 2001 From: Seth Hoenig Date: Thu, 20 Oct 2022 08:11:43 -0500 Subject: [PATCH] deps: bump shoenig for str func bugfixes (#14974) And fix the one place we use them. --- api/go.mod | 2 +- api/go.sum | 4 ++-- command/agent/consul/unit_test.go | 6 +++--- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/api/go.mod b/api/go.mod index c2bd22f9e..9b67c0a86 100644 --- a/api/go.mod +++ b/api/go.mod @@ -11,7 +11,7 @@ require ( github.com/kr/pretty v0.3.0 github.com/mitchellh/go-testing-interface v1.14.1 github.com/mitchellh/mapstructure v1.5.0 - github.com/shoenig/test v0.4.1 + github.com/shoenig/test v0.4.3 github.com/stretchr/testify v1.8.0 ) diff --git a/api/go.sum b/api/go.sum index 1a3312ef0..2afda407c 100644 --- a/api/go.sum +++ b/api/go.sum @@ -31,8 +31,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/shoenig/test v0.4.1 h1:vlqABGWDnsAL8vO0/vO8IVk6hz6Zo5u9xAFhDcVXnUc= -github.com/shoenig/test v0.4.1/go.mod h1:xYtyGBC5Q3kzCNyJg/SjgNpfAa2kvmgA0i5+lQso8x0= +github.com/shoenig/test v0.4.3 h1:3+CjrpqCwtL08S0wZQilu9WWR/S2CdsLKhHjbJqPj/I= +github.com/shoenig/test v0.4.3/go.mod h1:xYtyGBC5Q3kzCNyJg/SjgNpfAa2kvmgA0i5+lQso8x0= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= diff --git a/command/agent/consul/unit_test.go b/command/agent/consul/unit_test.go index 13e6de9ef..23c5ea79d 100644 --- a/command/agent/consul/unit_test.go +++ b/command/agent/consul/unit_test.go @@ -268,9 +268,9 @@ func TestConsul_ChangePorts(t *testing.T) { } } - must.StrHasPrefix(t, origTCPKey, "_nomad-check-") - must.StrHasPrefix(t, origScriptKey, "_nomad-check-") - must.StrHasPrefix(t, origHTTPKey, "_nomad-check-") + must.StrHasPrefix(t, "_nomad-check-", origTCPKey) + must.StrHasPrefix(t, "_nomad-check-", origScriptKey) + must.StrHasPrefix(t, "_nomad-check-", origHTTPKey) // Now update the PortLabel on the Service and Check c3 origWorkload := ctx.Workload.Copy() diff --git a/go.mod b/go.mod index 950482e29..96d385768 100644 --- a/go.mod +++ b/go.mod @@ -110,7 +110,7 @@ require ( github.com/ryanuber/go-glob v1.0.0 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 github.com/shirou/gopsutil/v3 v3.22.8 - github.com/shoenig/test v0.4.1 + github.com/shoenig/test v0.4.3 github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c github.com/stretchr/testify v1.8.0 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 diff --git a/go.sum b/go.sum index d355da53f..39bc6ece5 100644 --- a/go.sum +++ b/go.sum @@ -1166,8 +1166,8 @@ github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/shirou/gopsutil/v3 v3.22.8 h1:a4s3hXogo5mE2PfdfJIonDbstO/P+9JszdfhAHSzD9Y= github.com/shirou/gopsutil/v3 v3.22.8/go.mod h1:s648gW4IywYzUfE/KjXxUsqrqx/T2xO5VqOXxONeRfI= -github.com/shoenig/test v0.4.1 h1:vlqABGWDnsAL8vO0/vO8IVk6hz6Zo5u9xAFhDcVXnUc= -github.com/shoenig/test v0.4.1/go.mod h1:xYtyGBC5Q3kzCNyJg/SjgNpfAa2kvmgA0i5+lQso8x0= +github.com/shoenig/test v0.4.3 h1:3+CjrpqCwtL08S0wZQilu9WWR/S2CdsLKhHjbJqPj/I= +github.com/shoenig/test v0.4.3/go.mod h1:xYtyGBC5Q3kzCNyJg/SjgNpfAa2kvmgA0i5+lQso8x0= github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=