diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 802e3f895f..94931957f8 100755 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -23,7 +23,7 @@ assignees: "" -- Go Version: 1.18.1 +- Go Version: 1.18.2 - Docker Version: 20.10.8 - Kubernetes Version: 1.22.0 - NGT Version: 1.14.3 diff --git a/.github/ISSUE_TEMPLATE/security_issue_report.md b/.github/ISSUE_TEMPLATE/security_issue_report.md index 189a59acd2..e1cf539af8 100644 --- a/.github/ISSUE_TEMPLATE/security_issue_report.md +++ b/.github/ISSUE_TEMPLATE/security_issue_report.md @@ -17,7 +17,7 @@ assignees: "" -- Go Version: 1.18.1 +- Go Version: 1.18.2 - Docker Version: 20.10.8 - Kubernetes Version: 1.22.0 - NGT Version: 1.14.3 diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 7899b93538..19de712e5f 100755 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -21,7 +21,7 @@ -- Go Version: 1.18.1 +- Go Version: 1.18.2 - Docker Version: 20.10.8 - Kubernetes Version: 1.22.0 - NGT Version: 1.14.3 diff --git a/Makefile b/Makefile index 73f82b5303..209a32109b 100644 --- a/Makefile +++ b/Makefile @@ -54,16 +54,16 @@ TENSORFLOW_C_VERSION := $(eval TENSORFLOW_C_VERSION := $(shell cat versions/TENS OPERATOR_SDK_VERSION := $(eval OPERATOR_SDK_VERSION := $(shell cat versions/OPERATOR_SDK_VERSION))$(OPERATOR_SDK_VERSION) -KIND_VERSION ?= v0.12.0 +KIND_VERSION ?= v0.13.0 HELM_VERSION ?= v3.8.2 -HELM_DOCS_VERSION ?= 1.8.1 -YQ_VERSION ?= v4.24.5 -VALDCLI_VERSION ?= v1.5.1 -TELEPRESENCE_VERSION ?= 2.5.6 +HELM_DOCS_VERSION ?= 1.10.0 +YQ_VERSION ?= v4.25.1 +VALDCLI_VERSION ?= v1.5.2 +TELEPRESENCE_VERSION ?= 2.5.8 KUBELINTER_VERSION ?= 0.2.6 -GOLANGCILINT_VERSION ?= v1.45.2 -REVIEWDOG_VERSION ?= v0.14.0 -PROTOBUF_VERSION ?= 3.20.0 +GOLANGCILINT_VERSION ?= v1.46.0 +REVIEWDOG_VERSION ?= v0.14.1 +PROTOBUF_VERSION ?= 3.20.1 SWAP_DEPLOYMENT_TYPE ?= deployment SWAP_IMAGE ?= "" diff --git a/Makefile.d/functions.mk b/Makefile.d/functions.mk index 00fd908ce7..3fe661f83e 100644 --- a/Makefile.d/functions.mk +++ b/Makefile.d/functions.mk @@ -20,7 +20,7 @@ blue = printf "\x1b[34m\#\# %s\x1b[0m\n" $1 pink = printf "\x1b[35m\#\# %s\x1b[0m\n" $1 cyan = printf "\x1b[36m\#\# %s\x1b[0m\n" $1 -define go-get +define go-install GO111MODULE=on go install $1@latest endef diff --git a/Makefile.d/proto.mk b/Makefile.d/proto.mk index 9d6cc327e9..4ac48c2ed3 100644 --- a/Makefile.d/proto.mk +++ b/Makefile.d/proto.mk @@ -105,34 +105,34 @@ $(GOPATH)/src/google.golang.org/genproto: $(GOPATH)/src/google.golang.org/genproto $(GOPATH)/bin/google.golang.org/genproto: - $(call go-get, google.golang.org/genproto/...) + $(call go-get-no-mod, google.golang.org/genproto/...) $(GOPATH)/bin/protoc-gen-go: - $(call go-get, google.golang.org/protobuf/cmd/protoc-gen-go) + $(call go-install, google.golang.org/protobuf/cmd/protoc-gen-go) $(GOPATH)/bin/protoc-gen-go-grpc: - $(call go-get-no-mod, google.golang.org/grpc/cmd/protoc-gen-go-grpc) + $(call go-install, google.golang.org/grpc/cmd/protoc-gen-go-grpc) $(GOPATH)/bin/protoc-gen-grpc-gateway: - $(call go-get, github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway) + $(call go-install, github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway) $(GOPATH)/bin/protoc-gen-swagger: - $(call go-get, github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger) + $(call go-install, github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger) $(GOPATH)/bin/protoc-gen-validate: - $(call go-get, github.com/envoyproxy/protoc-gen-validate) + $(call go-install, github.com/envoyproxy/protoc-gen-validate) $(GOPATH)/bin/prototool: - $(call go-get, github.com/uber/prototool/cmd/prototool) + $(call go-install, github.com/uber/prototool/cmd/prototool) $(GOPATH)/bin/protoc-gen-doc: - $(call go-get, github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc) + $(call go-install, github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc) $(GOPATH)/bin/protoc-gen-go-vtproto: - $(call go-get, github.com/planetscale/vtprotobuf/cmd/protoc-gen-go-vtproto) + $(call go-install, github.com/planetscale/vtprotobuf/cmd/protoc-gen-go-vtproto) $(GOPATH)/bin/swagger: - $(call go-get, github.com/go-swagger/go-swagger/cmd/swagger) + $(call go-install, github.com/go-swagger/go-swagger/cmd/swagger) $(PBGOS): \ $(PROTOS) \ diff --git a/Makefile.d/test.mk b/Makefile.d/test.mk index 048316e6d9..29b110916b 100644 --- a/Makefile.d/test.mk +++ b/Makefile.d/test.mk @@ -92,12 +92,12 @@ coverage: .PHONY: tparse/install ## install tparse tparse/install: - go get -u github.com/mfridman/tparse + $(call go-install, github.com/mfridman/tparse) .PHONY: gotests/install ## install gotests gotests/install: - go get -u github.com/cweill/gotests/... + $(call go-install, github.com/cweill/gotests/gotests) .PHONY: gotests/gen ## generate missing go test files diff --git a/Makefile.d/tools.mk b/Makefile.d/tools.mk index 581126319d..41b924db67 100644 --- a/Makefile.d/tools.mk +++ b/Makefile.d/tools.mk @@ -26,25 +26,25 @@ $(BINDIR)/golangci-lint: goimports/install: $(GOPATH)/bin/goimports $(GOPATH)/bin/goimports: - go install golang.org/x/tools/cmd/goimports@latest + $(call go-install, golang.org/x/tools/cmd/goimports) .PHONY: strictgoimports/install strictgoimports/install: $(GOPATH)/bin/strictgoimports $(GOPATH)/bin/strictgoimports: - go install github.com/momotaro98/strictgoimports/cmd/strictgoimports@latest + $(call go-install, github.com/momotaro98/strictgoimports/cmd/strictgoimports) .PHONY: gofumpt/install gofumpt/install: $(GOPATH)/bin/gofumpt $(GOPATH)/bin/gofumpt: - go install mvdan.cc/gofumpt@latest + $(call go-install, mvdan.cc/gofumpt) .PHONY: golines/install golines/install: $(GOPATH)/bin/golines $(GOPATH)/bin/golines: - go install github.com/segmentio/golines@latest + $(call go-install, github.com/segmentio/golines) .PHONY: prettier/install prettier/install: $(BINDIR)/prettier diff --git a/example/client/go.mod b/example/client/go.mod index 06429e20ae..d7be93079e 100644 --- a/example/client/go.mod +++ b/example/client/go.mod @@ -8,22 +8,22 @@ replace ( github.com/golang/protobuf => github.com/golang/protobuf v1.5.2 github.com/kpango/glg => github.com/kpango/glg v1.6.10 github.com/pkg/sftp => github.com/pkg/sftp v1.13.4 - golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 + golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88 golang.org/x/net => golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 golang.org/x/text => golang.org/x/text v0.3.7 - google.golang.org/genproto => google.golang.org/genproto v0.0.0-20220422154200-b37d22cd5731 + google.golang.org/genproto => google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3 google.golang.org/grpc => google.golang.org/grpc v1.46.0 google.golang.org/protobuf => google.golang.org/protobuf v1.28.0 gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0 - gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b + gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.0-20220512140231-539c8e751b99 ) require ( github.com/kpango/fuid v0.0.0-20220209050620-e5987ba1ea5e github.com/kpango/glg v1.6.10 - github.com/vdaas/vald-client-go v1.5.1 + github.com/vdaas/vald-client-go v1.5.2 gonum.org/v1/hdf5 v0.0.0-20210714002203-8c5d23bc6946 - google.golang.org/grpc v1.45.0 + google.golang.org/grpc v1.46.0 ) require ( diff --git a/example/client/go.sum b/example/client/go.sum index a724aeacd3..8dfc78eaf4 100644 --- a/example/client/go.sum +++ b/example/client/go.sum @@ -43,14 +43,14 @@ github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/vdaas/vald-client-go v1.5.1 h1:cHRVa186T3YkJGt31LYQJh8UO6JH5XpKQbV35t/XtYE= -github.com/vdaas/vald-client-go v1.5.1/go.mod h1:MAaX058wFsHlhHjqH53DSWHIbl/QPU6ypxuhjeCwtgA= +github.com/vdaas/vald-client-go v1.5.2 h1:gHXEkHDsPnerwiDD6sRipoZ9N6uF56TdDy9D63wBozA= +github.com/vdaas/vald-client-go v1.5.2/go.mod h1:1aOgWp2dS/Qo0hgSzaw0MEpxllmbuZ7gCspdztNRMOE= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= -golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -86,12 +86,12 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T gonum.org/v1/hdf5 v0.0.0-20210714002203-8c5d23bc6946 h1:vJpL69PeUullhJyKtTjHjENEmZU3BkO4e+fod7nKzgM= gonum.org/v1/hdf5 v0.0.0-20210714002203-8c5d23bc6946/go.mod h1:BQUWDHIAygjdt1HnUPQ0eWqLN2n5FwJycrpYUVUOx2I= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20220422154200-b37d22cd5731 h1:nquqdM9+ps0JZcIiI70+tqoaIFS5Ql4ZuK8UXnz3HfE= -google.golang.org/genproto v0.0.0-20220422154200-b37d22cd5731/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3 h1:q1kiSVscqoDeqTF27eQ2NnLLDmqF0I373qQNXYMy0fo= +google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/grpc v1.46.0 h1:oCjezcn6g6A75TGoKYBPgKmVBLexhYLM6MebdrPApP8= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20220512140231-539c8e751b99/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/go.mod b/go.mod index 11a6a18508..16f3421365 100755 --- a/go.mod +++ b/go.mod @@ -3,47 +3,48 @@ module github.com/vdaas/vald go 1.18 replace ( - cloud.google.com/go => cloud.google.com/go v0.101.0 + cloud.google.com/go => cloud.google.com/go v0.101.1 cloud.google.com/go/iam => cloud.google.com/go/iam v0.3.0 cloud.google.com/go/monitoring => cloud.google.com/go/monitoring v1.5.0 cloud.google.com/go/profiler => cloud.google.com/go/profiler v0.2.0 cloud.google.com/go/storage => cloud.google.com/go/storage v1.22.0 cloud.google.com/go/trace => cloud.google.com/go/trace v1.2.0 - github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.2.1-0.20220421185816-7525a9bd0079+incompatible - github.com/Azure/go-autorest/autorest => github.com/Azure/go-autorest/autorest v0.11.27 - github.com/Azure/go-autorest/autorest/adal => github.com/Azure/go-autorest/autorest/adal v0.9.19-0.20220421185816-7525a9bd0079 - github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.44.0 + github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.2.1-0.20220504154517-49906996bd99+incompatible + github.com/Azure/go-autorest/autorest => github.com/Azure/go-autorest/autorest v0.11.28-0.20220504154517-49906996bd99 + github.com/Azure/go-autorest/autorest/adal => github.com/Azure/go-autorest/autorest/adal v0.9.19 + github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.44.13 github.com/chzyer/logex => github.com/chzyer/logex v1.2.1 github.com/coreos/etcd => go.etcd.io/etcd v3.3.27+incompatible - github.com/docker/docker => github.com/moby/moby v20.10.14+incompatible + github.com/docker/docker => github.com/moby/moby v20.10.16+incompatible + github.com/emicklei/go-restful => github.com/emicklei/go-restful v2.15.1-0.20210410130218-1e8c63ce7906+incompatible github.com/envoyproxy/protoc-gen-validate => github.com/envoyproxy/protoc-gen-validate v0.6.7 - github.com/fsnotify/fsnotify => github.com/fsnotify/fsnotify v1.5.3 + github.com/fsnotify/fsnotify => github.com/fsnotify/fsnotify v1.5.4 github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.7.7 github.com/go-logr/logr => github.com/go-logr/logr v1.2.3 github.com/go-sql-driver/mysql => github.com/go-sql-driver/mysql v1.6.0 github.com/goccy/go-json => github.com/goccy/go-json v0.9.7 - github.com/gocql/gocql => github.com/gocql/gocql v1.0.0 + github.com/gocql/gocql => github.com/gocql/gocql v1.1.0 github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.2 github.com/golang/groupcache => github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da github.com/golang/protobuf => github.com/golang/protobuf v1.5.2 github.com/golang/snappy => github.com/golang/snappy v0.0.4 github.com/google/btree => github.com/google/btree v1.0.1 - github.com/google/go-cmp => github.com/google/go-cmp v0.5.7 - github.com/google/pprof => github.com/google/pprof v0.0.0-20220412212628-83db2b799d1f + github.com/google/go-cmp => github.com/google/go-cmp v0.5.8 + github.com/google/pprof => github.com/google/pprof v0.0.0-20220509035851-59ca7ad80af3 github.com/google/uuid => github.com/google/uuid v1.3.0 github.com/gorilla/mux => github.com/gorilla/mux v1.8.0 github.com/gorilla/websocket => github.com/gorilla/websocket v1.5.0 github.com/hailocab/go-hostpool => github.com/kpango/go-hostpool v0.0.0-20210303030322-aab80263dcd0 github.com/hashicorp/go-version => github.com/hashicorp/go-version v1.4.0 github.com/jackc/chunkreader => github.com/jackc/chunkreader v1.0.0 - github.com/jackc/pgconn => github.com/jackc/pgconn v1.12.0 + github.com/jackc/pgconn => github.com/jackc/pgconn v1.12.1 github.com/jackc/pgmock => github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 github.com/jackc/pgproto3/v2 => github.com/jackc/pgproto3/v2 v2.3.0 github.com/jackc/pgservicefile => github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b github.com/jackc/pgtype => github.com/jackc/pgtype v1.11.0 github.com/jackc/puddle => github.com/jackc/puddle v1.2.1 github.com/json-iterator/go => github.com/json-iterator/go v1.1.12 - github.com/klauspost/compress => github.com/klauspost/compress v1.15.2-0.20220425124009-abf555972221 + github.com/klauspost/compress => github.com/klauspost/compress v1.15.5-0.20220512161851-3909335c441d github.com/kpango/glg => github.com/kpango/glg v1.6.10 github.com/onsi/ginkgo => github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega => github.com/onsi/gomega v1.19.0 @@ -65,23 +66,23 @@ replace ( go.etcd.io/etcd/pkg/v3 => go.etcd.io/etcd/pkg/v3 v3.5.4 go.etcd.io/etcd/server/v3 => go.etcd.io/etcd/server/v3 v3.5.4 go.opencensus.io => go.opencensus.io v0.23.0 - go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.6.3 - go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v0.29.0 - go.opentelemetry.io/otel/sdk => go.opentelemetry.io/otel/sdk v1.6.3 - go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.6.3 + go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.7.0 + go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v0.30.0 + go.opentelemetry.io/otel/sdk => go.opentelemetry.io/otel/sdk v1.7.0 + go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.7.0 go.uber.org/atomic => go.uber.org/atomic v1.9.0 go.uber.org/goleak => go.uber.org/goleak v1.1.12 go.uber.org/multierr => go.uber.org/multierr v1.8.0 go.uber.org/zap => go.uber.org/zap v1.21.0 - golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 - golang.org/x/exp => golang.org/x/exp v0.0.0-20220414153411-bcd21879b8fd + golang.org/x/crypto => golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88 + golang.org/x/exp => golang.org/x/exp v0.0.0-20220428152302-39d4317da171 golang.org/x/image => golang.org/x/image v0.0.0-20220413100746-70e8d0d3baa9 golang.org/x/lint => golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 golang.org/x/mod => golang.org/x/mod v0.5.1 golang.org/x/net => golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 golang.org/x/oauth2 => golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 golang.org/x/sync => golang.org/x/sync v0.0.0-20210220032951-036812b2e83c - golang.org/x/sys => golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 + golang.org/x/sys => golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 golang.org/x/term => golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 golang.org/x/text => golang.org/x/text v0.3.7 golang.org/x/time => golang.org/x/time v0.0.0-20220411224347-583f2d630306 @@ -89,29 +90,29 @@ replace ( golang.org/x/xerrors => golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f gonum.org/v1/gonum => gonum.org/v1/gonum v0.11.0 gonum.org/v1/plot => gonum.org/v1/plot v0.11.0 - google.golang.org/api => google.golang.org/api v0.75.0 + google.golang.org/api => google.golang.org/api v0.79.0 google.golang.org/appengine => google.golang.org/appengine v1.6.7 - google.golang.org/genproto => google.golang.org/genproto v0.0.0-20220422154200-b37d22cd5731 + google.golang.org/genproto => google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3 google.golang.org/grpc => google.golang.org/grpc v1.46.0 google.golang.org/grpc/cmd/protoc-gen-go-grpc => google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.2.0 google.golang.org/protobuf => google.golang.org/protobuf v1.28.0 gopkg.in/check.v1 => gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0 - gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b - k8s.io/api => k8s.io/api v0.23.6 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.6 - k8s.io/apimachinery => k8s.io/apimachinery v0.23.6 - k8s.io/apiserver => k8s.io/apiserver v0.23.6 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.6 - k8s.io/client-go => k8s.io/client-go v0.23.6 - k8s.io/code-generator => k8s.io/code-generator v0.23.6 - k8s.io/component-base => k8s.io/component-base v0.23.6 + gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.0-20220512140231-539c8e751b99 + k8s.io/api => k8s.io/api v0.24.0 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.0 + k8s.io/apimachinery => k8s.io/apimachinery v0.24.0 + k8s.io/apiserver => k8s.io/apiserver v0.24.0 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.0 + k8s.io/client-go => k8s.io/client-go v0.24.0 + k8s.io/code-generator => k8s.io/code-generator v0.24.0 + k8s.io/component-base => k8s.io/component-base v0.24.0 k8s.io/gengo => k8s.io/gengo v0.0.0-20220307231824-4627b89bbf1b k8s.io/klog/v2 => k8s.io/klog/v2 v2.60.1 - k8s.io/metrics => k8s.io/metrics v0.23.6 + k8s.io/metrics => k8s.io/metrics v0.24.0 k8s.io/utils => k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 - sigs.k8s.io/apiserver-network-proxy/konnectivity-client => sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 - sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.11.2 + sigs.k8s.io/apiserver-network-proxy/konnectivity-client => sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.31 + sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.12.0 sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.11.4 sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.13.6 sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.2.1 @@ -133,7 +134,7 @@ require ( github.com/goccy/go-json v0.9.4 github.com/gocql/gocql v0.0.0-20200131111108-92af2e088537 github.com/gocraft/dbr/v2 v2.7.3 - github.com/google/go-cmp v0.5.7 + github.com/google/go-cmp v0.5.8 github.com/gorilla/mux v1.8.0 github.com/hashicorp/go-version v0.0.0-00010101000000-000000000000 github.com/klauspost/compress v1.15.1 @@ -154,31 +155,31 @@ require ( go.uber.org/goleak v1.1.12 go.uber.org/zap v1.21.0 gocloud.dev v0.25.0 - golang.org/x/net v0.0.0-20220412020605-290c469a71a5 + golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c - golang.org/x/sys v0.0.0-20220412211240-33da011f77ad + golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 golang.org/x/text v0.3.7 - golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff + golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717 gonum.org/v1/hdf5 v0.0.0-20210714002203-8c5d23bc6946 gonum.org/v1/plot v0.0.0-00010101000000-000000000000 - google.golang.org/api v0.74.0 - google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4 - google.golang.org/grpc v1.45.0 + google.golang.org/api v0.77.0 + google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3 + google.golang.org/grpc v1.46.0 google.golang.org/protobuf v1.28.0 gopkg.in/yaml.v2 v2.4.0 inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6 - k8s.io/api v0.23.6 - k8s.io/apimachinery v0.23.6 + k8s.io/api v0.24.0 + k8s.io/apimachinery v0.24.0 k8s.io/cli-runtime v0.0.0-00010101000000-000000000000 - k8s.io/client-go v0.23.6 + k8s.io/client-go v0.24.0 k8s.io/metrics v0.0.0-00010101000000-000000000000 sigs.k8s.io/controller-runtime v0.0.0-00010101000000-000000000000 ) require ( cloud.google.com/go v0.100.2 // indirect - cloud.google.com/go/compute v1.6.0 // indirect + cloud.google.com/go/compute v1.6.1 // indirect cloud.google.com/go/iam v0.3.0 // indirect cloud.google.com/go/monitoring v1.4.0 // indirect cloud.google.com/go/trace v1.2.0 // indirect @@ -191,6 +192,7 @@ require ( github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/emicklei/go-restful v2.9.5+incompatible // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/go-errors/errors v1.0.1 // indirect github.com/go-fonts/liberation v0.2.0 // indirect @@ -210,13 +212,13 @@ require ( github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.3 // indirect github.com/google/btree v1.0.1 // indirect + github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/gofuzz v1.1.0 // indirect github.com/google/pprof v0.0.0-20220113144219-d25a53d42d00 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/uuid v1.3.0 // indirect github.com/google/wire v0.5.0 // indirect github.com/googleapis/gax-go/v2 v2.3.0 // indirect - github.com/googleapis/gnostic v0.5.5 // indirect github.com/googleapis/go-type-adapters v1.0.0 // indirect github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect @@ -233,6 +235,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -244,7 +247,7 @@ require ( github.com/prometheus/statsd_exporter v0.21.0 // indirect github.com/quasilyte/gogrep v0.0.0-20220103110004-ffaa07af02e3 // indirect github.com/scylladb/go-reflectx v1.0.1 // indirect - github.com/spf13/cobra v1.2.1 // indirect + github.com/spf13/cobra v1.4.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/testify v1.7.1 // indirect github.com/uber/jaeger-client-go v2.25.0+incompatible // indirect @@ -263,13 +266,13 @@ require ( google.golang.org/appengine v1.6.7 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect - k8s.io/apiextensions-apiserver v0.23.5 // indirect - k8s.io/component-base v0.23.6 // indirect - k8s.io/klog/v2 v2.30.0 // indirect - k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect - k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect - sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect - sigs.k8s.io/kustomize/api v0.10.1 // indirect + k8s.io/apiextensions-apiserver v0.24.0 // indirect + k8s.io/component-base v0.24.0 // indirect + k8s.io/klog/v2 v2.60.1 // indirect + k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect + k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect + sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect + sigs.k8s.io/kustomize/api v0.11.4 // indirect sigs.k8s.io/kustomize/kyaml v0.13.6 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect sigs.k8s.io/yaml v1.3.0 // indirect diff --git a/go.sum b/go.sum index 352248c3af..3f38bd9d0a 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,11 @@ -cloud.google.com/go v0.101.0 h1:g+LL+JvpvdyGtcaD2xw2mSByE/6F9s471eJSoaysM84= -cloud.google.com/go v0.101.0/go.mod h1:hEiddgDb77jDQ+I80tURYNJEnuwPzFU8awCFFRLKjW0= +cloud.google.com/go v0.101.1 h1:3+/0TAm9JD/PyhkrDWQWi2L197h3euCsM+H+J4iYTR8= +cloud.google.com/go v0.101.1/go.mod h1:55HwjsGW4CHD3JrNuMdZtSDsgTs0CuCB/bBTugD+7AA= cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= -cloud.google.com/go/compute v1.6.0 h1:XdQIN5mdPTSBVwSIVDuY5e8ZzVAccsHvD3qTEz4zIps= cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= +cloud.google.com/go/compute v1.6.1 h1:2sMmt8prCn7DPaG4Pmh0N3Inmc8cT8ae5k1M6VJ9Wqc= +cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/iam v0.3.0 h1:exkAomrVUuzx9kWFI1wm3KI0uoDeUFPB4kKGzx6x+Gc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= @@ -48,11 +49,10 @@ github.com/Azure/azure-storage-blob-go v0.14.0 h1:1BCg74AmVdYwO3dlKwtFU1V0wU2PZd github.com/Azure/azure-storage-blob-go v0.14.0/go.mod h1:SMqIBi+SuiQH32bvyjngEewEeXoPfKMgWlBDaYf6fck= github.com/Azure/go-amqp v0.16.0/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg= github.com/Azure/go-amqp v0.16.4/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg= -github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= -github.com/Azure/go-autorest v14.2.1-0.20220421185816-7525a9bd0079+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest v0.11.27/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U= -github.com/Azure/go-autorest/autorest/adal v0.9.19-0.20220421185816-7525a9bd0079/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= +github.com/Azure/go-autorest v14.2.1-0.20220504154517-49906996bd99+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest/autorest v0.11.28-0.20220504154517-49906996bd99/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U= +github.com/Azure/go-autorest/autorest/adal v0.9.19/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= github.com/Azure/go-autorest/autorest/azure/auth v0.5.9/go.mod h1:hg3/1yw0Bq87O3KvvnJoAh34/0zbP7SFizX/qN5JvjU= github.com/Azure/go-autorest/autorest/azure/cli v0.4.2/go.mod h1:7qkJkT+j6b+hIpzMOwPChJhTqS8VbsqqgULzMNRugoM= github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= @@ -78,9 +78,11 @@ github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b h1:slYM766cy2nI3BwyR github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/aws/aws-sdk-go v1.44.0 h1:jwtHuNqfnJxL4DKHBUVUmQlfueQqBW7oXP6yebZR/R0= -github.com/aws/aws-sdk-go v1.44.0/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.44.13 h1:7mRsYayiEQSladCR2ASLsNz3f3XIdfOdXd+od3uOLP4= +github.com/aws/aws-sdk-go v1.44.13/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go-v2 v1.16.2 h1:fqlCk6Iy3bnCumtrLz9r3mJ/2gUT0pJ0wLFVIdWh+JA= github.com/aws/aws-sdk-go-v2 v1.16.2/go.mod h1:ytwTPBG6fXTZLxxeeCCWj2/EMYp/xDUgX+OET6TLNNU= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1 h1:SdK4Ppk5IzLs64ZMvr6MrSficMtjY2oS0WOORXTlxwU= @@ -126,7 +128,7 @@ github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZx github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k= -github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= @@ -172,8 +174,8 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn github.com/dvyukov/go-fuzz v0.0.0-20210103155950-6a8e9d1f2415/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= -github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful v2.15.1-0.20210410130218-1e8c63ce7906+incompatible h1:6G/j59vJ+KuTGltPY3WG2ROpy7i2qTO/yXdCLeyarQI= +github.com/emicklei/go-restful v2.15.1-0.20210410130218-1e8c63ce7906+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.6.7 h1:qcZcULcd/abmQg6dwigimCNEyi4gg31M/xaciQlDml8= github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= @@ -187,8 +189,8 @@ github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoD github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/frankban/quicktest v1.4.0 h1:rCSCih1FnSWJEel/eub9wclBSqpF2F/PuvxUWGWnbO8= github.com/frankban/quicktest v1.4.0/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ= -github.com/fsnotify/fsnotify v1.5.3 h1:vNFpj2z7YIbwh2bw7x35sqYpp2wfuq+pivKbWG09B8c= -github.com/fsnotify/fsnotify v1.5.3/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= +github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= +github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -252,8 +254,8 @@ github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6Wezm github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= github.com/goccy/go-json v0.9.7 h1:IcB+Aqpx/iMHu5Yooh7jEzJk1JZ7Pjtmys2ukPr7EeM= github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/gocql/gocql v1.0.0 h1:UnbTERpP72VZ/viKE1Q1gPtmLvyTZTvuAstvSRydw/c= -github.com/gocql/gocql v1.0.0/go.mod h1:3gM2c4D3AnkISwBxGnMMsS8Oy4y2lhbPRsH4xnJrHG8= +github.com/gocql/gocql v1.1.0 h1:ow36yzymDGsuKqnkecq2zR3prFkkbdzC/af5zTyPXNc= +github.com/gocql/gocql v1.1.0/go.mod h1:3gM2c4D3AnkISwBxGnMMsS8Oy4y2lhbPRsH4xnJrHG8= github.com/gocraft/dbr/v2 v2.7.3 h1:5/PTRiBkdD2FoHpnrCMoEUw5Wf/Cl3l3PjJ02Wm+pwM= github.com/gocraft/dbr/v2 v2.7.3/go.mod h1:8IH98S8M8J0JSEiYk0MPH26ZDUKemiQ/GvmXL5jo+Uw= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -281,12 +283,12 @@ github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/cel-go v0.9.0/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSxrmI1w= +github.com/google/cel-go v0.10.1/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSxrmI1w= github.com/google/cel-spec v0.6.0/go.mod h1:Nwjgxy5CbjlPrtCWjeDjUyKMl8w41YBYGjsyDdqk0xA= github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= -github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= -github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-replayers/grpcreplay v1.1.0 h1:S5+I3zYyZ+GQz68OfbURDdt/+cSMqCK1wrvNx7WBzTE= github.com/google/go-replayers/grpcreplay v1.1.0/go.mod h1:qzAvJ8/wi57zq7gWqaE6AwLM6miiXUQwP1S+I9icmhk= github.com/google/go-replayers/httpreplay v1.1.1 h1:H91sIMlt1NZzN7R+/ASswyouLJfW0WLW7fhyUFvDEkY= @@ -298,8 +300,8 @@ github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible h1:x github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= -github.com/google/pprof v0.0.0-20220412212628-83db2b799d1f h1:VrKTY4lquiy1oJzVZgXrauku9Jx9P+POv/gTLakG4Wk= -github.com/google/pprof v0.0.0-20220412212628-83db2b799d1f/go.mod h1:Pt31oes+eGImORns3McJn8zHefuQl2rG8l6xQjGYB4U= +github.com/google/pprof v0.0.0-20220509035851-59ca7ad80af3 h1:vFrXU7L2gqtlP/ZGijSpaDIc16ZQrZI4FAuYtpQTyQc= +github.com/google/pprof v0.0.0-20220509035851-59ca7ad80af3/go.mod h1:Pt31oes+eGImORns3McJn8zHefuQl2rG8l6xQjGYB4U= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= @@ -314,8 +316,6 @@ github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/Oth github.com/googleapis/gax-go/v2 v2.3.0 h1:nRJtk3y8Fm770D42QV6T90ZnvFZyk7agSo3Q+Z9p3WI= github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= -github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw= -github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= github.com/googleapis/go-type-adapters v1.0.0 h1:9XdMn+d/G57qq1s8dNc5IesGCXHf6V2HZ2JwRxfA2tA= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= @@ -339,7 +339,7 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= -github.com/jackc/pgconn v1.12.0/go.mod h1:ZkhRC59Llhrq3oSfrikvwQ5NaxYExr6twkdkMLaKono= +github.com/jackc/pgconn v1.12.1/go.mod h1:ZkhRC59Llhrq3oSfrikvwQ5NaxYExr6twkdkMLaKono= github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= @@ -366,8 +366,8 @@ github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8 github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.15.2-0.20220425124009-abf555972221 h1:Om0KWW7hF4lZDzBmxjmRk9pa1oxgS5HXXyINaxv2k4Y= -github.com/klauspost/compress v1.15.2-0.20220425124009-abf555972221/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= +github.com/klauspost/compress v1.15.5-0.20220512161851-3909335c441d h1:JCcD1SecinAxF3OBrlF764YovSaCtu325kV9kpcSySs= +github.com/klauspost/compress v1.15.5-0.20220512161851-3909335c441d/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/kpango/fastime v1.1.4 h1:pus9JgJBg/8Jie3ozayA4yNIV67BUPhbq0wMZY3CtYo= @@ -420,10 +420,11 @@ github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= -github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A= +github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -434,6 +435,7 @@ github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3P github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= @@ -535,12 +537,12 @@ github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= -go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= -go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.4/go.mod h1:Ud+VUwIi9/uQHOMA+4ekToJ12lTxlv0zB/+DHwTGEbU= -go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= +go.etcd.io/etcd/client/v3 v3.5.1/go.mod h1:OnjH4M8OnAotwaB2l9bVgZzRFKru7/ZMoS46OtKyd3Q= go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.etcd.io/etcd/pkg/v3 v3.5.4/go.mod h1:OI+TtO+Aa3nhQSppMbwE4ld3uF1/fqqwbpfndbbrEe0= go.etcd.io/etcd/raft/v3 v3.5.4/go.mod h1:SCuunjYvZFC0fBX0vxMSPjuZmpcSk+XaAcMrD6Do03w= @@ -550,14 +552,14 @@ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= -go.opentelemetry.io/otel v1.6.3/go.mod h1:7BgNga5fNlF/iZjG06hM3yofffp0ofKCDwSXx1GC4dI= +go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= -go.opentelemetry.io/otel/metric v0.29.0/go.mod h1:HahKFp1OC1RNTsuO/HNMBHHJR+dmHZ7wLARRgGDwjLQ= +go.opentelemetry.io/otel/metric v0.30.0/go.mod h1:/ShZ7+TS4dHzDFmfi1kSXMhMVubNoP0oIaBp70J6UXU= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= -go.opentelemetry.io/otel/sdk v1.6.3/go.mod h1:A4iWF7HTXa+GWL/AaqESz28VuSBIcZ+0CV+IzJ5NMiQ= +go.opentelemetry.io/otel/sdk v1.7.0/go.mod h1:uTEOTwaqIVuTGiJN7ii13Ibp75wJmYUDe374q6cZwUU= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= -go.opentelemetry.io/otel/trace v1.6.3/go.mod h1:GNJQusJlUgZl9/TQBPKU/Y/ty+0iVB5fjhKeJGZPGFs= +go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 h1:+FNtrFTmVw0YZGpBGX56XDee331t6JAXeK2bcyhLOOc= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o= @@ -577,9 +579,9 @@ go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 h1:Tx9kY6y go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= gocloud.dev v0.25.0 h1:Y7vDq8xj7SyM848KXf32Krda2e6jQ4CLh/mTeCSqXtk= gocloud.dev v0.25.0/go.mod h1:7HegHVCYZrMiU3IE1qtnzf/vRrDwLYnRNR3EhWX8x9Y= -golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA= -golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/exp v0.0.0-20220414153411-bcd21879b8fd h1:zVFyTKZN/Q7mNRWSs1GOYnHM9NiFSJ54YVRsD0rNWT4= +golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88 h1:Tgea0cVUD0ivh5ADBX4WwuI12DUd2to3nCYe2eayMIw= +golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/exp v0.0.0-20220428152302-39d4317da171 h1:TfdoLivD44QwvssI9Sv1xwa5DcL5XQr4au4sZ2F2NV4= golang.org/x/image v0.0.0-20220413100746-70e8d0d3baa9 h1:LRtI4W37N+KFebI/qV0OFiLUv4GLOWeEW5hn/KEJvxE= golang.org/x/image v0.0.0-20220413100746-70e8d0d3baa9/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug= @@ -592,8 +594,8 @@ golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 h1:OSnWWcOd/CtWQC2cYSBgbT golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 h1:xHms4gcpe1YE7A3yIllJXP16CMAGuqwO2lX1mTyyRRc= -golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 h1:nonptSpoQ4vQjyraW20DXPAglgQfVnM9ZC6MmNLMR60= +golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 h1:EH1Deb8WZJ0xc0WK//leUHXcX9aLE5SymusoTmMZye8= golang.org/x/term v0.0.0-20220411215600-e5f449aeb171/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= @@ -611,12 +613,12 @@ gonum.org/v1/hdf5 v0.0.0-20210714002203-8c5d23bc6946 h1:vJpL69PeUullhJyKtTjHjENE gonum.org/v1/hdf5 v0.0.0-20210714002203-8c5d23bc6946/go.mod h1:BQUWDHIAygjdt1HnUPQ0eWqLN2n5FwJycrpYUVUOx2I= gonum.org/v1/plot v0.11.0 h1:z2ZkgNqW34d0oYUzd80RRlc0L9kWtenqK4kflZG1lGc= gonum.org/v1/plot v0.11.0/go.mod h1:fH9YnKnDKax0u5EzHVXvhN5HJwtMFWIOLNuhgUahbCQ= -google.golang.org/api v0.75.0 h1:0AYh/ae6l9TDUvIQrDw5QRpM100P6oHgD+o3dYHMzJg= -google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= +google.golang.org/api v0.79.0 h1:vaOcm0WdXvhGkci9a0+CcQVZqSRjN8ksSBlWv99f8Pg= +google.golang.org/api v0.79.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20220422154200-b37d22cd5731 h1:nquqdM9+ps0JZcIiI70+tqoaIFS5Ql4ZuK8UXnz3HfE= -google.golang.org/genproto v0.0.0-20220422154200-b37d22cd5731/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3 h1:q1kiSVscqoDeqTF27eQ2NnLLDmqF0I373qQNXYMy0fo= +google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/grpc v1.46.0 h1:oCjezcn6g6A75TGoKYBPgKmVBLexhYLM6MebdrPApP8= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.2.0/go.mod h1:DNq5QpG7LJqD2AamLZ7zvKE0DEpVl2BSEVjFycAAjRY= @@ -635,45 +637,45 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20220512140231-539c8e751b99 h1:dbuHpmKjkDzSOMKAWl10QNlgaZUd3V1q99xc81tt2Kc= +gopkg.in/yaml.v3 v3.0.0-20220512140231-539c8e751b99/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6 h1:acCzuUSQ79tGsM/O50VRFySfMm19IoMKL+sZztZkCxw= inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6/go.mod h1:y3MGhcFMlh0KZPMuXXow8mpjxxAk3yoDNsp4cQz54i8= -k8s.io/api v0.23.6 h1:yOK34wbYECH4RsJbQ9sfkFK3O7f/DUHRlzFehkqZyVw= -k8s.io/api v0.23.6/go.mod h1:1kFaYxGCFHYp3qd6a85DAj/yW8aVD6XLZMqJclkoi9g= -k8s.io/apiextensions-apiserver v0.23.6 h1:v58cQ6Z0/GK1IXYr+oW0fnYl52o9LTY0WgoWvI8uv5Q= -k8s.io/apiextensions-apiserver v0.23.6/go.mod h1:YVh17Mphv183THQJA5spNFp9XfoidFyL3WoDgZxQIZU= -k8s.io/apimachinery v0.23.6 h1:RH1UweWJkWNTlFx0D8uxOpaU1tjIOvVVWV/bu5b3/NQ= -k8s.io/apimachinery v0.23.6/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= -k8s.io/apiserver v0.23.6/go.mod h1:5PU32F82tfErXPmf7FXhd/UcuLfh97tGepjKUgJ2atg= -k8s.io/cli-runtime v0.23.6 h1:zvsGa4An+udUnznKSfD1Q17sETWHNOaMqYKHwHCvg+4= -k8s.io/cli-runtime v0.23.6/go.mod h1:0Z3VR/HRIFKiLzKIAkm1mPtcH98GT/fXu2IU0E4vFmw= -k8s.io/client-go v0.23.6 h1:7h4SctDVQAQbkHQnR4Kzi7EyUyvla5G1pFWf4+Od7hQ= -k8s.io/client-go v0.23.6/go.mod h1:Umt5icFOMLV/+qbtZ3PR0D+JA6lvvb3syzodv4irpK4= -k8s.io/code-generator v0.23.6/go.mod h1:S0Q1JVA+kSzTI1oUvbKAxZY/DYbA/ZUb4Uknog12ETk= -k8s.io/component-base v0.23.6 h1:8dhVZ4VrRcNdV2EGjl8tj8YOHwX6ysgCGMJ2Oyy0NW8= -k8s.io/component-base v0.23.6/go.mod h1:FGMPeMrjYu0UZBSAFcfloVDplj9IvU+uRMTOdE23Fj0= +k8s.io/api v0.24.0 h1:J0hann2hfxWr1hinZIDefw7Q96wmCBx6SSB8IY0MdDg= +k8s.io/api v0.24.0/go.mod h1:5Jl90IUrJHUJYEMANRURMiVvJ0g7Ax7r3R1bqO8zx8I= +k8s.io/apiextensions-apiserver v0.24.0 h1:JfgFqbA8gKJ/uDT++feAqk9jBIwNnL9YGdQvaI9DLtY= +k8s.io/apiextensions-apiserver v0.24.0/go.mod h1:iuVe4aEpe6827lvO6yWQVxiPSpPoSKVjkq+MIdg84cM= +k8s.io/apimachinery v0.24.0 h1:ydFCyC/DjCvFCHK5OPMKBlxayQytB8pxy8YQInd5UyQ= +k8s.io/apimachinery v0.24.0/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= +k8s.io/apiserver v0.24.0/go.mod h1:WFx2yiOMawnogNToVvUYT9nn1jaIkMKj41ZYCVycsBA= +k8s.io/cli-runtime v0.24.0 h1:ot3Qf49T852uEyNApABO1UHHpFIckKK/NqpheZYN2gM= +k8s.io/cli-runtime v0.24.0/go.mod h1:9XxoZDsEkRFUThnwqNviqzljtT/LdHtNWvcNFrAXl0A= +k8s.io/client-go v0.24.0 h1:lbE4aB1gTHvYFSwm6eD3OF14NhFDKCejlnsGYlSJe5U= +k8s.io/client-go v0.24.0/go.mod h1:VFPQET+cAFpYxh6Bq6f4xyMY80G6jKKktU6G0m00VDw= +k8s.io/code-generator v0.24.0/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= +k8s.io/component-base v0.24.0 h1:h5jieHZQoHrY/lHG+HyrSbJeyfuitheBvqvKwKHVC0g= +k8s.io/component-base v0.24.0/go.mod h1:Dgazgon0i7KYUsS8krG8muGiMVtUZxG037l1MKyXgrA= k8s.io/gengo v0.0.0-20220307231824-4627b89bbf1b/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= -k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKbP2BmgwBL2p7pn0A3dG9W4= -k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= -k8s.io/metrics v0.23.6 h1:GH9tTTq7l6DNhzFsLW3Q3xG1LWEk/VT853T6r1mo3uI= -k8s.io/metrics v0.23.6/go.mod h1:Fm9VzVMZ7KVEEeLStF2y3XogfcDwpGyI15o1xB6PbYk= +k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= +k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= +k8s.io/metrics v0.24.0 h1:nsFLJBDgj+B8mXvVBWFxTZBRRDJ8uTdf4C/Gedjy9BA= +k8s.io/metrics v0.24.0/go.mod h1:jrLlFGdKl3X+szubOXPG0Lf2aVxuV3QJcbsgVRAM6fI= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw= -sigs.k8s.io/controller-runtime v0.11.2 h1:H5GTxQl0Mc9UjRJhORusqfJCIjBO8UtUxGggCwL1rLA= -sigs.k8s.io/controller-runtime v0.11.2/go.mod h1:P6QCzrEjLaZGqHsfd+os7JQ+WFZhvB8MRFsn4dWF7O4= -sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s= -sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.31/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw= +sigs.k8s.io/controller-runtime v0.12.0 h1:gA4zphrmHFc7ihmY/+GyyE0BxKD+OYdb5+DjD2azFAQ= +sigs.k8s.io/controller-runtime v0.12.0/go.mod h1:BKhxlA4l7FPK4AQcsuL4X6vZeWnKDXez/vp1Y8dxTU0= +sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= +sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= sigs.k8s.io/kustomize/api v0.11.4 h1:/0Mr3kfBBNcNPOW5Qwk/3eb8zkswCwnqQxxKtmrTkRo= sigs.k8s.io/kustomize/api v0.11.4/go.mod h1:k+8RsqYbgpkIrJ4p9jcdPqe8DprLxFUUO0yNOq8C+xI= sigs.k8s.io/kustomize/kyaml v0.13.6 h1:eF+wsn4J7GOAXlvajv6OknSunxpcOBQQqsnPxObtkGs= diff --git a/hack/go.mod.default b/hack/go.mod.default index 0b13e247a5..b36902f359 100755 --- a/hack/go.mod.default +++ b/hack/go.mod.default @@ -16,6 +16,7 @@ replace ( github.com/chzyer/logex => github.com/chzyer/logex master github.com/coreos/etcd => go.etcd.io/etcd latest github.com/docker/docker => github.com/moby/moby latest + github.com/emicklei/go-restful => github.com/emicklei/go-restful master github.com/envoyproxy/protoc-gen-validate => github.com/envoyproxy/protoc-gen-validate latest github.com/fsnotify/fsnotify => github.com/fsnotify/fsnotify latest github.com/gin-gonic/gin => github.com/gin-gonic/gin latest @@ -98,20 +99,20 @@ replace ( gopkg.in/check.v1 => gopkg.in/check.v1 latest gopkg.in/yaml.v2 => gopkg.in/yaml.v2 latest gopkg.in/yaml.v3 => gopkg.in/yaml.v3 latest - k8s.io/api => k8s.io/api v0.23.6 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.6 - k8s.io/apimachinery => k8s.io/apimachinery v0.23.6 - k8s.io/apiserver => k8s.io/apiserver v0.23.6 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.6 - k8s.io/client-go => k8s.io/client-go v0.23.6 - k8s.io/code-generator => k8s.io/code-generator v0.23.6 - k8s.io/component-base => k8s.io/component-base v0.23.6 + k8s.io/api => k8s.io/api v0.24.0 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.0 + k8s.io/apimachinery => k8s.io/apimachinery v0.24.0 + k8s.io/apiserver => k8s.io/apiserver v0.24.0 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.0 + k8s.io/client-go => k8s.io/client-go v0.24.0 + k8s.io/code-generator => k8s.io/code-generator v0.24.0 + k8s.io/component-base => k8s.io/component-base v0.24.0 k8s.io/gengo => k8s.io/gengo latest k8s.io/klog/v2 => k8s.io/klog/v2 latest - k8s.io/metrics => k8s.io/metrics v0.23.6 + k8s.io/metrics => k8s.io/metrics v0.24.0 k8s.io/utils => k8s.io/utils latest sigs.k8s.io/apiserver-network-proxy/konnectivity-client => sigs.k8s.io/apiserver-network-proxy/konnectivity-client latest - sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.11.2 + sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.12.0 sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api latest sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml latest sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 latest diff --git a/internal/core/algorithm/ngt/ngt.go b/internal/core/algorithm/ngt/ngt.go index 84270ad528..6847df909d 100644 --- a/internal/core/algorithm/ngt/ngt.go +++ b/internal/core/algorithm/ngt/ngt.go @@ -156,8 +156,8 @@ const ( // ------------------------------------------------------------- // dimension constraints // -------------------------------------------------------------. - ngtVectorDimensionSizeLimit = 1 << 16 - minimumDimensionSize = algorithm.MinimumVectorDimensionSize + VectorDimensionSizeLimit = 1<<32 - 1 + minimumDimensionSize = algorithm.MinimumVectorDimensionSize // -------------------------------------------------------------. ) @@ -685,8 +685,8 @@ func (n *ngt) GetVector(id uint) ([]float32, error) { if results == nil { return nil, n.newGoError(ebuf) } - ret = (*[ngtVectorDimensionSizeLimit]float32)(unsafe.Pointer(results))[:dimension:dimension] - // for _, elem := range (*[ngtVectorDimensionSizeLimit]C.float)(unsafe.Pointer(results))[:dimension:dimension]{ + ret = (*[VectorDimensionSizeLimit]float32)(unsafe.Pointer(results))[:dimension:dimension] + // for _, elem := range (*[VectorDimensionSizeLimit]C.float)(unsafe.Pointer(results))[:dimension:dimension]{ // ret = append(ret, float32(elem)) // } case Uint8: @@ -697,7 +697,7 @@ func (n *ngt) GetVector(id uint) ([]float32, error) { return nil, n.newGoError(ebuf) } ret = make([]float32, 0, dimension) - for _, elem := range (*[ngtVectorDimensionSizeLimit]C.uint8_t)(unsafe.Pointer(results))[:dimension:dimension] { + for _, elem := range (*[VectorDimensionSizeLimit]C.uint8_t)(unsafe.Pointer(results))[:dimension:dimension] { ret = append(ret, float32(elem)) } default: diff --git a/internal/core/algorithm/ngt/ngt_test.go b/internal/core/algorithm/ngt/ngt_test.go index 81f3e88d2c..9586637ad5 100644 --- a/internal/core/algorithm/ngt/ngt_test.go +++ b/internal/core/algorithm/ngt/ngt_test.go @@ -183,7 +183,7 @@ func TestNew(t *testing.T) { }, }, want: want{ - err: errors.NewErrCriticalOption("dimension", 1, errors.ErrInvalidDimensionSize(1, ngtVectorDimensionSizeLimit)), + err: errors.NewErrCriticalOption("dimension", 1, errors.ErrInvalidDimensionSize(1, VectorDimensionSizeLimit)), }, }, } @@ -761,7 +761,7 @@ func Test_gen(t *testing.T) { }, }, want: want{ - err: errors.NewErrCriticalOption("dimension", 1, errors.ErrInvalidDimensionSize(1, ngtVectorDimensionSizeLimit)), + err: errors.NewErrCriticalOption("dimension", 1, errors.ErrInvalidDimensionSize(1, VectorDimensionSizeLimit)), }, }, } diff --git a/internal/core/algorithm/ngt/option.go b/internal/core/algorithm/ngt/option.go index e227a7c09f..78700e0d43 100644 --- a/internal/core/algorithm/ngt/option.go +++ b/internal/core/algorithm/ngt/option.go @@ -86,8 +86,8 @@ func WithBulkInsertChunkSize(size int) Option { // WithDimension represents the option to set the dimension for NGT. func WithDimension(size int) Option { return func(n *ngt) error { - if size > ngtVectorDimensionSizeLimit || size < minimumDimensionSize { - err := errors.ErrInvalidDimensionSize(size, ngtVectorDimensionSizeLimit) + if size > VectorDimensionSizeLimit || size < minimumDimensionSize { + err := errors.ErrInvalidDimensionSize(size, VectorDimensionSizeLimit) return errors.NewErrCriticalOption("dimension", size, err) } diff --git a/internal/core/algorithm/ngt/option_test.go b/internal/core/algorithm/ngt/option_test.go index c0fe4101e8..2042effc61 100644 --- a/internal/core/algorithm/ngt/option_test.go +++ b/internal/core/algorithm/ngt/option_test.go @@ -20,6 +20,7 @@ package ngt import ( "math" "reflect" + "strconv" "testing" "github.com/vdaas/vald/internal/errors" @@ -329,13 +330,15 @@ func TestWithDimension(t *testing.T) { }, }, { - name: "set success when the size is 0", + name: "return error when the size is 0", args: args{ size: 0, }, want: want{ obj: &T{}, - err: errors.New("invalid critical option, name: dimension, val: 0: dimension size 0 is invalid, the supporting dimension size must be between 2 ~ 65536"), + err: errors.New( + "invalid critical option, name: dimension, val: 0: dimension size 0 is invalid, the supporting dimension size must be between 2 ~ " + strconv.Itoa(VectorDimensionSizeLimit), + ), }, }, { @@ -348,9 +351,9 @@ func TestWithDimension(t *testing.T) { }, }, { - name: "set success when the size is 65536", + name: "set success when the size is VectorDimensionSizeLimit", args: args{ - size: 65536, + size: VectorDimensionSizeLimit, }, want: want{ obj: &T{}, @@ -363,7 +366,9 @@ func TestWithDimension(t *testing.T) { }, want: want{ obj: &T{}, - err: errors.New("invalid critical option, name: dimension, val: 1: dimension size 1 is invalid, the supporting dimension size must be between 2 ~ 65536"), + err: errors.New( + "invalid critical option, name: dimension, val: 1: dimension size 1 is invalid, the supporting dimension size must be between 2 ~ " + strconv.Itoa(VectorDimensionSizeLimit), + ), }, }, { @@ -373,27 +378,40 @@ func TestWithDimension(t *testing.T) { }, want: want{ obj: &T{}, - err: errors.New("invalid critical option, name: dimension, val: -100: dimension size -100 is invalid, the supporting dimension size must be between 2 ~ 65536"), + err: errors.New( + "invalid critical option, name: dimension, val: -100: dimension size -100 is invalid, the supporting dimension size must be between 2 ~ " + strconv.Itoa(VectorDimensionSizeLimit), + ), }, }, { - name: "return error when the size is 65537", + name: "return error when the size is larger than VectorDimensionSizeLimit", args: args{ - size: 65537, + size: VectorDimensionSizeLimit + 1, }, want: want{ obj: &T{}, - err: errors.New("invalid critical option, name: dimension, val: 65537: dimension size 65537 is invalid, the supporting dimension size must be between 2 ~ 65536"), + err: errors.New( + "invalid critical option, name: dimension, val: 4294967296: dimension size 4294967296 is invalid, the supporting dimension size must be between 2 ~ " + strconv.Itoa( + VectorDimensionSizeLimit, + ), + ), }, }, { - name: "return error when the size is MaxInt32", + name: "set success when the size is MaxInt32", args: args{ size: math.MaxInt32, }, want: want{ - obj: &T{}, - err: errors.New("invalid critical option, name: dimension, val: 2147483647: dimension size 2147483647 is invalid, the supporting dimension size must be between 2 ~ 65536"), + obj: func() *T { + t := &T{ + dimension: math.MaxInt32, + } + if err := t.setup(); err != nil { + return nil + } + return t + }(), }, }, { @@ -403,7 +421,11 @@ func TestWithDimension(t *testing.T) { }, want: want{ obj: &T{}, - err: errors.New("invalid critical option, name: dimension, val: -2147483648: dimension size -2147483648 is invalid, the supporting dimension size must be between 2 ~ 65536"), + err: errors.New( + "invalid critical option, name: dimension, val: -2147483648: dimension size -2147483648 is invalid, the supporting dimension size must be between 2 ~ " + strconv.Itoa( + VectorDimensionSizeLimit, + ), + ), }, }, } diff --git a/tests/performance/max_vector_dim_test.go b/tests/performance/max_vector_dim_test.go new file mode 100644 index 0000000000..65a4aa8149 --- /dev/null +++ b/tests/performance/max_vector_dim_test.go @@ -0,0 +1,300 @@ +// +// Copyright (C) 2019-2022 vdaas.org vald team +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +package performance + +import ( + "bufio" + "context" + "os" + "strconv" + "strings" + "sync" + "testing" + "time" + + "github.com/vdaas/vald/apis/grpc/v1/payload" + "github.com/vdaas/vald/internal/config" + "github.com/vdaas/vald/internal/core/algorithm/ngt" + "github.com/vdaas/vald/internal/errgroup" + "github.com/vdaas/vald/internal/errors" + "github.com/vdaas/vald/internal/test/data/vector" + "github.com/vdaas/vald/pkg/agent/core/ngt/handler/grpc" + "github.com/vdaas/vald/pkg/agent/core/ngt/service" +) + +const ( + maxBit = 32 + freeMemLimit = 500 // Limit of free memory remaining(MB) +) + +func init_ngt_service(dim int) (service.NGT, error) { + cfg := &config.NGT{ + Dimension: dim, + DistanceType: ngt.L2.String(), + ObjectType: ngt.Float.String(), + EnableInMemoryMode: true, + AutoIndexDurationLimit: "96h", + AutoIndexCheckDuration: "96h", + AutoSaveIndexDuration: "96h", + AutoIndexLength: 10000000000, + KVSDB: &config.KVSDB{ + Concurrency: 1, + }, + VQueue: &config.VQueue{ + InsertBufferPoolSize: 100, + DeleteBufferPoolSize: 100, + }, + } + ngt, err := service.New(cfg.Bind()) + if err != nil { + return nil, err + } + return ngt, nil +} + +func parse(raw string) (key string, value int) { + text := strings.ReplaceAll(raw[:len(raw)-2], " ", "") + keyValue := strings.Split(text, ":") + val := 0 + if keyValue[1] != "" { + val, err := strconv.Atoi(keyValue[1]) + if err != nil { + panic(err) + } + return keyValue[0], val + } + return keyValue[0], val +} + +// Test for investigation of max dimension size for agent handler +func TestMaxDimInsert(t *testing.T) { + t.Helper() + eg, ctx := errgroup.New(context.Background()) + mu := sync.Mutex{} + // Get the above the limit of bit (2~32) + bits := make([]int, 0, maxBit-1) + ticker := time.NewTicker(5 * time.Second) + eg.Go(func() error { + for { + select { + case <-ctx.Done(): + if ok := mu.TryLock(); !ok { + mu.Unlock() + } + return nil + case <-ticker.C: + f, err := os.Open("/proc/meminfo") + if err != nil { + panic(err) + } + bufio.NewScanner(f) + scanner := bufio.NewScanner(f) + var MemFree int + for scanner.Scan() { + key, value := parse(scanner.Text()) + switch key { + case "MemFree": + MemFree = value + } + } + err = f.Close() + if err != nil { + panic(err) + } + if MemFree/1024 < freeMemLimit { + t.Logf("MemFree reaches the limit: current : %dMb, limit : %dMb", MemFree/1024, freeMemLimit) + return errors.New("Memory Limit") + } + } + } + }) + eg.Go(func() error { + for bit := 2; bit <= maxBit; bit++ { + select { + case <-ctx.Done(): + t.Log("canceld") + return nil + default: + dim := 1 << bit + if bit == maxBit { + dim-- + } + if dim > ngt.VectorDimensionSizeLimit { + t.Fatal(errors.ErrInvalidDimensionSize(dim, ngt.VectorDimensionSizeLimit)) + } + t.Logf("Start test: dimension = %d (bit = %d)", dim, bit) + ngt, err := init_ngt_service(dim) + time.Sleep(100 * time.Millisecond) + if err != nil { + t.Errorf("[Fail] Create NGT service: %#v", err) + return err + } + vec := vector.GaussianDistributedFloat32VectorGenerator(1, dim)[0] + err = ngt.Insert(strconv.Itoa(dim), vec) + if err != nil { + t.Errorf("Insert error: %#v", err) + return err + } + t.Logf("Insert is finished: dimension = %d (bit = %d)", dim, bit) + err = ngt.CreateIndex(ctx, 10) + if err != nil { + t.Errorf("CreateIndex is failed: %#v", err) + return err + } + t.Logf("CreateIndex is finished: dimension = %d (bit = %d)", dim, bit) + err = ngt.Close(ctx) + if err != nil { + t.Errorf("NGT close error: %#v", err) + return err + } + mu.Lock() + bits = append(bits, bit) + mu.Unlock() + t.Logf("All processes are finished: dimension = %d (bit = %d)", dim, bit) + } + t.Log("Wait for memory release") + time.Sleep(30 * time.Second) + } + return nil + }) + eg.Wait() + // Get the max bit, which the environment finish process, from bits + var max_bit int + for _, v := range bits { + if max_bit < v { + max_bit = v + } + } + t.Logf("Max bit is %d", max_bit) +} + +// Test for investigation of max dimension size for agent handler with gRPC +func TestMaxDimInsertGRPC(t *testing.T) { + // MaxUint64 cannot be used due to overflows + t.Helper() + eg, ctx := errgroup.New(context.Background()) + mu := sync.Mutex{} + // Get the above the limit of bit (2~32) + bits := make([]int, 0, maxBit-1) + ticker := time.NewTicker(5 * time.Second) + eg.Go(func() error { + for { + select { + case <-ctx.Done(): + if ok := mu.TryLock(); !ok { + mu.Unlock() + } + return nil + case <-ticker.C: + f, err := os.Open("/proc/meminfo") + if err != nil { + panic(err) + } + bufio.NewScanner(f) + scanner := bufio.NewScanner(f) + var MemFree int + for scanner.Scan() { + key, value := parse(scanner.Text()) + switch key { + case "MemFree": + MemFree = value + } + } + err = f.Close() + if err != nil { + panic(err) + } + if MemFree/1024 < freeMemLimit { + t.Logf("MemFree reaches the limit: current : %dMb, limit : %dMb", MemFree/1024, freeMemLimit) + return errors.New("Memory Limit") + } + } + } + }) + eg.Go(func() error { + for bit := 2; bit <= maxBit; bit++ { + select { + case <-ctx.Done(): + t.Log("canceld") + return nil + default: + dim := 1 << bit + if bit == maxBit { + dim-- + } + if dim > ngt.VectorDimensionSizeLimit { + t.Fatal(errors.ErrInvalidDimensionSize(dim, ngt.VectorDimensionSizeLimit)) + } + t.Logf("Start test: dimension = %d (bit = %d)", dim, bit) + ngt, err := init_ngt_service(dim) + time.Sleep(100 * time.Millisecond) + if err != nil { + t.Errorf("[Fail] Create NGT service: %#v", err) + return err + } + s, err := grpc.New(grpc.WithNGT(ngt)) + if err != nil { + t.Errorf("[Error] Failed to create grpc service: %#v", s) + return err + } + vec := vector.GaussianDistributedFloat32VectorGenerator(1, dim)[0] + req := &payload.Insert_Request{ + Vector: &payload.Object_Vector{ + Id: strconv.Itoa(dim), + Vector: vec, + }, + Config: &payload.Insert_Config{ + SkipStrictExistCheck: false, + }, + } + _, err = s.Insert(ctx, req) + if err != nil { + t.Errorf("[Error] Failed to Insert Vector (Dim = %d): %#v", dim, err) + return err + } + t.Logf("Insert is finished: dimension = %d (bit = %d)", dim, bit) + _, err = s.CreateIndex(ctx, &payload.Control_CreateIndexRequest{ + PoolSize: 10, + }) + if err != nil { + t.Errorf("CreateIndex is failed: %#v", err) + return err + } + t.Logf("CreateIndex is finished: dimension = %d (bit = %d)", dim, bit) + err = ngt.Close(ctx) + if err != nil { + return err + } + mu.Lock() + bits = append(bits, bit) + mu.Unlock() + t.Logf("All processes are finished: dimension = %d (bit = %d)", dim, bit) + } + t.Log("Wait for memory release") + time.Sleep(30 * time.Second) + } + return nil + }) + eg.Wait() + // Get the max bit, which the environment finish process, from bits + var max_bit int + for _, v := range bits { + if max_bit < v { + max_bit = v + } + } + t.Logf("Max bit is %d", max_bit) +} diff --git a/versions/GO_VERSION b/versions/GO_VERSION index ec6d649be6..b57fc7228b 100644 --- a/versions/GO_VERSION +++ b/versions/GO_VERSION @@ -1 +1 @@ -1.18.1 +1.18.2 diff --git a/versions/OPERATOR_SDK_VERSION b/versions/OPERATOR_SDK_VERSION index d834d338e3..875df4b05f 100644 --- a/versions/OPERATOR_SDK_VERSION +++ b/versions/OPERATOR_SDK_VERSION @@ -1 +1 @@ -v1.19 +v1.20