Merge branch 'feature/PRXS-1595-DependenciesUpdate' into 'master'

Обновлены внешние зависимости проекта perxis-go

See merge request perxis/perxis-go!109

go.mod

@@ -4,61 +4,58 @@ go 1.21
 
 require (
 	github.com/antonmedv/expr v1.9.0
-	github.com/avast/retry-go v3.0.0+incompatible
-	github.com/go-kit/kit v0.12.0
-	github.com/golang/protobuf v1.5.2
+	github.com/avast/retry-go/v4 v4.5.1
+	github.com/go-kit/kit v0.13.0
 	github.com/gosimple/slug v1.13.1
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/hashicorp/golang-lru v0.5.4
+	github.com/hashicorp/golang-lru/v2 v2.0.7
 	github.com/json-iterator/go v1.1.12
-	github.com/mitchellh/mapstructure v1.4.2
-	github.com/nats-io/nats.go v1.23.0
+	github.com/mitchellh/mapstructure v1.5.0
+	github.com/nats-io/nats.go v1.31.0
 	github.com/pkg/errors v0.9.1
-	github.com/rs/xid v1.4.0
-	github.com/stretchr/testify v1.8.2
-	go.mongodb.org/mongo-driver v1.11.4
-	go.opentelemetry.io/otel v1.14.0
-	go.opentelemetry.io/otel/trace v1.14.0
-	go.uber.org/zap v1.19.1
-	golang.org/x/crypto v0.8.0
-	golang.org/x/net v0.9.0
-	golang.org/x/oauth2 v0.4.0
-	google.golang.org/grpc v1.54.0
-	google.golang.org/protobuf v1.30.0
+	github.com/rs/xid v1.5.0
+	github.com/stretchr/testify v1.8.4
+	go.mongodb.org/mongo-driver v1.13.0
+	go.opentelemetry.io/otel v1.20.0
+	go.opentelemetry.io/otel/trace v1.20.0
+	go.uber.org/zap v1.26.0
+	golang.org/x/crypto v0.15.0
+	golang.org/x/net v0.18.0
+	golang.org/x/oauth2 v0.14.0
+	google.golang.org/grpc v1.59.0
+	google.golang.org/protobuf v1.31.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	cloud.google.com/go/compute v1.15.1 // indirect
+	cloud.google.com/go/compute v1.23.3 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-kit/log v0.2.0 // indirect
-	github.com/go-logfmt/logfmt v0.5.1 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-kit/log v0.2.1 // indirect
+	github.com/go-logfmt/logfmt v0.6.0 // indirect
+	github.com/go-logr/logr v1.3.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/golang/snappy v0.0.1 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
 	github.com/gosimple/unidecode v1.0.1 // indirect
-	github.com/hashicorp/errwrap v1.0.0 // indirect
-	github.com/klauspost/compress v1.13.6 // indirect
-	github.com/kr/pretty v0.3.0 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/klauspost/compress v1.17.3 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
-	github.com/nats-io/nkeys v0.3.0 // indirect
+	github.com/montanaflynn/stats v0.7.1 // indirect
+	github.com/nats-io/nkeys v0.4.6 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rogpeppe/go-internal v1.8.1 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/stretchr/objx v0.5.1 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
-	github.com/xdg-go/scram v1.1.1 // indirect
-	github.com/xdg-go/stringprep v1.0.3 // indirect
-	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.7.0 // indirect
-	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.7.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
-	gopkg.in/yaml.v2 v2.3.0 // indirect
+	github.com/xdg-go/scram v1.1.2 // indirect
+	github.com/xdg-go/stringprep v1.0.4 // indirect
+	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
+	go.opentelemetry.io/otel/metric v1.20.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/sync v0.5.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
 )

pkg/account/versions/transport/grpc/protobuf_endpoint_converters.microgen.go

@@ -8,7 +8,7 @@ import (
 	"errors"
 	transport "git.perx.ru/perxis/perxis-go/pkg/account/versions/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/account"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_Get_Request(ctx context.Context, request interface{}) (interface{}, error) {

pkg/account/versions/transport/grpc/server.microgen.go

@@ -7,8 +7,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/account/versions/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/account"
 	grpc "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 type versionsServer struct {

pkg/cache/cache.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"git.perx.ru/perxis/perxis-go/pkg/service"
-	lru "github.com/hashicorp/golang-lru"
+	lru "github.com/hashicorp/golang-lru/v2"
 	"go.uber.org/zap"
 )
 
@@ -15,7 +15,7 @@ const (
 )
 
 type Cache struct {
-	cache  *lru.Cache
+	cache  *lru.Cache[interface{}, interface{}]
 	ttl    time.Duration
 	logger *zap.Logger
 }
@@ -32,7 +32,7 @@ func NewCache(size int, ttl time.Duration, opts ...interface{}) *Cache {
 	if ttl == 0 {
 		ttl = defaultTTL
 	}
-	c, err := lru.New(size)
+	c, err := lru.New[interface{}, interface{}](size)
 	if err != nil {
 		panic(err)
 	}
@@ -65,7 +65,7 @@ func (c *Cache) Get(key interface{}) (value interface{}, err error) {
 	if ok {
 		v := val.(*item)
 		if v.expiredAt.Before(time.Now()) {
-			c.Remove(key)
+			_ = c.Remove(key)
 			c.logger.Debug("Expired", zap.String("key", fmt.Sprintf("%v", key)), zap.String("ptr", fmt.Sprintf("%p", v.value)))
 			return nil, service.ErrNotFound
 		}

pkg/clients/transport/grpc/client.microgen.go

@@ -6,8 +6,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/clients/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/clients"
 	grpckit "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	grpc "google.golang.org/grpc"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func NewGRPCClient(conn *grpc.ClientConn, addr string, opts ...grpckit.ClientOption) transport.EndpointsSet {

pkg/clients/transport/grpc/protobuf_endpoint_converters.microgen.go

@@ -10,7 +10,7 @@ import (
 	"git.perx.ru/perxis/perxis-go/pkg/clients"
 	transport "git.perx.ru/perxis/perxis-go/pkg/clients/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/clients"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_Get_Request(ctx context.Context, request interface{}) (interface{}, error) {

pkg/clients/transport/grpc/server.microgen.go

@@ -7,8 +7,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/clients/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/clients"
 	grpc "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 type clientsServer struct {

pkg/collaborators/transport/grpc/client.microgen.go

@@ -6,8 +6,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/collaborators/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/collaborators"
 	grpckit "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	grpc "google.golang.org/grpc"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func NewGRPCClient(conn *grpc.ClientConn, addr string, opts ...grpckit.ClientOption) transport.EndpointsSet {

pkg/collaborators/transport/grpc/protobuf_endpoint_converters.microgen.go

@@ -9,7 +9,7 @@ import (
 
 	transport "git.perx.ru/perxis/perxis-go/pkg/collaborators/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/collaborators"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_Set_Request(ctx context.Context, request interface{}) (interface{}, error) {

pkg/collaborators/transport/grpc/server.microgen.go

@@ -7,8 +7,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/collaborators/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/collaborators"
 	grpc "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 type collaboratorsServer struct {

pkg/collections/transport/grpc/client.microgen.go

@@ -6,8 +6,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/collections/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/collections"
 	grpckit "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	grpc "google.golang.org/grpc"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func NewGRPCClient(conn *grpc.ClientConn, addr string, opts ...grpckit.ClientOption) transport.EndpointsSet {

pkg/collections/transport/grpc/protobuf_endpoint_converters.microgen.go

@@ -9,7 +9,7 @@ import (
 
 	transport "git.perx.ru/perxis/perxis-go/pkg/collections/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/collections"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_Create_Request(ctx context.Context, request interface{}) (interface{}, error) {

pkg/collections/transport/grpc/server.microgen.go

@@ -7,8 +7,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/collections/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/collections"
 	grpc "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 type collectionsServer struct {

pkg/content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go

@@ -9,7 +9,7 @@ import (
 
 	"git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/content"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_Get_Request(ctx context.Context, request interface{}) (interface{}, error) {

pkg/content/versions/transport/grpc/server.microgen.go

@@ -7,8 +7,8 @@ import (
 	"git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/versions/content"
 	grpc "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	context "golang.org/x/net/context"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 type versionsServer struct {

pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go

@@ -20,8 +20,8 @@ import (
 	environmentspb "git.perx.ru/perxis/perxis-go/proto/environments"
 	itemspb "git.perx.ru/perxis/perxis-go/proto/items"
 	localespb "git.perx.ru/perxis/perxis-go/proto/locales"
-	"github.com/golang/protobuf/ptypes"
 	"google.golang.org/protobuf/types/known/structpb"
+	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
 func ListPtrLocalesLocaleToProto(locales []*locales.Locale) ([]*localespb.Locale, error) {
@@ -55,7 +55,7 @@ func PtrEnvironmentsEnvironmentToProto(env *environments.Environment) (*environm
 			State: environmentspb.StateInfo_State(env.StateInfo.State),
 			Info:  env.StateInfo.Info,
 		}
-		protoEnvironment.StateInfo.StartedAt, _ = ptypes.TimestampProto(env.StateInfo.StartedAt)
+		protoEnvironment.StateInfo.StartedAt = timestamppb.New(env.StateInfo.StartedAt)
 	}
 	if env.Config != nil {
 		protoEnvironment.Config = &environmentspb.Config{
@@ -81,7 +81,7 @@ func ProtoToPtrEnvironmentsEnvironment(protoEnv *environmentspb.Environment) (*e
 			State: environments.State(protoEnv.StateInfo.State),
 			Info:  protoEnv.StateInfo.Info,
 		}
-		env.StateInfo.StartedAt, _ = ptypes.Timestamp(protoEnv.StateInfo.StartedAt)
+		env.StateInfo.StartedAt = protoEnv.StateInfo.StartedAt.AsTime()
 	}
 	if protoEnv.Config != nil {
 		env.Config = &environments.Config{
@@ -214,9 +214,9 @@ func PtrItemsItemToProto(item *items.Item) (*itemspb.Item, error) {
 	}
 	//protoItem.Permissions - не передается для delivery
 
-	protoItem.CreatedRevAt, _ = ptypes.TimestampProto(item.CreatedRevAt)
-	protoItem.CreatedAt, _ = ptypes.TimestampProto(item.CreatedAt)
-	protoItem.UpdatedAt, _ = ptypes.TimestampProto(item.UpdatedAt)
+	protoItem.CreatedRevAt = timestamppb.New(item.CreatedRevAt)
+	protoItem.CreatedAt = timestamppb.New(item.CreatedAt)
+	protoItem.UpdatedAt = timestamppb.New(item.UpdatedAt)
 
 	return protoItem, nil
 }
@@ -243,9 +243,9 @@ func ProtoToPtrItemsItem(protoItem *itemspb.Item) (*items.Item, error) {
 	item.Translations, _ = ProtoToMapStringMapStringInterface(protoItem.Translations)
 	//item.Permissions - не передается для delivery
 
-	item.CreatedRevAt, _ = ptypes.Timestamp(protoItem.CreatedRevAt)
-	item.CreatedAt, _ = ptypes.Timestamp(protoItem.CreatedAt)
-	item.UpdatedAt, _ = ptypes.Timestamp(protoItem.UpdatedAt)
+	item.CreatedRevAt = protoItem.CreatedRevAt.AsTime()
+	item.CreatedAt = protoItem.CreatedAt.AsTime()
+	item.UpdatedAt = protoItem.UpdatedAt.AsTime()
 
 	return item, nil
 }

pkg/environments/transport/grpc/client.microgen.go

@@ -6,8 +6,8 @@ import (
 	transport "git.perx.ru/perxis/perxis-go/pkg/environments/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/environments"
 	grpckit "github.com/go-kit/kit/transport/grpc"
-	empty "github.com/golang/protobuf/ptypes/empty"
 	grpc "google.golang.org/grpc"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func NewGRPCClient(conn *grpc.ClientConn, addr string, opts ...grpckit.ClientOption) transport.EndpointsSet {

pkg/environments/transport/grpc/protobuf_endpoint_converters.microgen.go

@@ -9,7 +9,7 @@ import (
 
 	transport "git.perx.ru/perxis/perxis-go/pkg/environments/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/environments"
-	empty "github.com/golang/protobuf/ptypes/empty"
+	empty "google.golang.org/protobuf/types/known/emptypb"
 )
 
 func _Encode_Create_Request(ctx context.Context, request interface{}) (interface{}, error) {

pkg/environments/transport/grpc/protobuf_type_converters.microgen.go

@@ -7,7 +7,7 @@ package transportgrpc
 import (
 	service "git.perx.ru/perxis/perxis-go/pkg/environments"
 	pb "git.perx.ru/perxis/perxis-go/proto/environments"
-	"github.com/golang/protobuf/ptypes"
+	timestamp "google.golang.org/protobuf/types/known/timestamppb"
 )
 
 func PtrEnvironmentToProto(env *service.Environment) (*pb.Environment, error) {
@@ -25,7 +25,7 @@ func PtrEnvironmentToProto(env *service.Environment) (*pb.Environment, error) {
 			State: pb.StateInfo_State(env.StateInfo.State),
 			Info:  env.StateInfo.Info,
 		}
-		protoEnvironment.StateInfo.StartedAt, _ = ptypes.TimestampProto(env.StateInfo.StartedAt)
+		protoEnvironment.StateInfo.StartedAt = timestamp.New(env.StateInfo.StartedAt)
 	}
 	if env.Config != nil {
 		protoEnvironment.Config = &pb.Config{
@@ -51,7 +51,7 @@ func ProtoToPtrEnvironment(protoEnv *pb.Environment) (*service.Environment, erro
 			State: service.State(protoEnv.StateInfo.State),
 			Info:  protoEnv.StateInfo.Info,
 		}
-		env.StateInfo.StartedAt, _ = ptypes.Timestamp(protoEnv.StateInfo.StartedAt)
+		env.StateInfo.StartedAt = protoEnv.StateInfo.StartedAt.AsTime()
 	}
 	if protoEnv.Config != nil {
 		env.Config = &service.Config{