diff --git a/Makefile b/Makefile index 4d8b870..ae1f0cf 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ SHELL = /bin/bash export -LINT_VERSION="1.59.1" +LINT_VERSION="1.63.4" .PHONY: all all: deps lint test @@ -32,7 +32,7 @@ test: int-setup .PHONY: int-setup int-setup: int-teardown - docker run -d -p 2379:2379 --name etcd quay.io/coreos/etcd:v3.5.9 \ + docker run -d -p 2379:2379 --name etcd quay.io/coreos/etcd:v3.5.16 \ /usr/local/bin/etcd --listen-client-urls http://0.0.0.0:2379 \ --advertise-client-urls http://0.0.0.0:2379 diff --git a/go.mod b/go.mod index 6f63a58..3491735 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( go.etcd.io/etcd/api/v3 v3.5.17 go.etcd.io/etcd/client/v3 v3.5.17 go.uber.org/zap v1.27.0 - golang.org/x/net v0.33.0 + golang.org/x/net v0.34.0 ) require ( @@ -30,7 +30,7 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.17 // indirect go.uber.org/multierr v1.10.0 // indirect - golang.org/x/sys v0.28.0 // indirect + golang.org/x/sys v0.29.0 // indirect golang.org/x/text v0.21.0 // indirect google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect diff --git a/go.sum b/go.sum index 7852d6b..1438e4d 100644 --- a/go.sum +++ b/go.sum @@ -66,16 +66,16 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= +golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= diff --git a/rules/dynamic_rule_test.go b/rules/dynamic_rule_test.go index 45b8d79..12fada5 100644 --- a/rules/dynamic_rule_test.go +++ b/rules/dynamic_rule_test.go @@ -683,6 +683,7 @@ func TestProcessBooleanMap(t *testing.T) { testValue := 0 for idx, key := range keys { if values[key] { + // nolint:gosec testValue += 1 << uint((len(keys)-1)-idx) } } diff --git a/rules/etcd.go b/rules/etcd.go index 3920f79..5d2ada7 100644 --- a/rules/etcd.go +++ b/rules/etcd.go @@ -136,7 +136,7 @@ func (ev3kw *etcdV3KeyWatcher) next() (string, *string, error) { if ev3kw.ch == nil { ev3kw.ch = ev3kw.w.Watch(ev3kw.ctx, ev3kw.prefix, v3.WithPrefix()) } - if ev3kw.events == nil || len(ev3kw.events) == 0 { + if len(ev3kw.events) == 0 { select { case <-ev3kw.stopCh: ev3kw.reset() @@ -169,7 +169,7 @@ func (ev3kw *etcdV3KeyWatcher) next() (string, *string, error) { ev3kw.events = wr.Events } } - if ev3kw.events == nil || len(ev3kw.events) == 0 { + if len(ev3kw.events) == 0 { ev3kw.reset() return "", nil, errors.New("No events received from watcher channel; instantiating new channel") }