diff --git a/example/client/go.mod b/example/client/go.mod index 50580f6d946..55f6495edc5 100644 --- a/example/client/go.mod +++ b/example/client/go.mod @@ -4,7 +4,7 @@ go 1.20 replace ( github.com/envoyproxy/protoc-gen-validate => github.com/envoyproxy/protoc-gen-validate v0.9.1 - github.com/goccy/go-json => github.com/goccy/go-json v0.10.0 + github.com/goccy/go-json => github.com/goccy/go-json v0.10.1 github.com/golang/protobuf => github.com/golang/protobuf v1.5.3 github.com/kpango/glg => github.com/kpango/glg v1.6.14 github.com/pkg/sftp => github.com/pkg/sftp v1.13.5 @@ -13,7 +13,7 @@ replace ( golang.org/x/text => golang.org/x/text v0.8.0 google.golang.org/genproto => google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 google.golang.org/grpc => google.golang.org/grpc v1.53.0 - google.golang.org/protobuf => google.golang.org/protobuf v1.29.0 + google.golang.org/protobuf => google.golang.org/protobuf v1.30.0 gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1 ) @@ -21,7 +21,7 @@ replace ( require ( github.com/kpango/fuid v0.0.0-20221203053508-503b5ad89aa1 github.com/kpango/glg v1.6.14 - github.com/vdaas/vald-client-go v1.7.2 + github.com/vdaas/vald-client-go v1.7.3 gonum.org/v1/hdf5 v0.0.0-20210714002203-8c5d23bc6946 google.golang.org/grpc v1.53.0 ) diff --git a/example/client/go.sum b/example/client/go.sum index 67288746ea2..e160a23e5b3 100644 --- a/example/client/go.sum +++ b/example/client/go.sum @@ -1,7 +1,7 @@ github.com/envoyproxy/protoc-gen-validate v0.9.1 h1:PS7VIOgmSVhWUEeZwTe7z7zouA22Cr590PzXKbZHOVY= github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w= -github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA= -github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.1 h1:lEs5Ob+oOG/Ze199njvzHbhn6p9T+h64F5hRj69iTTo= +github.com/goccy/go-json v0.10.1/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -13,8 +13,8 @@ github.com/kpango/fuid v0.0.0-20221203053508-503b5ad89aa1/go.mod h1:CAYeq6us9Nfn github.com/kpango/glg v1.6.14 h1:Ss3ZvTQ23blUCDYizSAijiFTZsgGeYr/lanUGgQ10rY= github.com/kpango/glg v1.6.14/go.mod h1:2djk7Zr4zKIYPHlORH8tJVlhCEh+XXW8W4K3qJyNXMI= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/vdaas/vald-client-go v1.7.2 h1:+rP/RZCU2EfRbH9J3xSUeFk57Di60lwvagpZ+/VmgpY= -github.com/vdaas/vald-client-go v1.7.2/go.mod h1:12JFkKHaCTYH7GrMWt1p+GkfSdmYCOtVJydNZtBaY0k= +github.com/vdaas/vald-client-go v1.7.3 h1:wtaOp7EMD+urVSNztj0XphuxDlnhKXRWIptz/xt15dQ= +github.com/vdaas/vald-client-go v1.7.3/go.mod h1:mq/+8G8ZnunF68uePIRcuZTuG1wjpHq5w4QMgUKICOw= 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.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= @@ -31,5 +31,5 @@ google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= -google.golang.org/protobuf v1.29.0 h1:44S3JjaKmLEE4YIkjzexaP+NzZsudE3Zin5Njn/pYX0= -google.golang.org/protobuf v1.29.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/go.mod b/go.mod index 1d9bb2707e6..c301eea3977 100755 --- a/go.mod +++ b/go.mod @@ -8,13 +8,13 @@ replace ( cloud.google.com/go/compute => cloud.google.com/go/compute v1.18.0 cloud.google.com/go/datastore => cloud.google.com/go/datastore v1.10.0 cloud.google.com/go/firestore => cloud.google.com/go/firestore v1.9.0 - cloud.google.com/go/iam => cloud.google.com/go/iam v0.12.0 - cloud.google.com/go/kms => cloud.google.com/go/kms v1.9.0 - cloud.google.com/go/monitoring => cloud.google.com/go/monitoring v1.12.0 - cloud.google.com/go/pubsub => cloud.google.com/go/pubsub v1.28.0 + cloud.google.com/go/iam => cloud.google.com/go/iam v0.13.0 + cloud.google.com/go/kms => cloud.google.com/go/kms v1.10.0 + cloud.google.com/go/monitoring => cloud.google.com/go/monitoring v1.13.0 + cloud.google.com/go/pubsub => cloud.google.com/go/pubsub v1.29.0 cloud.google.com/go/secretmanager => cloud.google.com/go/secretmanager v1.10.0 - cloud.google.com/go/storage => cloud.google.com/go/storage v1.29.0 - cloud.google.com/go/trace => cloud.google.com/go/trace v1.8.0 + cloud.google.com/go/storage => cloud.google.com/go/storage v1.30.0 + cloud.google.com/go/trace => cloud.google.com/go/trace v1.9.0 code.cloudfoundry.org/bytefmt => code.cloudfoundry.org/bytefmt v0.0.0-20211005130812-5bb3c17173e5 contrib.go.opencensus.io/exporter/aws => contrib.go.opencensus.io/exporter/aws v0.0.0-20200617204711-c478e41e60e9 contrib.go.opencensus.io/exporter/prometheus => contrib.go.opencensus.io/exporter/prometheus v0.4.2 @@ -30,24 +30,24 @@ replace ( github.com/Azure/azure-storage-blob-go => github.com/Azure/azure-storage-blob-go v0.15.0 github.com/Azure/go-amqp => github.com/Azure/go-amqp v0.18.1 github.com/Azure/go-ansiterm => github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 - github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.2.1-0.20230227174125-ee71315119d4+incompatible - github.com/Azure/go-autorest/autorest => github.com/Azure/go-autorest/autorest v0.11.29-0.20230227174125-ee71315119d4 - github.com/Azure/go-autorest/autorest/adal => github.com/Azure/go-autorest/autorest/adal v0.9.22 - github.com/Azure/go-autorest/autorest/azure/auth => github.com/Azure/go-autorest/autorest/azure/auth v0.5.13-0.20230227174125-ee71315119d4 - github.com/Azure/go-autorest/autorest/azure/cli => github.com/Azure/go-autorest/autorest/azure/cli v0.4.7-0.20230227174125-ee71315119d4 - github.com/Azure/go-autorest/autorest/date => github.com/Azure/go-autorest/autorest/date v0.3.1-0.20230227174125-ee71315119d4 - github.com/Azure/go-autorest/autorest/mocks => github.com/Azure/go-autorest/autorest/mocks v0.4.3-0.20230227174125-ee71315119d4 - github.com/Azure/go-autorest/autorest/to => github.com/Azure/go-autorest/autorest/to v0.4.1-0.20230227174125-ee71315119d4 - github.com/Azure/go-autorest/autorest/validation => github.com/Azure/go-autorest/autorest/validation v0.3.2-0.20230227174125-ee71315119d4 - github.com/Azure/go-autorest/logger => github.com/Azure/go-autorest/logger v0.2.2-0.20230227174125-ee71315119d4 - github.com/Azure/go-autorest/tracing => github.com/Azure/go-autorest/tracing v0.6.1-0.20230227174125-ee71315119d4 + github.com/Azure/go-autorest => github.com/Azure/go-autorest v14.2.1-0.20230315184244-553a90ae65a6+incompatible + github.com/Azure/go-autorest/autorest => github.com/Azure/go-autorest/autorest v0.11.29-0.20230315184244-553a90ae65a6 + github.com/Azure/go-autorest/autorest/adal => github.com/Azure/go-autorest/autorest/adal v0.9.23 + github.com/Azure/go-autorest/autorest/azure/auth => github.com/Azure/go-autorest/autorest/azure/auth v0.5.13-0.20230315184244-553a90ae65a6 + github.com/Azure/go-autorest/autorest/azure/cli => github.com/Azure/go-autorest/autorest/azure/cli v0.4.7-0.20230315184244-553a90ae65a6 + github.com/Azure/go-autorest/autorest/date => github.com/Azure/go-autorest/autorest/date v0.3.1-0.20230315184244-553a90ae65a6 + github.com/Azure/go-autorest/autorest/mocks => github.com/Azure/go-autorest/autorest/mocks v0.4.3-0.20230315184244-553a90ae65a6 + github.com/Azure/go-autorest/autorest/to => github.com/Azure/go-autorest/autorest/to v0.4.1-0.20230315184244-553a90ae65a6 + github.com/Azure/go-autorest/autorest/validation => github.com/Azure/go-autorest/autorest/validation v0.3.2-0.20230315184244-553a90ae65a6 + github.com/Azure/go-autorest/logger => github.com/Azure/go-autorest/logger v0.2.2-0.20230315184244-553a90ae65a6 + github.com/Azure/go-autorest/tracing => github.com/Azure/go-autorest/tracing v0.6.1-0.20230315184244-553a90ae65a6 github.com/BurntSushi/toml => github.com/BurntSushi/toml v1.2.1 github.com/DATA-DOG/go-sqlmock => github.com/DATA-DOG/go-sqlmock v1.5.0 github.com/DataDog/datadog-go => github.com/DataDog/datadog-go v4.8.3+incompatible github.com/GoogleCloudPlatform/cloudsql-proxy => github.com/GoogleCloudPlatform/cloudsql-proxy v1.33.4 github.com/Masterminds/semver/v3 => github.com/Masterminds/semver/v3 v3.2.0 github.com/Microsoft/go-winio => github.com/Microsoft/go-winio v0.6.0 - github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.9.7 + github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.9.8 github.com/NYTimes/gziphandler => github.com/NYTimes/gziphandler v1.1.1 github.com/ajstarks/deck => github.com/ajstarks/deck v0.0.0-20230224115924-066756a95ed6 github.com/ajstarks/deck/generate => github.com/ajstarks/deck/generate v0.0.0-20230224115924-066756a95ed6 @@ -58,13 +58,13 @@ replace ( github.com/armon/go-radix => github.com/armon/go-radix v1.0.0 github.com/armon/go-socks5 => github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 github.com/asaskevich/govalidator => github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 - github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.44.219 + github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.44.222 github.com/aws/aws-sdk-go-v2 => github.com/aws/aws-sdk-go-v2 v1.17.6 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream => github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 - github.com/aws/aws-sdk-go-v2/config => github.com/aws/aws-sdk-go-v2/config v1.18.16 - github.com/aws/aws-sdk-go-v2/credentials => github.com/aws/aws-sdk-go-v2/credentials v1.13.16 - github.com/aws/aws-sdk-go-v2/feature/ec2/imds => github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.24 - github.com/aws/aws-sdk-go-v2/feature/s3/manager => github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.56 + github.com/aws/aws-sdk-go-v2/config => github.com/aws/aws-sdk-go-v2/config v1.18.17 + github.com/aws/aws-sdk-go-v2/credentials => github.com/aws/aws-sdk-go-v2/credentials v1.13.17 + github.com/aws/aws-sdk-go-v2/feature/ec2/imds => github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.0 + github.com/aws/aws-sdk-go-v2/feature/s3/manager => github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.57 github.com/aws/aws-sdk-go-v2/internal/configsources => github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.30 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 => github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.24 github.com/aws/aws-sdk-go-v2/internal/ini => github.com/aws/aws-sdk-go-v2/internal/ini v1.3.31 @@ -199,7 +199,7 @@ replace ( github.com/gobwas/httphead => github.com/gobwas/httphead v0.1.0 github.com/gobwas/pool => github.com/gobwas/pool v0.2.1 github.com/gobwas/ws => github.com/gobwas/ws v1.1.0 - github.com/goccy/go-json => github.com/goccy/go-json v0.10.0 + github.com/goccy/go-json => github.com/goccy/go-json v0.10.1 github.com/goccy/go-yaml => github.com/goccy/go-yaml v1.10.0 github.com/gocql/gocql => github.com/gocql/gocql v1.3.1 github.com/gocraft/dbr/v2 => github.com/gocraft/dbr/v2 v2.7.3 @@ -219,7 +219,7 @@ replace ( github.com/google/btree => github.com/google/btree v1.1.2 github.com/google/gnostic => github.com/google/gnostic v0.6.9 github.com/google/go-cmp => github.com/google/go-cmp v0.5.9 - github.com/google/go-containerregistry => github.com/google/go-containerregistry v0.13.0 + github.com/google/go-containerregistry => github.com/google/go-containerregistry v0.14.0 github.com/google/go-querystring => github.com/google/go-querystring v1.1.0 github.com/google/go-replayers/grpcreplay => github.com/google/go-replayers/grpcreplay v1.1.0 github.com/google/go-replayers/httpreplay => github.com/google/go-replayers/httpreplay v1.1.1 @@ -231,12 +231,12 @@ replace ( github.com/google/subcommands => github.com/google/subcommands v1.2.0 github.com/google/uuid => github.com/google/uuid v1.3.0 github.com/google/wire => github.com/google/wire v0.5.0 - github.com/googleapis/gax-go/v2 => github.com/googleapis/gax-go/v2 v2.7.1 + github.com/googleapis/gax-go/v2 => github.com/googleapis/gax-go/v2 v2.8.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/grafana/regexp => github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd github.com/gregjones/httpcache => github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 - github.com/grpc-ecosystem/go-grpc-middleware => github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 + github.com/grpc-ecosystem/go-grpc-middleware => github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 github.com/grpc-ecosystem/go-grpc-prometheus => github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 github.com/grpc-ecosystem/grpc-gateway => github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/grpc-ecosystem/grpc-gateway/v2 => github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 @@ -265,7 +265,7 @@ replace ( github.com/hetznercloud/hcloud-go => github.com/hetznercloud/hcloud-go v1.41.0 github.com/iancoleman/strcase => github.com/iancoleman/strcase v0.2.0 github.com/ianlancetaylor/demangle => github.com/ianlancetaylor/demangle v0.0.0-20220517205856-0058ec4f073c - github.com/imdario/mergo => github.com/imdario/mergo v0.3.13 + github.com/imdario/mergo => github.com/imdario/mergo v0.3.14 github.com/inconshreveable/mousetrap => github.com/inconshreveable/mousetrap v1.1.0 github.com/intel/goresctrl => github.com/intel/goresctrl v0.3.0 github.com/jackc/chunkreader/v2 => github.com/jackc/chunkreader/v2 v2.0.1 @@ -290,7 +290,7 @@ replace ( github.com/julienschmidt/httprouter => github.com/julienschmidt/httprouter v1.3.0 github.com/kisielk/errcheck => github.com/kisielk/errcheck v1.6.3 github.com/kisielk/gotool => github.com/kisielk/gotool v1.0.0 - github.com/klauspost/compress => github.com/klauspost/compress v1.16.1-0.20230312095358-c73f0087d88b + github.com/klauspost/compress => github.com/klauspost/compress v1.16.4-0.20230315151549-7633d627f0ca github.com/klauspost/cpuid/v2 => github.com/klauspost/cpuid/v2 v2.2.4 github.com/kolo/xmlrpc => github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b github.com/kpango/fastime => github.com/kpango/fastime v1.1.7 @@ -305,7 +305,7 @@ replace ( github.com/leodido/go-urn => github.com/leodido/go-urn v1.2.2 github.com/lib/pq => github.com/lib/pq v1.10.7 github.com/liggitt/tabwriter => github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de - github.com/linode/linodego => github.com/linode/linodego v1.14.1 + github.com/linode/linodego => github.com/linode/linodego v1.15.0 github.com/linuxkit/virtsock => github.com/linuxkit/virtsock v0.0.0-20220523201153-1a23e78aa7a2 github.com/lucasb-eyer/go-colorful => github.com/lucasb-eyer/go-colorful v1.2.0 github.com/lyft/protoc-gen-star => github.com/lyft/protoc-gen-star v0.6.2 @@ -338,7 +338,7 @@ replace ( github.com/oklog/run => github.com/oklog/run v1.1.0 github.com/oklog/ulid => github.com/oklog/ulid v1.3.1 github.com/onsi/ginkgo => github.com/onsi/ginkgo v1.16.5 - github.com/onsi/gomega => github.com/onsi/gomega v1.27.3 + github.com/onsi/gomega => github.com/onsi/gomega v1.27.4 github.com/peterbourgon/diskv => github.com/peterbourgon/diskv v2.0.1+incompatible github.com/phpdave11/gofpdf => github.com/phpdave11/gofpdf v1.4.2 github.com/phpdave11/gofpdi => github.com/phpdave11/gofpdi v1.0.13 @@ -398,7 +398,7 @@ replace ( github.com/stretchr/objx => github.com/stretchr/objx v0.5.0 github.com/stretchr/testify => github.com/stretchr/testify v1.8.2 github.com/ugorji/go/codec => github.com/ugorji/go/codec v1.2.11 - github.com/vdaas/vald-client-go => github.com/vdaas/vald-client-go v1.7.2 + github.com/vdaas/vald-client-go => github.com/vdaas/vald-client-go v1.7.3 github.com/vishvananda/netlink => github.com/vishvananda/netlink v1.1.0 github.com/vishvananda/netns => github.com/vishvananda/netns v0.0.4 github.com/xdg-go/pbkdf2 => github.com/xdg-go/pbkdf2 v1.0.0 @@ -442,8 +442,8 @@ replace ( go.uber.org/zap => go.uber.org/zap v1.24.0 gocloud.dev => gocloud.dev v0.29.0 golang.org/x/crypto => golang.org/x/crypto v0.7.0 - golang.org/x/exp => golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0 - golang.org/x/exp/typeparams => golang.org/x/exp/typeparams v0.0.0-20230310171629-522b1b587ee0 + golang.org/x/exp => golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0 + golang.org/x/exp/typeparams => golang.org/x/exp/typeparams v0.0.0-20230315142452-642cacee5cc0 golang.org/x/image => golang.org/x/image v0.6.0 golang.org/x/lint => golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 golang.org/x/mobile => golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c @@ -461,12 +461,12 @@ replace ( gonum.org/v1/gonum => gonum.org/v1/gonum v0.12.0 gonum.org/v1/hdf5 => gonum.org/v1/hdf5 v0.0.0-20210714002203-8c5d23bc6946 gonum.org/v1/plot => gonum.org/v1/plot v0.12.0 - google.golang.org/api => google.golang.org/api v0.112.0 + google.golang.org/api => google.golang.org/api v0.113.0 google.golang.org/appengine => google.golang.org/appengine v1.6.7 google.golang.org/genproto => google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 google.golang.org/grpc => google.golang.org/grpc v1.53.0 google.golang.org/grpc/cmd/protoc-gen-go-grpc => google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 - google.golang.org/protobuf => google.golang.org/protobuf v1.29.0 + google.golang.org/protobuf => google.golang.org/protobuf v1.30.0 gopkg.in/alecthomas/kingpin.v2 => gopkg.in/alecthomas/kingpin.v2 v2.3.2 gopkg.in/check.v1 => gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c gopkg.in/gcfg.v1 => gopkg.in/gcfg.v1 v1.2.3 @@ -477,7 +477,7 @@ replace ( gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1 gotest.tools/v3 => gotest.tools/v3 v3.4.0 - honnef.co/go/tools => honnef.co/go/tools v0.4.2 + honnef.co/go/tools => honnef.co/go/tools v0.4.3 k8s.io/api => k8s.io/api v0.26.2 k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.2 k8s.io/apimachinery => k8s.io/apimachinery v0.26.2 @@ -549,12 +549,12 @@ require ( golang.org/x/sync v0.1.0 golang.org/x/sys v0.6.0 golang.org/x/text v0.8.0 - golang.org/x/tools v0.6.0 + golang.org/x/tools v0.7.0 gonum.org/v1/hdf5 v0.0.0-00010101000000-000000000000 gonum.org/v1/plot v0.10.1 - google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488 + google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 google.golang.org/grpc v1.53.0 - google.golang.org/protobuf v1.28.1 + google.golang.org/protobuf v1.29.1 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.26.2 k8s.io/apimachinery v0.26.2 @@ -603,7 +603,7 @@ require ( github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/wire v0.5.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect - github.com/googleapis/gax-go/v2 v2.7.0 // indirect + github.com/googleapis/gax-go/v2 v2.7.1 // indirect github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect diff --git a/go.sum b/go.sum index cbff498330a..f979db981c7 100644 --- a/go.sum +++ b/go.sum @@ -65,12 +65,12 @@ cloud.google.com/go/gkehub v0.11.0/go.mod h1:JOWHlmN+GHyIbuWQPl47/C2RFhnFKH38jH9 cloud.google.com/go/gkemulticloud v0.5.0/go.mod h1:W0JDkiyi3Tqh0TJr//y19wyb1yf8llHVto2Htf2Ja3Y= cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= cloud.google.com/go/gsuiteaddons v1.5.0/go.mod h1:TFCClYLd64Eaa12sFVmUyG62tk4mdIsI7pAnSXRkcFo= -cloud.google.com/go/iam v0.12.0 h1:DRtTY29b75ciH6Ov1PHb4/iat2CLCvrOm40Q0a6DFpE= -cloud.google.com/go/iam v0.12.0/go.mod h1:knyHGviacl11zrtZUoDuYpDgLjvr28sLQaG0YB2GYAY= +cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k= +cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= cloud.google.com/go/iap v1.6.0/go.mod h1:NSuvI9C/j7UdjGjIde7t7HBz+QTwBcapPE07+sSRcLk= cloud.google.com/go/ids v1.3.0/go.mod h1:JBdTYwANikFKaDP6LtW5JAi4gubs57SVNQjemdt6xV4= cloud.google.com/go/iot v1.5.0/go.mod h1:mpz5259PDl3XJthEmh9+ap0affn/MqNSP4My77Qql9o= -cloud.google.com/go/kms v1.9.0/go.mod h1:qb1tPTgfF9RQP8e1wq4cLFErVuTJv7UsSC915J8dh3w= +cloud.google.com/go/kms v1.10.0/go.mod h1:ng3KTUtQQU9bPX3+QGLsflZIHlkbn8amFAMY63m8d24= cloud.google.com/go/language v1.9.0/go.mod h1:Ns15WooPM5Ad/5no/0n81yUetis74g3zrbeJBE+ptUY= cloud.google.com/go/lifesciences v0.8.0/go.mod h1:lFxiEOMqII6XggGbOnKiyZ7IBwoIqA84ClvoezaA/bo= cloud.google.com/go/logging v1.7.0/go.mod h1:3xjP2CjkM3ZkO73aj4ASA5wRPGGCRrPIAeNqVNkzY8M= @@ -84,7 +84,7 @@ cloud.google.com/go/maps v0.6.0/go.mod h1:o6DAMMfb+aINHz/p/jbcY+mYeXBoZoxTfdSQ8V cloud.google.com/go/mediatranslation v0.7.0/go.mod h1:LCnB/gZr90ONOIQLgSXagp8XUW1ODs2UmUMvcgMfI2I= cloud.google.com/go/memcache v1.9.0/go.mod h1:8oEyzXCu+zo9RzlEaEjHl4KkgjlNDaXbCQeQWlzNFJM= cloud.google.com/go/metastore v1.10.0/go.mod h1:fPEnH3g4JJAk+gMRnrAnoqyv2lpUCqJPWOodSaf45Eo= -cloud.google.com/go/monitoring v1.12.0/go.mod h1:yx8Jj2fZNEkL/GYZyTLS4ZtZEZN8WtDEiEqG4kLK50w= +cloud.google.com/go/monitoring v1.13.0/go.mod h1:k2yMBAB1H9JT/QETjNkgdCGD9bPF712XiLTVr+cBrpw= cloud.google.com/go/networkconnectivity v1.10.0/go.mod h1:UP4O4sWXJG13AqrTdQCD9TnLGEbtNRqjuaaA7bNjF5E= cloud.google.com/go/networkmanagement v1.6.0/go.mod h1:5pKPqyXjB/sgtvB5xqOemumoQNB7y95Q7S+4rjSOPYY= cloud.google.com/go/networksecurity v0.7.0/go.mod h1:mAnzoxx/8TBSyXEeESMy9OOYwo1v+gZ5eMRnsT5bC8k= @@ -98,7 +98,7 @@ cloud.google.com/go/oslogin v1.9.0/go.mod h1:HNavntnH8nzrn8JCTT5fj18FuJLFJc4NaZJ cloud.google.com/go/phishingprotection v0.7.0/go.mod h1:8qJI4QKHoda/sb/7/YmMQ2omRLSLYSu9bU0EKCNI+Lk= cloud.google.com/go/policytroubleshooter v1.5.0/go.mod h1:Rz1WfV+1oIpPdN2VvvuboLVRsB1Hclg3CKQ53j9l8vw= cloud.google.com/go/privatecatalog v0.7.0/go.mod h1:2s5ssIFO69F5csTXcwBP7NPFTZvps26xGzvQ2PQaBYg= -cloud.google.com/go/pubsub v1.28.0/go.mod h1:vuXFpwaVoIPQMGXqRyUQigu/AX1S3IWugR9xznmcXX8= +cloud.google.com/go/pubsub v1.29.0/go.mod h1:QqxtZtlMMScyK1Fxy5dEpv/ZiXXJhFmXZydjBIUKPW0= cloud.google.com/go/pubsublite v1.6.0/go.mod h1:1eFCS0U11xlOuMFV/0iBqw3zP12kddMeCbj/F3FSj9k= cloud.google.com/go/recaptchaenterprise v1.3.1/go.mod h1:OdD+q+y4XGeAlxRaMn1Y7/GveP6zmq76byL6tjPE7d4= cloud.google.com/go/recaptchaenterprise/v2 v2.6.0/go.mod h1:RPauz9jeLtB3JVzg6nCbe12qNoaa8pXc4d/YukAmcnA= @@ -120,13 +120,13 @@ cloud.google.com/go/serviceusage v1.5.0/go.mod h1:w8U1JvqUqwJNPEOTQjrMHkw3IaIFLo cloud.google.com/go/shell v1.6.0/go.mod h1:oHO8QACS90luWgxP3N9iZVuEiSF84zNyLytb+qE2f9A= cloud.google.com/go/spanner v1.44.0/go.mod h1:G8XIgYdOK+Fbcpbs7p2fiprDw4CaZX63whnSMLVBxjk= cloud.google.com/go/speech v1.14.1/go.mod h1:gEosVRPJ9waG7zqqnsHpYTOoAS4KouMRLDFMekpJ0J0= -cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI= -cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4= +cloud.google.com/go/storage v1.30.0 h1:g1yrbxAWOrvg/594228pETWkOi00MLTrOWfh56veU5o= +cloud.google.com/go/storage v1.30.0/go.mod h1:xAVretHSROm1BQX4IIsoVgJqw0LqOyX+I/O2GzRAzdE= cloud.google.com/go/storagetransfer v1.7.0/go.mod h1:8Giuj1QNb1kfLAiWM1bN6dHzfdlDAVC9rv9abHot2W4= cloud.google.com/go/talent v1.5.0/go.mod h1:G+ODMj9bsasAEJkQSzO2uHQWXHHXUomArjWQQYkqK6c= cloud.google.com/go/texttospeech v1.6.0/go.mod h1:YmwmFT8pj1aBblQOI3TfKmwibnsfvhIBzPXcW4EBovc= cloud.google.com/go/tpu v1.5.0/go.mod h1:8zVo1rYDFuW2l4yZVY0R0fb/v44xLh3llq7RuV61fPM= -cloud.google.com/go/trace v1.8.0/go.mod h1:zH7vcsbAhklH8hWFig58HvxcxyQbaIqMarMg9hn5ECA= +cloud.google.com/go/trace v1.9.0/go.mod h1:lOQqpE5IaWY0Ixg7/r2SjixMuc6lfTFeO4QGM4dQWOk= cloud.google.com/go/translate v1.6.0/go.mod h1:lMGRudH1pu7I3n3PETiOB2507gf3HnfLV8qlkHZEyos= cloud.google.com/go/video v1.13.0/go.mod h1:ulzkYlYgCp15N2AokzKjy7MQ9ejuynOJdf1tR5lGthk= cloud.google.com/go/videointelligence v1.10.0/go.mod h1:LHZngX1liVtUhZvi2uNS0VQuOzNi2TkY1OakiuoUOjU= @@ -166,14 +166,14 @@ github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.7.1/go.mod h1:9V2j0jn github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.2.0/go.mod h1:R6+0udeRV8iYSTVuT5RT7If4sc46K5Bz3ZKrmvZQF7U= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.0.0/go.mod h1:2e8rMJtl2+2j+HXbTBwnyGpm5Nou7KhvSfxOq8JpTag= github.com/Azure/go-amqp v0.18.1/go.mod h1:+bg0x3ce5+Q3ahCEXnCsGG3ETpDQe3MEVnOuT2ywPwc= -github.com/Azure/go-autorest v14.2.1-0.20230227174125-ee71315119d4+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest v0.11.29-0.20230227174125-ee71315119d4/go.mod h1:ZtEzC4Jy2JDrZLxvWs8LrBWEBycl1hbT1eknI8MtfAs= -github.com/Azure/go-autorest/autorest/adal v0.9.22/go.mod h1:XuAbAEUv2Tta//+voMI038TrJBqjKam0me7qR+L8Cmk= -github.com/Azure/go-autorest/autorest/date v0.3.1-0.20230227174125-ee71315119d4/go.mod h1:CHJ5Cu2H2HOHbo8wSOidbGEk/L11sCIy/IglS16YuRI= -github.com/Azure/go-autorest/autorest/mocks v0.4.3-0.20230227174125-ee71315119d4/go.mod h1:Vy7OitM9Kei0i1Oj+LvyAWMXJHeKH1MVlzFugfVrmyU= -github.com/Azure/go-autorest/autorest/to v0.4.1-0.20230227174125-ee71315119d4/go.mod h1:DSh3VxN6gfEglfL5RXwMuwLQrHEayq9JF/NUe+DkxCI= -github.com/Azure/go-autorest/logger v0.2.2-0.20230227174125-ee71315119d4/go.mod h1:mwDiRID/uD2cdq/qPxuXAZnmOEnn6qSn/xnC+0Q//eE= -github.com/Azure/go-autorest/tracing v0.6.1-0.20230227174125-ee71315119d4/go.mod h1:DWJLY5/ttkqsBNafOmCvqIlik+Da9EFPSpzNnCWRjMo= +github.com/Azure/go-autorest v14.2.1-0.20230315184244-553a90ae65a6+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest/autorest v0.11.29-0.20230315184244-553a90ae65a6/go.mod h1:ZtEzC4Jy2JDrZLxvWs8LrBWEBycl1hbT1eknI8MtfAs= +github.com/Azure/go-autorest/autorest/adal v0.9.23/go.mod h1:5pcMqFkdPhviJdlEy3kC/v1ZLnQl0MH6XA5YCcMhy4c= +github.com/Azure/go-autorest/autorest/date v0.3.1-0.20230315184244-553a90ae65a6/go.mod h1:CHJ5Cu2H2HOHbo8wSOidbGEk/L11sCIy/IglS16YuRI= +github.com/Azure/go-autorest/autorest/mocks v0.4.3-0.20230315184244-553a90ae65a6/go.mod h1:Vy7OitM9Kei0i1Oj+LvyAWMXJHeKH1MVlzFugfVrmyU= +github.com/Azure/go-autorest/autorest/to v0.4.1-0.20230315184244-553a90ae65a6/go.mod h1:DSh3VxN6gfEglfL5RXwMuwLQrHEayq9JF/NUe+DkxCI= +github.com/Azure/go-autorest/logger v0.2.2-0.20230315184244-553a90ae65a6/go.mod h1:mwDiRID/uD2cdq/qPxuXAZnmOEnn6qSn/xnC+0Q//eE= +github.com/Azure/go-autorest/tracing v0.6.1-0.20230315184244-553a90ae65a6/go.mod h1:DWJLY5/ttkqsBNafOmCvqIlik+Da9EFPSpzNnCWRjMo= github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4= github.com/AzureAD/microsoft-authentication-library-for-go v0.5.1/go.mod h1:Vt9sXTKwMyGcOxSmLDMnGPgqsUg7m8pe215qMLrDXw4= github.com/AzureAD/microsoft-authentication-library-for-go v0.9.0/go.mod h1:kgDmCTgBzIEPFElEF+FK0SdjAor06dRq2Go927dnQ6o= @@ -200,20 +200,20 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0= github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= -github.com/aws/aws-sdk-go v1.44.219 h1:YOFxTUQZvdRzgwb6XqLFRwNHxoUdKBuunITC7IFhvbc= -github.com/aws/aws-sdk-go v1.44.219/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.222 h1:hagcC+MrGo60DKEbX0g6/ge4pIj7vBbsIb+vrhA/54I= +github.com/aws/aws-sdk-go v1.44.222/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v1.17.6 h1:Y773UK7OBqhzi5VDXMi1zVGsoj+CVHs2eaC2bDsLwi0= github.com/aws/aws-sdk-go-v2 v1.17.6/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10/go.mod h1:VeTZetY5KRJLuD/7fkQXMU6Mw7H5m/KP2J5Iy9osMno= -github.com/aws/aws-sdk-go-v2/config v1.18.16 h1:4r7gsCu8Ekwl5iJGE/GmspA2UifqySCCkyyyPFeWs3w= -github.com/aws/aws-sdk-go-v2/config v1.18.16/go.mod h1:XjM6lVbq7UgELp9NjXBrb1DQY/ownlWsvDhEQksemJc= -github.com/aws/aws-sdk-go-v2/credentials v1.13.16 h1:GgToSxaENX/1zXIGNFfiVk4hxryYJ5Vt4Mh8XLAL7Lc= -github.com/aws/aws-sdk-go-v2/credentials v1.13.16/go.mod h1:KP7aFJhfwPFgx9aoVYL2nYHjya5WBD98CWaadpgmnpY= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.24 h1:5qyqXASrX2zy5cTnoHHa4N2c3Lc94GH7gjnBP3GwKdU= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.24/go.mod h1:neYVaeKr5eT7BzwULuG2YbLhzWZ22lpjKdCybR7AXrQ= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.56 h1:kFDCPqqVvb9vYcW82L7xYfrBGpuxXQ/8A/zYVayRQK4= -github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.56/go.mod h1:FoSBuessadgy8Cqp9gQF8U5rzi1XVQhiEJ6su2/kBEE= +github.com/aws/aws-sdk-go-v2/config v1.18.17 h1:jwTkhULSrbr/SQA8tfdYqZxpG8YsRycmIXxJcbrqY5E= +github.com/aws/aws-sdk-go-v2/config v1.18.17/go.mod h1:Lj3E7XcxJnxMa+AYo89YiL68s1cFJRGduChynYU67VA= +github.com/aws/aws-sdk-go-v2/credentials v1.13.17 h1:IubQO/RNeIVKF5Jy77w/LfUvmmCxTnk2TP1UZZIMiF4= +github.com/aws/aws-sdk-go-v2/credentials v1.13.17/go.mod h1:K9xeFo1g/YPMguMUD69YpwB4Nyi6W/5wn706xIInJFg= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.0 h1:/2Cb3SK3xVOQA7Xfr5nCWCo5H3UiNINtsVvVdk8sQqA= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.0/go.mod h1:neYVaeKr5eT7BzwULuG2YbLhzWZ22lpjKdCybR7AXrQ= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.57 h1:ubKS0iZH5veiqb44qeHzaoKNPvCZQeBVFw4JDhfeWjk= +github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.57/go.mod h1:dRBjXtcjmYglxVHpdoGGVWvZumDC27I2GLDGI0Uw4RQ= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.30 h1:y+8n9AGDjikyXoMBTRaHHHSaFEB8267ykmvyPodJfys= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.30/go.mod h1:LUBAO3zNXQjoONBKn/kR1y0Q4cj/D02Ts0uHYjcCQLM= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.24 h1:r+Kv+SEJquhAZXaJ7G4u44cIwXV3f8K+N482NNAzJZA= @@ -357,8 +357,8 @@ github.com/go-toolsmith/strparse v1.1.0/go.mod h1:7ksGy58fsaQkGQlY8WVoBFNyEPMGuJ github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.1.0/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL0= -github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA= -github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.1 h1:lEs5Ob+oOG/Ze199njvzHbhn6p9T+h64F5hRj69iTTo= +github.com/goccy/go-json v0.10.1/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/gocql/gocql v1.3.1 h1:BTwM4rux+ah5G3oH6/MQa+tur/TDd/XAAOXDxBBs7rg= github.com/gocql/gocql v1.3.1/go.mod h1:3gM2c4D3AnkISwBxGnMMsS8Oy4y2lhbPRsH4xnJrHG8= github.com/gocraft/dbr/v2 v2.7.3 h1:5/PTRiBkdD2FoHpnrCMoEUw5Wf/Cl3l3PjJ02Wm+pwM= @@ -417,8 +417,8 @@ github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/ github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k= github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= -github.com/googleapis/gax-go/v2 v2.7.1 h1:gF4c0zjUP2H/s/hEGyLA3I0fA2ZWjzYiONAD6cvPr8A= -github.com/googleapis/gax-go/v2 v2.7.1/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= +github.com/googleapis/gax-go/v2 v2.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK67vJZc= +github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= @@ -437,8 +437,8 @@ github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20220517205856-0058ec4f073c/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= -github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= -github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg= +github.com/imdario/mergo v0.3.14 h1:fOqeC1+nCuuk6PKQdg9YmosXX7Y7mHX6R/0ZldI9iHo= +github.com/imdario/mergo v0.3.14/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= @@ -476,8 +476,8 @@ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:C github.com/kisielk/errcheck v1.6.3/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= -github.com/klauspost/compress v1.16.1-0.20230312095358-c73f0087d88b h1:hkvN9vbaYhmfcyPZCdCGXcR8iwdZ5X9qurIh+ry+VM8= -github.com/klauspost/compress v1.16.1-0.20230312095358-c73f0087d88b/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.16.4-0.20230315151549-7633d627f0ca h1:8Dku5c1nmukx+8uIoRNQZLztZWKmbMwwVpoqVPBAmp0= +github.com/klauspost/compress v1.16.4-0.20230315151549-7633d627f0ca/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= github.com/kpango/fastime v1.1.7 h1:xaWENHzTrfzAmqhLayoLVJFF0MBf1EGZL9FL6V/OyDo= @@ -539,10 +539,10 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.9.0 h1:Tugw2BKlNHTMfG+CheOITkYvk4LAh6MFOvikhGVnhE8= -github.com/onsi/ginkgo/v2 v2.9.0/go.mod h1:4xkjoL/tZv4SMWeww56BU5kAt19mVB47gTWxmrTcxyk= -github.com/onsi/gomega v1.27.3 h1:5VwIwnBY3vbBDOJrNtA4rVdiTZCsq9B5F12pvy1Drmk= -github.com/onsi/gomega v1.27.3/go.mod h1:5vG284IBtfDAmDyrK+eGyZmUgUlmi+Wngqo557cZ6Gw= +github.com/onsi/ginkgo/v2 v2.9.1 h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk= +github.com/onsi/ginkgo/v2 v2.9.1/go.mod h1:FEcmzVcCHl+4o9bQZVab+4dC9+j+91t2FHSzmGAPfuo= +github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= +github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ= github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= @@ -615,8 +615,8 @@ github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955u github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= -github.com/vdaas/vald-client-go v1.7.2 h1:+rP/RZCU2EfRbH9J3xSUeFk57Di60lwvagpZ+/VmgpY= -github.com/vdaas/vald-client-go v1.7.2/go.mod h1:12JFkKHaCTYH7GrMWt1p+GkfSdmYCOtVJydNZtBaY0k= +github.com/vdaas/vald-client-go v1.7.3 h1:wtaOp7EMD+urVSNztj0XphuxDlnhKXRWIptz/xt15dQ= +github.com/vdaas/vald-client-go v1.7.3/go.mod h1:mq/+8G8ZnunF68uePIRcuZTuG1wjpHq5w4QMgUKICOw= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= @@ -672,11 +672,11 @@ gocloud.dev v0.29.0/go.mod h1:E3dAjji80g+lIkq4CQeF/BTWqv1CBeTftmOb+gpyapQ= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0 h1:LGJsf5LRplCck6jUCH3dBL2dmycNruWNF5xugkSlfXw= -golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0 h1:pVgRXcIictcr+lBQIFeiwuwtDIs4eL21OuM9nyAADmo= +golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/exp/shiny v0.0.0-20220722155223-a9213eeb770e/go.mod h1:VjAR7z0ngyATZTELrBSkxOOHhhlnVUxDye4mcjx5h/8= -golang.org/x/exp/typeparams v0.0.0-20230310171629-522b1b587ee0 h1:UR9XyIw/49yiqQjIE7YJYIjJKE5j/dJaOt1MhUSp8Q0= -golang.org/x/exp/typeparams v0.0.0-20230310171629-522b1b587ee0/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= +golang.org/x/exp/typeparams v0.0.0-20230315142452-642cacee5cc0 h1:cW6TvM2r3dR3P6P9tWdY51IZSMyVyh9ArUVnEmImTDM= +golang.org/x/exp/typeparams v0.0.0-20230315142452-642cacee5cc0/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/image v0.6.0 h1:bR8b5okrPI3g/gyZakLZHeWxAR8Dn5CyxXv1hLH5g/4= golang.org/x/image v0.6.0/go.mod h1:MXLdDR43H7cDJq5GEGXEVeeNhPgi+YYEQ2pC1byI1x0= golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= @@ -709,8 +709,8 @@ 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.12.0 h1:y1ZNmfz/xHuHvtgFe8USZVyykQo5ERXPnspQNVK15Og= gonum.org/v1/plot v0.12.0/go.mod h1:PgiMf9+3A3PnZdJIciIXmyN1FwdAA6rXELSN761oQkw= -google.golang.org/api v0.112.0 h1:iDmzvZ4C086R3+en4nSyIf07HlQKMOX1Xx2dmia/+KQ= -google.golang.org/api v0.112.0/go.mod h1:737UfWHNsOq4F3REUTmb+GN9pugkgNLCayLTfoIKpPc= +google.golang.org/api v0.113.0 h1:3zLZyS9hgne8yoXUFy871yWdQcA2tA6wp59aaCT6Cp4= +google.golang.org/api v0.113.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= 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-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= @@ -718,8 +718,8 @@ google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVix google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0/go.mod h1:Dk1tviKTvMCz5tvh7t+fh94dhmQVHuCt2OzJB3CTW9Y= -google.golang.org/protobuf v1.29.0 h1:44S3JjaKmLEE4YIkjzexaP+NzZsudE3Zin5Njn/pYX0= -google.golang.org/protobuf v1.29.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/inconshreveable/log15.v2 v2.16.0/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= @@ -732,7 +732,7 @@ 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.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.4.2/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= +honnef.co/go/tools v0.4.3/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= k8s.io/api v0.26.2 h1:dM3cinp3PGB6asOySalOZxEG4CZ0IAdJsrYZXE/ovGQ= k8s.io/api v0.26.2/go.mod h1:1kjMQsFE+QHPfskEcVNgL3+Hp88B80uj0QtSOlj8itU= k8s.io/apiextensions-apiserver v0.26.2 h1:/yTG2B9jGY2Q70iGskMf41qTLhL9XeNN2KhI0uDgwko= diff --git a/internal/errors/errors.go b/internal/errors/errors.go index 2469541b33b..42c2333802c 100644 --- a/internal/errors/errors.go +++ b/internal/errors/errors.go @@ -114,18 +114,18 @@ var ( return Errorf(format, args...) } + // Join represents a function to generate multiple error when the input errors is not nil. + Join = errors.Join + // Cause represents a function to generate an error when the input error is not nil. // When the input is nil, it will return nil. Cause = func(err error) error { if err != nil { - return errors.Unwrap(err) + return Unwrap(err) } return nil } - // Unwrap represents errors.Unwrap. - Unwrap = errors.Unwrap - // Errorf represents a function to generate an error based on format and args. // When format and args do not satisfy the condition, it will return nil. Errorf = func(format string, args ...interface{}) error { @@ -145,33 +145,6 @@ var ( return New(format) } - // Is represents a function to check whether err and the target is the same or not. - Is = func(err, target error) bool { - if target == nil || err == nil { - return err == target - } - isComparable := reflect.TypeOf(target).Comparable() - for { - if isComparable && (err == target || - err.Error() == target.Error() || - strings.EqualFold(err.Error(), target.Error())) { - return true - } - if x, ok := err.(interface { - Is(error) bool - }); ok && x.Is(target) { - return true - } - if uerr := Unwrap(err); uerr == nil { - return (err == target || - err.Error() == target.Error() || - strings.EqualFold(err.Error(), target.Error())) - } else { - err = uerr - } - } - } - // As represents errors.As. As = errors.As @@ -180,3 +153,63 @@ var ( return Errorf("expected err is nil: %s", n) } ) + +// Is represents a function to check whether err and the target is the same or not. +func Is(err, target error) bool { + if target == nil || err == nil { + return err == target + } + isComparable := reflect.TypeOf(target).Comparable() + for { + if isComparable && (err == target || + err.Error() == target.Error() || + strings.EqualFold(err.Error(), target.Error())) { + return true + } + + if x, ok := err.(interface { + Is(error) bool + }); ok && x.Is(target) { + return true + } + switch x := err.(type) { + case interface{ Unwrap() error }: + err = x.Unwrap() + if err == nil { + return false + } + case interface{ Unwrap() []error }: + for _, err = range x.Unwrap() { + if Is(err, target) { + return true + } + } + return false + default: + return false + } + } +} + +// Unwrap represents errors.Unwrap. +func Unwrap(err error) error { + if err != nil { + return nil + } + switch x := err.(type) { + case interface{ Unwrap() error }: + return x.Unwrap() + case interface{ Unwrap() []error }: + errs := x.Unwrap() + switch l := len(errs); l { + case 0: + return nil + case 1, 2: + return errs[0] + default: + return Join(errs[:l-1]...) + } + default: + return nil + } +} diff --git a/internal/net/grpc/status/status.go b/internal/net/grpc/status/status.go index aca539a1a7f..d58e2c28826 100644 --- a/internal/net/grpc/status/status.go +++ b/internal/net/grpc/status/status.go @@ -142,9 +142,11 @@ func ParseError(err error, defaultCode codes.Code, defaultMsg string, details .. return st, msg, st.Err() } - st = withDetails(st, err, details...) - msg = st.Message() - return st, msg, err + sst := withDetails(st, err, details...) + if sst != nil { + return sst, sst.Message(), sst.Err() + } + return st, st.Message(), st.Err() } func FromError(err error) (st *Status, ok bool) { @@ -152,30 +154,77 @@ func FromError(err error) (st *Status, ok bool) { return nil, false } root := err + possibleStatus := func() (st *Status, ok bool) { + switch { + case errors.Is(root, context.DeadlineExceeded): + st = newStatus(codes.DeadlineExceeded, root.Error(), errors.Unwrap(root)) + return st, true + case errors.Is(root, context.Canceled): + st = newStatus(codes.Canceled, root.Error(), errors.Unwrap(root)) + return st, true + } + st = newStatus(codes.Unknown, root.Error(), errors.Unwrap(root)) + return st, false + } for { if st, ok = status.FromError(err); ok && st != nil { + if st.Code() == codes.Unknown { + switch x := err.(type) { + case interface{ Unwrap() error }: + err = x.Unwrap() + if err == nil { + return st, true + } + sst, ok := FromError(err) + if ok && sst != nil { + return sst, true + } + case interface{ Unwrap() []error }: + for _, err = range x.Unwrap() { + if sst, ok := FromError(err); ok && sst != nil { + if sst.Code() != codes.Unknown { + return sst, true + } + } + } + } + } return st, true } - if uerr := errors.Unwrap(err); uerr != nil { - err = uerr - } else { - switch { - case errors.Is(root, context.DeadlineExceeded): - st = newStatus(codes.DeadlineExceeded, root.Error(), errors.Unwrap(root)) - return st, true - case errors.Is(root, context.Canceled): - st = newStatus(codes.Canceled, root.Error(), errors.Unwrap(root)) - return st, true - default: - st = newStatus(codes.Unknown, root.Error(), errors.Unwrap(root)) - return st, false + + switch x := err.(type) { + case interface{ Unwrap() error }: + err = x.Unwrap() + if err == nil { + return possibleStatus() + } + case interface{ Unwrap() []error }: + errs := x.Unwrap() + if errs == nil { + return possibleStatus() + } + var prev *Status + for _, err = range errs { + if st, ok = FromError(err); ok && st != nil { + if st.Code() != codes.Unknown { + return st, true + } + prev = st + } } + if prev != nil { + return prev, true + } + return possibleStatus() + default: + return possibleStatus() + } } } func withDetails(st *Status, err error, details ...interface{}) *Status { - msgs := make([]proto.MessageV1, 0, len(details)*2) + msgs := make([]proto.MessageV1, 0, 1+len(details)*2) if err != nil { msgs = append(msgs, &errdetails.ErrorInfo{ Reason: err.Error(), diff --git a/pkg/gateway/lb/handler/grpc/handler.go b/pkg/gateway/lb/handler/grpc/handler.go index 98b995f5ccd..9edfa42cfe1 100644 --- a/pkg/gateway/lb/handler/grpc/handler.go +++ b/pkg/gateway/lb/handler/grpc/handler.go @@ -434,43 +434,37 @@ func (s *server) SearchByID(ctx context.Context, req *payload.Search_IDRequest) } return nil, err } - var serr error - res, serr = s.doSearch(ctx, scfg, func(ctx context.Context, vc vald.Client, copts ...grpc.CallOption) (*payload.Search_Response, error) { + res, err = s.doSearch(ctx, scfg, func(ctx context.Context, vc vald.Client, copts ...grpc.CallOption) (*payload.Search_Response, error) { return vc.SearchByID(ctx, req, copts...) }) - if serr == nil { + if err == nil { return res, nil } - err = errors.Wrap(err, serr.Error()) - st, msg, serr = status.ParseError(err, codes.Internal, vald.SearchByIDRPCName+" API failed to process search request", reqInfo, resInfo) + st, msg, err = status.ParseError(err, codes.Internal, vald.SearchByIDRPCName+" API failed to process search request", reqInfo, resInfo) if span != nil { span.RecordError(err) span.SetAttributes(trace.FromGRPCStatus(st.Code(), msg)...) span.SetStatus(trace.StatusError, err.Error()) } - return nil, errors.Wrap(err, serr.Error()) + return nil, err } res, err = s.Search(ctx, &payload.Search_Request{ Vector: vec.GetVector(), Config: scfg, }) if err != nil { - _, _, err := status.ParseError(err, codes.Internal, vald.SearchByIDRPCName+" API failed to process search request", reqInfo, resInfo, info.Get()) - var serr error - res, serr = s.doSearch(ctx, scfg, func(ctx context.Context, vc vald.Client, copts ...grpc.CallOption) (*payload.Search_Response, error) { + res, err = s.doSearch(ctx, scfg, func(ctx context.Context, vc vald.Client, copts ...grpc.CallOption) (*payload.Search_Response, error) { return vc.SearchByID(ctx, req, copts...) }) - if serr == nil { - return res, nil - } - st, msg, serr := status.ParseError(serr, codes.Internal, vald.SearchByIDRPCName+" API failed to process search request", reqInfo, resInfo) - err = errors.Wrap(err, serr.Error()) - if span != nil { - span.RecordError(err) - span.SetAttributes(trace.FromGRPCStatus(st.Code(), msg)...) - span.SetStatus(trace.StatusError, err.Error()) + if err != nil { + st, msg, err := status.ParseError(err, codes.Internal, vald.SearchByIDRPCName+" API failed to process search request", reqInfo, resInfo) + if span != nil { + span.RecordError(err) + span.SetAttributes(trace.FromGRPCStatus(st.Code(), msg)...) + span.SetStatus(trace.StatusError, err.Error()) + } + return nil, err } - return nil, err } return res, nil } @@ -925,10 +919,10 @@ func (s *server) MultiSearch(ctx context.Context, reqs *payload.Search_MultiRequ sspan.SetStatus(trace.StatusError, err.Error()) } emu.Lock() - if errs == nil { - errs = err + if errs != nil { + errs = errors.Join(errs, err) } else { - errs = errors.Wrap(errs, err.Error()) + errs = err } emu.Unlock() return nil @@ -1000,10 +994,10 @@ func (s *server) MultiSearchByID(ctx context.Context, reqs *payload.Search_Multi sspan.SetStatus(trace.StatusError, err.Error()) } emu.Lock() - if errs == nil { - errs = err + if errs != nil { + errs = errors.Join(errs, err) } else { - errs = errors.Wrap(errs, err.Error()) + errs = err } emu.Unlock() return nil @@ -1199,21 +1193,19 @@ func (s *server) LinearSearchByID(ctx context.Context, req *payload.Search_IDReq } return nil, err } - var serr error - res, serr = s.doSearch(ctx, scfg, func(ctx context.Context, vc vald.Client, copts ...grpc.CallOption) (*payload.Search_Response, error) { + res, err = s.doSearch(ctx, scfg, func(ctx context.Context, vc vald.Client, copts ...grpc.CallOption) (*payload.Search_Response, error) { return vc.LinearSearchByID(ctx, req, copts...) }) - if serr == nil { + if err == nil { return res, nil } - err = errors.Wrap(err, serr.Error()) - st, msg, serr = status.ParseError(err, codes.Internal, vald.LinearSearchByIDRPCName+" API failed to process search request", reqInfo, resInfo) + st, msg, err = status.ParseError(err, codes.Internal, vald.LinearSearchByIDRPCName+" API failed to process search request", reqInfo, resInfo) if span != nil { span.RecordError(err) span.SetAttributes(trace.FromGRPCStatus(st.Code(), msg)...) span.SetStatus(trace.StatusError, err.Error()) } - return nil, errors.Wrap(err, serr.Error()) + return nil, err } res, err = s.LinearSearch(ctx, &payload.Search_Request{ @@ -1221,16 +1213,13 @@ func (s *server) LinearSearchByID(ctx context.Context, req *payload.Search_IDReq Config: scfg, }) if err != nil { - _, _, err := status.ParseError(err, codes.Internal, vald.LinearSearchByIDRPCName+" API failed to process search request", reqInfo, resInfo, info.Get()) - var serr error - res, serr = s.doSearch(ctx, scfg, func(ctx context.Context, vc vald.Client, copts ...grpc.CallOption) (*payload.Search_Response, error) { + res, err = s.doSearch(ctx, scfg, func(ctx context.Context, vc vald.Client, copts ...grpc.CallOption) (*payload.Search_Response, error) { return vc.LinearSearchByID(ctx, req, copts...) }) - if serr == nil { + if err == nil { return res, nil } - st, msg, serr := status.ParseError(serr, codes.Internal, vald.LinearSearchByIDRPCName+" API failed to process search request", reqInfo, resInfo) - err = errors.Wrap(err, serr.Error()) + st, msg, err := status.ParseError(err, codes.Internal, vald.LinearSearchByIDRPCName+" API failed to process search request", reqInfo, resInfo) if span != nil { span.RecordError(err) span.SetAttributes(trace.FromGRPCStatus(st.Code(), msg)...) @@ -1381,10 +1370,10 @@ func (s *server) MultiLinearSearch(ctx context.Context, reqs *payload.Search_Mul sspan.SetStatus(trace.StatusError, err.Error()) } emu.Lock() - if errs == nil { - errs = err + if errs != nil { + errs = errors.Join(errs, err) } else { - errs = errors.Wrap(errs, err.Error()) + errs = err } emu.Unlock() return nil @@ -1456,10 +1445,10 @@ func (s *server) MultiLinearSearchByID(ctx context.Context, reqs *payload.Search sspan.SetStatus(trace.StatusError, err.Error()) } emu.Lock() - if errs == nil { - errs = err + if errs != nil { + errs = errors.Join(errs, err) } else { - errs = errors.Wrap(errs, err.Error()) + errs = err } emu.Unlock() return nil @@ -1649,10 +1638,10 @@ func (s *server) Insert(ctx context.Context, req *payload.Insert_Request) (ce *p } if err != nil && st.Code() != codes.AlreadyExists { emu.Lock() - if errs == nil { - errs = err + if errs != nil { + errs = errors.Join(errs, err) } else { - errs = errors.Wrap(errs, err.Error()) + errs = err } emu.Unlock() return err @@ -1686,7 +1675,7 @@ func (s *server) Insert(ctx context.Context, req *payload.Insert_Request) (ce *p if errs == nil { errs = err } else { - errs = errors.Wrap(errs, err.Error()) + errs = errors.Join(errs, err) } } if errs != nil { @@ -1799,7 +1788,7 @@ func (s *server) MultiInsert(ctx context.Context, reqs *payload.Insert_MultiRequ if errs == nil { errs = err } else { - errs = errors.Wrap(errs, err.Error()) + errs = errors.Join(errs, err) } emu.Unlock() } else if res != nil && res.GetUuid() == req.GetVector().GetId() && res.GetIps() != nil { @@ -1843,7 +1832,7 @@ func (s *server) MultiInsert(ctx context.Context, reqs *payload.Insert_MultiRequ if errs == nil { errs = err } else { - errs = errors.Wrap(errs, err.Error()) + errs = errors.Join(errs, err) } emu.Unlock() @@ -1855,7 +1844,7 @@ func (s *server) MultiInsert(ctx context.Context, reqs *payload.Insert_MultiRequ if errs == nil { errs = err } else { - errs = errors.Wrap(errs, err.Error()) + errs = errors.Join(errs, err) } emu.Unlock() } @@ -2264,7 +2253,7 @@ func (s *server) MultiUpdate(ctx context.Context, reqs *payload.Update_MultiRequ if errs == nil { errs = err } else { - errs = errors.Wrap(errs, err.Error()) + errs = errors.Join(errs, err) } emu.Unlock() } else if res != nil && res.GetUuid() == req.GetVector().GetId() && res.GetIps() != nil { @@ -2308,7 +2297,7 @@ func (s *server) MultiUpdate(ctx context.Context, reqs *payload.Update_MultiRequ if errs == nil { errs = err } else { - errs = errors.Wrap(errs, err.Error()) + errs = errors.Join(errs, err) } emu.Unlock() @@ -2320,7 +2309,7 @@ func (s *server) MultiUpdate(ctx context.Context, reqs *payload.Update_MultiRequ if errs == nil { errs = err } else { - errs = errors.Wrap(errs, err.Error()) + errs = errors.Join(errs, err) } emu.Unlock() } @@ -2613,7 +2602,7 @@ func (s *server) MultiUpsert(ctx context.Context, reqs *payload.Upsert_MultiRequ if errs == nil { errs = err } else { - errs = errors.Wrap(errs, err.Error()) + errs = errors.Join(errs, err) } emu.Unlock() } else if res != nil && res.GetUuid() == req.GetVector().GetId() && res.GetIps() != nil { @@ -2657,7 +2646,7 @@ func (s *server) MultiUpsert(ctx context.Context, reqs *payload.Upsert_MultiRequ if errs == nil { errs = err } else { - errs = errors.Wrap(errs, err.Error()) + errs = errors.Join(errs, err) } emu.Unlock() @@ -2669,7 +2658,7 @@ func (s *server) MultiUpsert(ctx context.Context, reqs *payload.Upsert_MultiRequ if errs == nil { errs = err } else { - errs = errors.Wrap(errs, err.Error()) + errs = errors.Join(errs, err) } emu.Unlock() } @@ -2917,7 +2906,7 @@ func (s *server) MultiRemove(ctx context.Context, reqs *payload.Remove_MultiRequ if errs == nil { errs = err } else { - errs = errors.Wrap(errs, err.Error()) + errs = errors.Join(errs, err) } emu.Unlock() } else if res != nil && res.GetUuid() == req.GetId().GetId() && res.GetIps() != nil { @@ -2950,7 +2939,7 @@ func (s *server) MultiRemove(ctx context.Context, reqs *payload.Remove_MultiRequ if errs == nil { errs = err } else { - errs = errors.Wrap(errs, err.Error()) + errs = errors.Join(errs, err) } emu.Unlock() @@ -2962,7 +2951,7 @@ func (s *server) MultiRemove(ctx context.Context, reqs *payload.Remove_MultiRequ if errs == nil { errs = err } else { - errs = errors.Wrap(errs, err.Error()) + errs = errors.Join(errs, err) } emu.Unlock() } diff --git a/versions/OPERATOR_SDK_VERSION b/versions/OPERATOR_SDK_VERSION index be048a24ac6..f2f74743a1c 100644 --- a/versions/OPERATOR_SDK_VERSION +++ b/versions/OPERATOR_SDK_VERSION @@ -1 +1 @@ -v1.26 +v1.28 diff --git a/versions/TELEPRESENCE_VERSION b/versions/TELEPRESENCE_VERSION index 6ceb272eecd..f49f73cbc3a 100644 --- a/versions/TELEPRESENCE_VERSION +++ b/versions/TELEPRESENCE_VERSION @@ -1 +1 @@ -2.11.1 +2.12.0-rc.5 diff --git a/versions/VALDCLI_VERSION b/versions/VALDCLI_VERSION index 3b34d22941f..5f152d81a50 100644 --- a/versions/VALDCLI_VERSION +++ b/versions/VALDCLI_VERSION @@ -1 +1 @@ -v1.7.2 +v1.7.3