From 67614f7cb365e91ccd7271a984c6d6a6479a1992 Mon Sep 17 00:00:00 2001 From: Sergey Cherepanov Date: Tue, 25 Apr 2023 18:17:59 +0200 Subject: [PATCH] replace infrastructure-experiments to any-sync --- Makefile | 2 +- app/testapp/testapp.go | 2 +- change/state.go | 2 +- clientlibrary/service/lib.go | 2 +- cmd/cli/debug.go | 2 +- cmd/grpcserver/grpc.go | 12 +- core/account.go | 2 +- core/account/account.go | 2 +- core/anytype/bootstrap.go | 6 +- core/anytype/config/config.go | 2 +- core/block/bookmark/bookmark_service.go | 2 +- .../bookmark_importer_decorator.go | 2 +- core/block/doc/service.go | 2 +- core/block/doc/service_test.go | 2 +- core/block/editor.go | 2 +- core/block/editor/factory.go | 2 +- core/block/editor/smartblock/smartblock.go | 6 +- .../editor/smartblock/smartblock_test.go | 2 +- .../editor/smartblock/smarttest/smarttest.go | 2 +- core/block/editor/subobjectcollection.go | 2 +- core/block/editor/workspaces.go | 2 +- core/block/export/export.go | 2 +- core/block/import/importer.go | 2 +- core/block/import/mock.go | 2 +- core/block/import/types.go | 2 +- core/block/object/creator.go | 2 +- core/block/process/service.go | 2 +- core/block/process/service_test.go | 2 +- core/block/restriction/service.go | 2 +- core/block/service.go | 7 +- core/block/source/service.go | 2 +- core/block/source/source.go | 2 +- core/configfetcher/configfetcher.go | 2 +- core/core.go | 2 +- core/debug/service.go | 2 +- core/event/event.go | 2 +- core/event/event_grpc.go | 2 +- core/history/history.go | 2 +- core/history/history_test.go | 2 +- core/indexer/indexer.go | 2 +- core/indexer/indexer_test.go | 2 +- core/kanban/service.go | 2 +- core/recordsbatcher/recordsbatcher.go | 2 +- core/relation/service.go | 2 +- core/session/service.go | 4 +- core/status/service.go | 2 +- core/subscription/service.go | 2 +- core/wallet/wallet.go | 2 +- go.mod | 33 ++--- go.sum | 113 ++++++++++-------- pkg/lib/cafe/client.go | 2 +- pkg/lib/core/core.go | 2 +- pkg/lib/datastore/clientds/clientds.go | 3 +- pkg/lib/datastore/datastore.go | 2 +- pkg/lib/files/files.go | 2 +- pkg/lib/gateway/gateway.go | 2 +- pkg/lib/ipfs/ipfs.go | 2 +- pkg/lib/ipfs/ipfslite/lite.go | 4 +- pkg/lib/localstore/filestore/files.go | 2 +- pkg/lib/localstore/ftsearch/ftsearch.go | 3 +- pkg/lib/localstore/objectstore/objects.go | 2 +- pkg/lib/pin/service.go | 2 +- pkg/lib/profilefinder/profilefinder.go | 2 +- pkg/lib/threads/service.go | 2 +- space/clientcache/cache.go | 14 +-- space/rpchandler.go | 4 +- space/service.go | 18 +-- space/space.go | 2 +- space/statusreceiver.go | 2 +- space/storage/keys.go | 2 +- space/storage/liststorage.go | 4 +- space/storage/liststorage_test.go | 4 +- space/storage/spacestorage.go | 10 +- space/storage/spacestorage_test.go | 8 +- space/storage/storageservice.go | 4 +- space/storage/treestorage.go | 4 +- space/storage/treestorage_test.go | 4 +- space/typeprovider/typeprovider.go | 4 +- util/builtinobjects/builtinobjects.go | 2 +- util/builtintemplate/builtintemplate.go | 2 +- util/linkpreview/cache.go | 6 +- util/linkpreview/linkpreview.go | 21 ++-- util/testMock/anytype.go | 2 +- util/unsplash/unsplash.go | 11 +- 84 files changed, 209 insertions(+), 218 deletions(-) diff --git a/Makefile b/Makefile index a2380ba33..7490c1ce5 100644 --- a/Makefile +++ b/Makefile @@ -211,7 +211,7 @@ build-cli: @$(eval FLAGS := $$(shell govvv -flags -pkg github.com/anytypeio/go-anytype-middleware/core)) @go build -v -o dist/cli -ldflags "$(FLAGS)" ./cmd/cli -build-server: protos-server +build-server: @echo 'Building middleware server...' @$(eval FLAGS := $$(shell govvv -flags -pkg github.com/anytypeio/go-anytype-middleware/core)) @go build -v -o dist/server -ldflags "$(FLAGS)" --tags "nographviz nosigar nowatchdog" ./cmd/grpcserver/grpc.go diff --git a/app/testapp/testapp.go b/app/testapp/testapp.go index 18d5e4487..c67fb2fc2 100644 --- a/app/testapp/testapp.go +++ b/app/testapp/testapp.go @@ -1,7 +1,7 @@ package testapp import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/event" "github.com/anytypeio/go-anytype-middleware/pb" ) diff --git a/change/state.go b/change/state.go index 935c93b90..e225f0a4a 100644 --- a/change/state.go +++ b/change/state.go @@ -2,7 +2,7 @@ package change import ( "errors" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" + "github.com/anytypeio/any-sync/commonspace/object/tree/objecttree" "github.com/anytypeio/go-anytype-middleware/pb" "github.com/gogo/protobuf/proto" diff --git a/clientlibrary/service/lib.go b/clientlibrary/service/lib.go index 9813658a7..e04bf938a 100644 --- a/clientlibrary/service/lib.go +++ b/clientlibrary/service/lib.go @@ -2,7 +2,7 @@ package service import ( "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "net/http" _ "net/http/pprof" "os" diff --git a/cmd/cli/debug.go b/cmd/cli/debug.go index 5a7573571..dab182d7e 100644 --- a/cmd/cli/debug.go +++ b/cmd/cli/debug.go @@ -2,7 +2,7 @@ package main import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/anytype" "github.com/anytypeio/go-anytype-middleware/core/debug" "github.com/anytypeio/go-anytype-middleware/core/event" diff --git a/cmd/grpcserver/grpc.go b/cmd/grpcserver/grpc.go index 5031c36ec..f8eab50a2 100644 --- a/cmd/grpcserver/grpc.go +++ b/cmd/grpcserver/grpc.go @@ -14,19 +14,17 @@ import ( "strconv" "syscall" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" + "github.com/anytypeio/go-anytype-middleware/core/event" "github.com/anytypeio/go-anytype-middleware/metrics" + "github.com/anytypeio/go-anytype-middleware/pb" + "github.com/anytypeio/go-anytype-middleware/pkg/lib/logging" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_zap "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc" - "github.com/opentracing/opentracing-go" - "github.com/uber/jaeger-client-go" - - "github.com/anytypeio/go-anytype-middleware/core/event" - "github.com/anytypeio/go-anytype-middleware/pb" - "github.com/anytypeio/go-anytype-middleware/pkg/lib/logging" "github.com/improbable-eng/grpc-web/go/grpcweb" + "github.com/opentracing/opentracing-go" "google.golang.org/grpc" "github.com/anytypeio/go-anytype-middleware/core" diff --git a/core/account.go b/core/account.go index c6884c395..eabf2483a 100644 --- a/core/account.go +++ b/core/account.go @@ -28,7 +28,7 @@ import ( "github.com/anytypeio/go-anytype-middleware/pkg/lib/gateway" "github.com/anytypeio/go-anytype-middleware/util/files" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/anytype" "github.com/anytypeio/go-anytype-middleware/core/anytype/config" "github.com/anytypeio/go-anytype-middleware/core/block" diff --git a/core/account/account.go b/core/account/account.go index 41cdd9265..f956d59fc 100644 --- a/core/account/account.go +++ b/core/account/account.go @@ -2,7 +2,7 @@ package account import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/pkg/lib/cafe" "github.com/anytypeio/go-anytype-middleware/pkg/lib/cafe/pb" ) diff --git a/core/anytype/bootstrap.go b/core/anytype/bootstrap.go index bad7ffb8d..f8af62d4a 100644 --- a/core/anytype/bootstrap.go +++ b/core/anytype/bootstrap.go @@ -2,13 +2,13 @@ package anytype import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/rpc/server" + "github.com/anytypeio/any-sync/commonspace" + "github.com/anytypeio/any-sync/net/rpc/server" "github.com/anytypeio/go-anytype-middleware/space" "github.com/anytypeio/go-anytype-middleware/space/storage" "os" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/account" "github.com/anytypeio/go-anytype-middleware/core/anytype/config" "github.com/anytypeio/go-anytype-middleware/core/block" diff --git a/core/anytype/config/config.go b/core/anytype/config/config.go index 9b18f10c7..f24d57fe8 100644 --- a/core/anytype/config/config.go +++ b/core/anytype/config/config.go @@ -9,7 +9,7 @@ import ( "github.com/kelseyhightower/envconfig" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/wallet" "github.com/anytypeio/go-anytype-middleware/pkg/lib/datastore/clientds" "github.com/anytypeio/go-anytype-middleware/pkg/lib/ipfs" diff --git a/core/block/bookmark/bookmark_service.go b/core/block/bookmark/bookmark_service.go index 6fc8c8b41..663257cdb 100644 --- a/core/block/bookmark/bookmark_service.go +++ b/core/block/bookmark/bookmark_service.go @@ -14,7 +14,7 @@ import ( "github.com/gogo/protobuf/types" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" "github.com/anytypeio/go-anytype-middleware/core/block/simple/bookmark" "github.com/anytypeio/go-anytype-middleware/core/session" diff --git a/core/block/bookmark/bookmarkimporter/bookmark_importer_decorator.go b/core/block/bookmark/bookmarkimporter/bookmark_importer_decorator.go index 5c732daae..7631c0e7c 100644 --- a/core/block/bookmark/bookmarkimporter/bookmark_importer_decorator.go +++ b/core/block/bookmark/bookmarkimporter/bookmark_importer_decorator.go @@ -3,7 +3,7 @@ package bookmarkimporter import ( "go.uber.org/zap" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" bookmarksvc "github.com/anytypeio/go-anytype-middleware/core/block/bookmark" "github.com/anytypeio/go-anytype-middleware/core/block/import" "github.com/anytypeio/go-anytype-middleware/core/session" diff --git a/core/block/doc/service.go b/core/block/doc/service.go index c16e1fab5..1abc986d2 100644 --- a/core/block/doc/service.go +++ b/core/block/doc/service.go @@ -7,7 +7,7 @@ import ( "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" "github.com/gogo/protobuf/types" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" "github.com/anytypeio/go-anytype-middleware/core/recordsbatcher" "github.com/anytypeio/go-anytype-middleware/pkg/lib/logging" diff --git a/core/block/doc/service_test.go b/core/block/doc/service_test.go index bc39d978d..b1048fddc 100644 --- a/core/block/doc/service_test.go +++ b/core/block/doc/service_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" "github.com/anytypeio/go-anytype-middleware/core/block/simple" "github.com/anytypeio/go-anytype-middleware/core/recordsbatcher" diff --git a/core/block/editor.go b/core/block/editor.go index 01c50978c..a915edffb 100644 --- a/core/block/editor.go +++ b/core/block/editor.go @@ -7,7 +7,7 @@ import ( "github.com/gogo/protobuf/types" ds "github.com/ipfs/go-datastore" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ocache" + "github.com/anytypeio/any-sync/app/ocache" "github.com/anytypeio/go-anytype-middleware/core/block/doc" "github.com/anytypeio/go-anytype-middleware/core/block/editor" "github.com/anytypeio/go-anytype-middleware/core/block/editor/basic" diff --git a/core/block/editor/factory.go b/core/block/editor/factory.go index e0aee9c74..7446a9038 100644 --- a/core/block/editor/factory.go +++ b/core/block/editor/factory.go @@ -3,7 +3,7 @@ package editor import ( "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/block/editor/bookmark" "github.com/anytypeio/go-anytype-middleware/core/block/editor/file" "github.com/anytypeio/go-anytype-middleware/core/block/editor/smartblock" diff --git a/core/block/editor/smartblock/smartblock.go b/core/block/editor/smartblock/smartblock.go index 7a7e84412..38a417986 100644 --- a/core/block/editor/smartblock/smartblock.go +++ b/core/block/editor/smartblock/smartblock.go @@ -4,7 +4,7 @@ import ( "context" "errors" "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" + "github.com/anytypeio/any-sync/commonspace/object/tree/objecttree" "sort" "strings" "sync" @@ -12,8 +12,8 @@ import ( "github.com/gogo/protobuf/types" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ocache" + "github.com/anytypeio/any-sync/app" + "github.com/anytypeio/any-sync/app/ocache" "github.com/anytypeio/go-anytype-middleware/core/block/doc" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" "github.com/anytypeio/go-anytype-middleware/core/block/editor/template" diff --git a/core/block/editor/smartblock/smartblock_test.go b/core/block/editor/smartblock/smartblock_test.go index a68fef096..4fbbf82cd 100644 --- a/core/block/editor/smartblock/smartblock_test.go +++ b/core/block/editor/smartblock/smartblock_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/app/testapp" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" "github.com/anytypeio/go-anytype-middleware/core/block/restriction" diff --git a/core/block/editor/smartblock/smarttest/smarttest.go b/core/block/editor/smartblock/smarttest/smarttest.go index 879bbac4f..9525c51a0 100644 --- a/core/block/editor/smartblock/smarttest/smarttest.go +++ b/core/block/editor/smartblock/smarttest/smarttest.go @@ -1,7 +1,7 @@ package smarttest import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/relation" "github.com/anytypeio/go-anytype-middleware/core/relation/relationutils" "sync" diff --git a/core/block/editor/subobjectcollection.go b/core/block/editor/subobjectcollection.go index 34ae0fce5..5e5da2b4b 100644 --- a/core/block/editor/subobjectcollection.go +++ b/core/block/editor/subobjectcollection.go @@ -7,7 +7,7 @@ import ( "github.com/gogo/protobuf/types" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/block/editor/basic" "github.com/anytypeio/go-anytype-middleware/core/block/editor/dataview" "github.com/anytypeio/go-anytype-middleware/core/block/editor/file" diff --git a/core/block/editor/workspaces.go b/core/block/editor/workspaces.go index 085746906..1b78e0f72 100644 --- a/core/block/editor/workspaces.go +++ b/core/block/editor/workspaces.go @@ -11,7 +11,7 @@ import ( manet "github.com/multiformats/go-multiaddr/net" "github.com/textileio/go-threads/core/thread" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/block/editor/dataview" "github.com/anytypeio/go-anytype-middleware/core/block/editor/file" "github.com/anytypeio/go-anytype-middleware/core/block/editor/smartblock" diff --git a/core/block/export/export.go b/core/block/export/export.go index 9a53c2f55..0e6e04b3a 100644 --- a/core/block/export/export.go +++ b/core/block/export/export.go @@ -13,7 +13,7 @@ import ( "github.com/gogo/protobuf/types" "github.com/gosimple/slug" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/block" sb "github.com/anytypeio/go-anytype-middleware/core/block/editor/smartblock" "github.com/anytypeio/go-anytype-middleware/core/block/process" diff --git a/core/block/import/importer.go b/core/block/import/importer.go index 65d76e7c5..e75f5a24c 100644 --- a/core/block/import/importer.go +++ b/core/block/import/importer.go @@ -6,7 +6,7 @@ import ( "github.com/gogo/protobuf/types" "go.uber.org/zap" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/block" "github.com/anytypeio/go-anytype-middleware/core/block/import/converter" "github.com/anytypeio/go-anytype-middleware/core/block/import/notion" diff --git a/core/block/import/mock.go b/core/block/import/mock.go index 0d37ddd37..abcd6b882 100644 --- a/core/block/import/mock.go +++ b/core/block/import/mock.go @@ -7,7 +7,7 @@ package importer import ( reflect "reflect" - app "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + app "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/block/import/converter" session "github.com/anytypeio/go-anytype-middleware/core/session" pb "github.com/anytypeio/go-anytype-middleware/pb" diff --git a/core/block/import/types.go b/core/block/import/types.go index e80561f3c..90da5ee79 100644 --- a/core/block/import/types.go +++ b/core/block/import/types.go @@ -1,7 +1,7 @@ package importer import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" _ "github.com/anytypeio/go-anytype-middleware/core/block/import/markdown" _ "github.com/anytypeio/go-anytype-middleware/core/block/import/pb" "github.com/anytypeio/go-anytype-middleware/core/session" diff --git a/core/block/object/creator.go b/core/block/object/creator.go index 913792fb3..6b5aba007 100644 --- a/core/block/object/creator.go +++ b/core/block/object/creator.go @@ -9,7 +9,7 @@ import ( "github.com/gogo/protobuf/types" "github.com/textileio/go-threads/core/thread" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/block" "github.com/anytypeio/go-anytype-middleware/core/block/bookmark" "github.com/anytypeio/go-anytype-middleware/core/block/editor" diff --git a/core/block/process/service.go b/core/block/process/service.go index b58432cab..9ec61b93b 100644 --- a/core/block/process/service.go +++ b/core/block/process/service.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/event" "github.com/anytypeio/go-anytype-middleware/pb" ) diff --git a/core/block/process/service_test.go b/core/block/process/service_test.go index a3044bdbb..18eb0295a 100644 --- a/core/block/process/service_test.go +++ b/core/block/process/service_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/app/testapp" "github.com/anytypeio/go-anytype-middleware/pb" "github.com/stretchr/testify/assert" diff --git a/core/block/restriction/service.go b/core/block/restriction/service.go index 5102ae22a..ff7ec1d47 100644 --- a/core/block/restriction/service.go +++ b/core/block/restriction/service.go @@ -3,7 +3,7 @@ package restriction import ( "errors" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core/smartblock" "github.com/anytypeio/go-anytype-middleware/pkg/lib/logging" diff --git a/core/block/service.go b/core/block/service.go index e3275b0c0..bdb307e35 100644 --- a/core/block/service.go +++ b/core/block/service.go @@ -5,7 +5,7 @@ import ( "encoding/base64" "errors" "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter" + "github.com/anytypeio/any-sync/commonspace/object/treegetter" "github.com/anytypeio/go-anytype-middleware/space/clientcache" "net/url" "strings" @@ -13,11 +13,10 @@ import ( "github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/types" - "github.com/hashicorp/go-multierror" "github.com/ipfs/go-datastore/query" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ocache" + "github.com/anytypeio/any-sync/app" + "github.com/anytypeio/any-sync/app/ocache" bookmarksvc "github.com/anytypeio/go-anytype-middleware/core/block/bookmark" "github.com/anytypeio/go-anytype-middleware/core/block/doc" "github.com/anytypeio/go-anytype-middleware/core/block/editor" diff --git a/core/block/source/service.go b/core/block/source/service.go index bacc67b5c..2a0e4f7c6 100644 --- a/core/block/source/service.go +++ b/core/block/source/service.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" "github.com/anytypeio/go-anytype-middleware/core/status" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" diff --git a/core/block/source/source.go b/core/block/source/source.go index 7f72e060a..1c5cc12d0 100644 --- a/core/block/source/source.go +++ b/core/block/source/source.go @@ -4,7 +4,7 @@ import ( "context" "errors" "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" + "github.com/anytypeio/any-sync/commonspace/object/tree/objecttree" "github.com/gogo/protobuf/proto" "go.uber.org/zap" "math/rand" diff --git a/core/configfetcher/configfetcher.go b/core/configfetcher/configfetcher.go index e4c80ea36..711db476a 100644 --- a/core/configfetcher/configfetcher.go +++ b/core/configfetcher/configfetcher.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/event" pbMiddle "github.com/anytypeio/go-anytype-middleware/pb" cafeClient "github.com/anytypeio/go-anytype-middleware/pkg/lib/cafe" diff --git a/core/core.go b/core/core.go index a281efc07..66d858905 100644 --- a/core/core.go +++ b/core/core.go @@ -7,7 +7,7 @@ import ( "runtime/debug" "sync" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/account" "github.com/anytypeio/go-anytype-middleware/core/block" "github.com/anytypeio/go-anytype-middleware/core/event" diff --git a/core/debug/service.go b/core/debug/service.go index 3afa58e9e..2816b23c0 100644 --- a/core/debug/service.go +++ b/core/debug/service.go @@ -3,7 +3,7 @@ package debug import ( "archive/zip" "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/change" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/objectstore" diff --git a/core/event/event.go b/core/event/event.go index 8a16f999b..2fbf50231 100644 --- a/core/event/event.go +++ b/core/event/event.go @@ -1,7 +1,7 @@ package event import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/pb" ) diff --git a/core/event/event_grpc.go b/core/event/event_grpc.go index 0826ad5a3..37998eaa2 100644 --- a/core/event/event_grpc.go +++ b/core/event/event_grpc.go @@ -6,7 +6,7 @@ package event import ( "sync" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/pb/service" "github.com/anytypeio/go-anytype-middleware/pkg/lib/logging" diff --git a/core/history/history.go b/core/history/history.go index 49446f944..a3be66ad2 100644 --- a/core/history/history.go +++ b/core/history/history.go @@ -7,7 +7,7 @@ import ( "github.com/anytypeio/go-anytype-middleware/core/relation" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/change" "github.com/anytypeio/go-anytype-middleware/core/block" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" diff --git a/core/history/history_test.go b/core/history/history_test.go index adebbe8ac..9656e84f6 100644 --- a/core/history/history_test.go +++ b/core/history/history_test.go @@ -7,7 +7,7 @@ import ( "github.com/anytypeio/go-anytype-middleware/pkg/lib/threads" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/app/testapp" "github.com/anytypeio/go-anytype-middleware/change" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" diff --git a/core/indexer/indexer.go b/core/indexer/indexer.go index 2f994fc07..9b5f93dc0 100644 --- a/core/indexer/indexer.go +++ b/core/indexer/indexer.go @@ -14,7 +14,7 @@ import ( ds "github.com/ipfs/go-datastore" "github.com/textileio/go-threads/core/thread" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/anytype/config" "github.com/anytypeio/go-anytype-middleware/core/block/doc" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" diff --git a/core/indexer/indexer_test.go b/core/indexer/indexer_test.go index 92a8ecdd1..391df53fb 100644 --- a/core/indexer/indexer_test.go +++ b/core/indexer/indexer_test.go @@ -11,7 +11,7 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/app/testapp" "github.com/anytypeio/go-anytype-middleware/core/anytype/config" "github.com/anytypeio/go-anytype-middleware/core/block/doc" diff --git a/core/kanban/service.go b/core/kanban/service.go index 87804845c..cbae760e1 100644 --- a/core/kanban/service.go +++ b/core/kanban/service.go @@ -8,7 +8,7 @@ import ( "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/objectstore" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" ) -import "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" +import "github.com/anytypeio/any-sync/app" const ( CName = "kanban" diff --git a/core/recordsbatcher/recordsbatcher.go b/core/recordsbatcher/recordsbatcher.go index ea6269992..c78603474 100644 --- a/core/recordsbatcher/recordsbatcher.go +++ b/core/recordsbatcher/recordsbatcher.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/pkg/lib/logging" "github.com/cheggaaa/mb" ) diff --git a/core/relation/service.go b/core/relation/service.go index 7ff40ecd1..3e40796f8 100644 --- a/core/relation/service.go +++ b/core/relation/service.go @@ -10,7 +10,7 @@ import ( "github.com/gogo/protobuf/types" "github.com/ipfs/go-datastore/query" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/relation/relationutils" "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" "github.com/anytypeio/go-anytype-middleware/pkg/lib/database" diff --git a/core/session/service.go b/core/session/service.go index 53c899600..9cb2870e4 100644 --- a/core/session/service.go +++ b/core/session/service.go @@ -2,11 +2,11 @@ package session import ( "fmt" + "github.com/golang-jwt/jwt" "math/rand" "sync" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - "github.com/golang-jwt/jwt/v4" + "github.com/anytypeio/any-sync/app" ) const CName = "session" diff --git a/core/status/service.go b/core/status/service.go index 4cf6227b9..2d32f2e36 100644 --- a/core/status/service.go +++ b/core/status/service.go @@ -15,7 +15,7 @@ import ( "github.com/textileio/go-threads/core/net" "github.com/textileio/go-threads/core/thread" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/anytype/config" "github.com/anytypeio/go-anytype-middleware/core/event" "github.com/anytypeio/go-anytype-middleware/pb" diff --git a/core/subscription/service.go b/core/subscription/service.go index 632f70685..a4d4a9f58 100644 --- a/core/subscription/service.go +++ b/core/subscription/service.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/event" "github.com/anytypeio/go-anytype-middleware/pb" "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" diff --git a/core/wallet/wallet.go b/core/wallet/wallet.go index 5cd488176..aae55b8a4 100644 --- a/core/wallet/wallet.go +++ b/core/wallet/wallet.go @@ -2,7 +2,7 @@ package wallet import ( "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/metrics" "github.com/anytypeio/go-anytype-middleware/pkg/lib/logging" walletUtil "github.com/anytypeio/go-anytype-middleware/pkg/lib/wallet" diff --git a/go.mod b/go.mod index aac979445..2807a1986 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.18 require ( github.com/JohannesKaufmann/html-to-markdown v0.0.0-00010101000000-000000000000 github.com/PuerkitoBio/goquery v1.8.0 + github.com/anytypeio/any-sync v0.0.1 github.com/anytypeio/go-naturaldate/v2 v2.0.1 github.com/anytypeio/go-slip10 v0.0.0-20200330112030-a352ca8495e4 github.com/anytypeio/go-slip21 v0.0.0-20200218204727-e2e51e20ab51 @@ -14,6 +15,7 @@ require ( github.com/dave/jennifer v1.4.1 github.com/davecgh/go-spew v1.1.1 github.com/dgraph-io/badger v1.6.2 + github.com/dgraph-io/badger/v3 v3.2103.3 github.com/dgtony/collections v0.1.6 github.com/dhowden/tag v0.0.0-20201120070457-d52dcb253c63 github.com/disintegration/imaging v1.6.2 @@ -24,7 +26,6 @@ require ( github.com/goccy/go-graphviz v0.0.9 github.com/gogo/protobuf v1.3.2 github.com/gogo/status v1.1.0 - github.com/golang-jwt/jwt/v4 v4.4.2 github.com/golang/mock v1.6.0 github.com/google/uuid v1.3.0 github.com/gosimple/slug v1.13.1 @@ -33,7 +34,6 @@ require ( github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 github.com/h2non/filetype v1.1.1 github.com/hashicorp/go-multierror v1.1.1 - github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d github.com/hbagdi/go-unsplash v0.0.0-20210330151707-a7612e80fdd5 github.com/hsanjuan/ipfs-lite v1.5.0 github.com/huandu/skiplist v1.2.0 @@ -45,7 +45,6 @@ require ( github.com/ipfs/go-ipfs-files v0.2.0 github.com/ipfs/go-ipld-cbor v0.0.6 github.com/ipfs/go-ipld-format v0.4.0 - github.com/ipfs/go-ipns v0.3.0 github.com/ipfs/go-log v1.0.5 github.com/ipfs/go-log/v2 v2.5.1 github.com/ipfs/go-merkledag v0.8.1 @@ -59,7 +58,6 @@ require ( github.com/libp2p/go-libp2p-record v0.2.0 github.com/logrusorgru/aurora v2.0.3+incompatible github.com/magiconair/properties v1.8.4 - github.com/mauidude/go-readability v0.0.0-20141216012317-2f30b1a346f1 github.com/mb0/diff v0.0.0-20131118162322-d8d9a906c24d github.com/microcosm-cc/bluemonday v1.0.9 github.com/miolini/datacounter v1.0.2 @@ -72,7 +70,6 @@ require ( github.com/multiformats/go-multihash v0.2.1 github.com/opentracing/opentracing-go v1.2.0 github.com/otiai10/copy v1.7.0 - github.com/otiai10/opengraph/v2 v2.1.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.14.0 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd @@ -91,40 +88,29 @@ require ( golang.org/x/text v0.5.0 google.golang.org/grpc v1.47.0 gopkg.in/Graylog2/go-gelf.v2 v2.0.0-20180125164251-1832d8546a9f - gopkg.in/yaml.v3 v3.0.1 ) require ( github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect github.com/HdrHistogram/hdrhistogram-go v1.1.0 // indirect - github.com/RoaringBitmap/roaring v0.9.4 // indirect github.com/alecthomas/jsonschema v0.0.0-20191017121752-4bb6e3fae4f2 // indirect github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a // indirect github.com/andybalholm/cascadia v1.3.1 // indirect - github.com/anytypeio/go-anytype-infrastructure-experiments/common v0.0.0-20230104140756-02e92a0db0e4 // indirect + github.com/anytypeio/go-chash v0.0.0-20220629194632-4ad1154fe232 // indirect github.com/aymerick/douceur v0.2.0 // indirect github.com/benbjohnson/clock v1.3.0 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bits-and-blooms/bitset v1.2.0 // indirect github.com/blevesearch/bleve_index_api v1.0.5 // indirect github.com/blevesearch/geo v0.1.16 // indirect github.com/blevesearch/go-porterstemmer v1.0.3 // indirect - github.com/blevesearch/gtreap v0.1.1 // indirect - github.com/blevesearch/mmap-go v1.0.4 // indirect - github.com/blevesearch/scorch_segment_api/v2 v2.1.4 // indirect github.com/blevesearch/segment v0.9.0 // indirect github.com/blevesearch/snowballstem v0.9.0 // indirect github.com/blevesearch/upsidedown_store_api v1.0.1 // indirect - github.com/blevesearch/vellum v1.0.9 // indirect - github.com/blevesearch/zapx/v11 v11.3.7 // indirect - github.com/blevesearch/zapx/v12 v12.3.7 // indirect - github.com/blevesearch/zapx/v13 v13.3.7 // indirect - github.com/blevesearch/zapx/v14 v14.3.7 // indirect - github.com/blevesearch/zapx/v15 v15.3.8 // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cheggaaa/mb/v3 v3.0.0 // indirect github.com/containerd/cgroups v1.0.4 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3 // indirect @@ -132,7 +118,6 @@ require ( github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect - github.com/dgraph-io/badger/v3 v3.2103.3 // indirect github.com/dgraph-io/ristretto v0.1.1 // indirect github.com/dlclark/regexp2 v1.2.0 // indirect github.com/docker/go-units v0.5.0 // indirect @@ -170,6 +155,7 @@ require ( github.com/gorilla/websocket v1.5.0 // indirect github.com/gosimple/unidecode v1.0.1 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect github.com/huin/goupnp v1.0.3 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/ipfs/bbloom v0.0.4 // indirect @@ -189,6 +175,7 @@ require ( github.com/ipfs/go-ipfs-provider v0.8.1 // indirect github.com/ipfs/go-ipfs-util v0.0.2 // indirect github.com/ipfs/go-ipld-legacy v0.1.1 // indirect + github.com/ipfs/go-ipns v0.3.0 // indirect github.com/ipfs/go-metrics-interface v0.0.1 // indirect github.com/ipfs/go-peertaskqueue v0.8.0 // indirect github.com/ipfs/go-verifcid v0.0.2 // indirect @@ -223,13 +210,13 @@ require ( github.com/mattn/go-isatty v0.0.16 // indirect github.com/mattn/go-pointer v0.0.1 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect + github.com/mauidude/go-readability v0.0.0-20220221173116-a9b3620098b7 // indirect github.com/miekg/dns v1.1.50 // indirect github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect github.com/minio/sha256-simd v1.0.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/mschoch/smat v0.2.0 // indirect github.com/multiformats/go-base36 v0.2.0 // indirect github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect github.com/multiformats/go-multicodec v0.7.0 // indirect @@ -238,6 +225,7 @@ require ( github.com/oklog/ulid/v2 v2.0.2 // indirect github.com/onsi/ginkgo/v2 v2.5.1 // indirect github.com/opencontainers/runtime-spec v1.0.2 // indirect + github.com/otiai10/opengraph/v2 v2.1.0 // indirect github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 // indirect @@ -267,7 +255,8 @@ require ( github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect - go.etcd.io/bbolt v1.3.5 // indirect + github.com/zeebo/blake3 v0.2.3 // indirect + github.com/zeebo/errs v1.3.0 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/otel v1.11.2 // indirect go.opentelemetry.io/otel/trace v1.11.2 // indirect @@ -287,8 +276,10 @@ require ( google.golang.org/genproto v0.0.0-20220114231437-d2e6a121cae0 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect lukechampine.com/blake3 v1.1.7 // indirect nhooyr.io/websocket v1.8.7 // indirect + storj.io/drpc v0.0.32 // indirect ) replace github.com/elastic/gosigar => github.com/anytypeio/gosigar v0.0.0-20220811145612-92bd3366198a diff --git a/go.sum b/go.sum index 58384ec6c..3e7c87d52 100644 --- a/go.sum +++ b/go.sum @@ -23,6 +23,7 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -51,10 +52,10 @@ github.com/Kubuxu/go-os-helper v0.0.1/go.mod h1:N8B+I7vPCT80IcP58r50u4+gEEcsZETF github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= +github.com/PuerkitoBio/goquery v1.6.0/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= github.com/PuerkitoBio/goquery v1.8.0 h1:PJTF7AmFCFKk1N6V6jmKfrNH9tV5pNE6lZMkG0gta/U= github.com/PuerkitoBio/goquery v1.8.0/go.mod h1:ypIiRMtY7COPGk+I/YbZLbxsxn9g5ejnI2HSMtkjZvI= github.com/RoaringBitmap/roaring v0.9.4 h1:ckvZSX5gwCRaJYBNe7syNawCU5oruY9gQmjXlp4riwo= -github.com/RoaringBitmap/roaring v0.9.4/go.mod h1:icnadbWcNyfEHlYdr+tDlOTih1Bf/h+rzPpv4sbomAA= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/Stebalien/go-bitfield v0.0.1/go.mod h1:GNjFpasyUVkHMsfEOk8EFLJ9syQ6SI+XWrX9Wf2XH0s= @@ -72,26 +73,17 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5 github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a h1:E/8AP5dFtMhl5KPJz66Kt9G0n+7Sn41Fy1wv9/jHOrc= github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= +github.com/andybalholm/cascadia v1.2.0/go.mod h1:YCyR8vOZT9aZ1CHEd8ap0gMVm2aFgxBp0T0eFw1RUQY= github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c= github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/anytypeio/amplitude-go v0.0.0-20211130222238-8d16496a9b31 h1:fCXBjRAxXq4pKyfH8xmYPfjL/E6v5zTTxYrIKDz8ufw= github.com/anytypeio/amplitude-go v0.0.0-20211130222238-8d16496a9b31/go.mod h1:uX6FcwR+wTQWzFszLXQxeKfNeittg1408V7pVAtLKqQ= -github.com/anytypeio/go-anytype-infrastructure-experiments/common v0.0.0-20230102103143-1a2ceb6e2bd6 h1:0CALwAJxDP52qXGFjLr4C9P1lt7x0/Q8uOT2MC6ThqY= -github.com/anytypeio/go-anytype-infrastructure-experiments/common v0.0.0-20230102103143-1a2ceb6e2bd6/go.mod h1:2vafONFWOYl9XTv9vW5KzOmuqdxhC6PAlRfkT7TseZA= -github.com/anytypeio/go-anytype-infrastructure-experiments/common v0.0.0-20230102121649-8680c2432933 h1:s0yyWe4o+UQRoMWuoFkZHoLAsfEc7yPyOP0v1bKQT0A= -github.com/anytypeio/go-anytype-infrastructure-experiments/common v0.0.0-20230102121649-8680c2432933/go.mod h1:2vafONFWOYl9XTv9vW5KzOmuqdxhC6PAlRfkT7TseZA= -github.com/anytypeio/go-anytype-infrastructure-experiments/common v0.0.0-20230102132724-987bd0154f4a h1:A9xzoo/Dy2PN7rbxsfvvBw6g1xhc8/DHQbmhFfcuFVQ= -github.com/anytypeio/go-anytype-infrastructure-experiments/common v0.0.0-20230102132724-987bd0154f4a/go.mod h1:2vafONFWOYl9XTv9vW5KzOmuqdxhC6PAlRfkT7TseZA= -github.com/anytypeio/go-anytype-infrastructure-experiments/common v0.0.0-20230102230233-c64f7328780a h1:GDybMVEvCl76MFnfPv7qLc3ksWAEV7lefTIGZiW947c= -github.com/anytypeio/go-anytype-infrastructure-experiments/common v0.0.0-20230102230233-c64f7328780a/go.mod h1:2vafONFWOYl9XTv9vW5KzOmuqdxhC6PAlRfkT7TseZA= -github.com/anytypeio/go-anytype-infrastructure-experiments/common v0.0.0-20230103175543-ac84febce98d h1:JArJj7ul210P22Gvs3LuT0WDlHbnMtK98BMCJGBwfEM= -github.com/anytypeio/go-anytype-infrastructure-experiments/common v0.0.0-20230103175543-ac84febce98d/go.mod h1:2vafONFWOYl9XTv9vW5KzOmuqdxhC6PAlRfkT7TseZA= -github.com/anytypeio/go-anytype-infrastructure-experiments/common v0.0.0-20230104133926-9b59e6029ddc h1:G5ojRhFsJ9Wi06yR2TNDa3K0m1MhPvsBlJKrpWbsl40= -github.com/anytypeio/go-anytype-infrastructure-experiments/common v0.0.0-20230104133926-9b59e6029ddc/go.mod h1:2vafONFWOYl9XTv9vW5KzOmuqdxhC6PAlRfkT7TseZA= -github.com/anytypeio/go-anytype-infrastructure-experiments/common v0.0.0-20230104140756-02e92a0db0e4 h1:AiohMyvPL8jlMTpHqwkbHOIXftsP1aA8Oe5Z46wCe1M= -github.com/anytypeio/go-anytype-infrastructure-experiments/common v0.0.0-20230104140756-02e92a0db0e4/go.mod h1:2vafONFWOYl9XTv9vW5KzOmuqdxhC6PAlRfkT7TseZA= +github.com/anytypeio/any-sync v0.0.1 h1:5CnfvhL/kqgeXc6uiv4GtCfvbvRLN2vCnv1hReA5+50= +github.com/anytypeio/any-sync v0.0.1/go.mod h1:tjXvTv0Uux70pZxJkrv+zrc3lunj9KScxwzQ6r7/lPM= +github.com/anytypeio/go-chash v0.0.0-20220629194632-4ad1154fe232 h1:kMPPZYmJgbs4AJfodbg2OCXg5cp+9LPAJcLZJqmcghk= +github.com/anytypeio/go-chash v0.0.0-20220629194632-4ad1154fe232/go.mod h1:+PeHBAWp7gUh/yw6uAauKc5ku0w4cFNg6DUddGxoGq0= github.com/anytypeio/go-ds-badger3 v0.3.1-0.20221103102622-3233d4e13cb8 h1:LC9w0M0SbA5VuZeBtUdq+uR4mdjbJhxurNtovmRiOrU= github.com/anytypeio/go-ds-badger3 v0.3.1-0.20221103102622-3233d4e13cb8/go.mod h1:R5tqrpzflXnpE1v91BNZrz62AVox66+rWM51LXNoNik= github.com/anytypeio/go-gelf v0.0.0-20210418191311-774bd5b016e7 h1:YBmcug6mOdwjJcmzA/Fpjtl2oo78+fMlr5Xj0dzwg78= @@ -123,6 +115,7 @@ github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= +github.com/awalterschulze/gographviz v2.0.3+incompatible h1:9sVEXJBJLwGX7EQVhLm2elIKCm7P2YHFC8v6096G09E= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= @@ -137,7 +130,7 @@ 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/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bits-and-blooms/bitset v1.2.0 h1:Kn4yilvwNtMACtf1eYDlG8H77R07mZSPbMjLyS07ChA= -github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= +github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/blevesearch/bleve/v2 v2.3.6 h1:NlntUHcV5CSWIhpugx4d/BRMGCiaoI8ZZXrXlahzNq4= github.com/blevesearch/bleve/v2 v2.3.6/go.mod h1:JM2legf1cKVkdV8Ehu7msKIOKC0McSw0Q16Fmv9vsW4= github.com/blevesearch/bleve_index_api v1.0.5 h1:Lc986kpC4Z0/n1g3gg8ul7H+lxgOQPcXb9SxvQGu+tw= @@ -147,11 +140,8 @@ github.com/blevesearch/geo v0.1.16/go.mod h1:a1OlySNE+oDQ5qY0vJGYNoLIsMpbKbx8dnm github.com/blevesearch/go-porterstemmer v1.0.3 h1:GtmsqID0aZdCSNiY8SkuPJ12pD4jI+DdXTAn4YRcHCo= github.com/blevesearch/go-porterstemmer v1.0.3/go.mod h1:angGc5Ht+k2xhJdZi511LtmxuEf0OVpvUUNrwmM1P7M= github.com/blevesearch/gtreap v0.1.1 h1:2JWigFrzDMR+42WGIN/V2p0cUvn4UP3C4Q5nmaZGW8Y= -github.com/blevesearch/gtreap v0.1.1/go.mod h1:QaQyDRAT51sotthUWAH4Sj08awFSSWzgYICSZ3w0tYk= github.com/blevesearch/mmap-go v1.0.4 h1:OVhDhT5B/M1HNPpYPBKIEJaD0F3Si+CrEKULGCDPWmc= -github.com/blevesearch/mmap-go v1.0.4/go.mod h1:EWmEAOmdAS9z/pi/+Toxu99DnsbhG1TIxUoRmJw/pSs= github.com/blevesearch/scorch_segment_api/v2 v2.1.4 h1:LmGmo5twU3gV+natJbKmOktS9eMhokPGKWuR+jX84vk= -github.com/blevesearch/scorch_segment_api/v2 v2.1.4/go.mod h1:PgVnbbg/t1UkgezPDu8EHLi1BHQ17xUwsFdU6NnOYS0= github.com/blevesearch/segment v0.9.0 h1:5lG7yBCx98or7gK2cHMKPukPZ/31Kag7nONpoBt22Ac= github.com/blevesearch/segment v0.9.0/go.mod h1:9PfHYUdQCgHktBgvtUOF4x+pc4/l8rdH0u5spnW85UQ= github.com/blevesearch/snowballstem v0.9.0 h1:lMQ189YspGP6sXvZQ4WZ+MLawfV8wOmPoD/iWeNXm8s= @@ -159,17 +149,11 @@ github.com/blevesearch/snowballstem v0.9.0/go.mod h1:PivSj3JMc8WuaFkTSRDW2SlrulN github.com/blevesearch/upsidedown_store_api v1.0.1 h1:1SYRwyoFLwG3sj0ed89RLtM15amfX2pXlYbFOnF8zNU= github.com/blevesearch/upsidedown_store_api v1.0.1/go.mod h1:MQDVGpHZrpe3Uy26zJBf/a8h0FZY6xJbthIMm8myH2Q= github.com/blevesearch/vellum v1.0.9 h1:PL+NWVk3dDGPCV0hoDu9XLLJgqU4E5s/dOeEJByQ2uQ= -github.com/blevesearch/vellum v1.0.9/go.mod h1:ul1oT0FhSMDIExNjIxHqJoGpVrBpKCdgDQNxfqgJt7k= github.com/blevesearch/zapx/v11 v11.3.7 h1:Y6yIAF/DVPiqZUA/jNgSLXmqewfzwHzuwfKyfdG+Xaw= -github.com/blevesearch/zapx/v11 v11.3.7/go.mod h1:Xk9Z69AoAWIOvWudNDMlxJDqSYGf90LS0EfnaAIvXCA= github.com/blevesearch/zapx/v12 v12.3.7 h1:DfQ6rsmZfEK4PzzJJRXjiM6AObG02+HWvprlXQ1Y7eI= -github.com/blevesearch/zapx/v12 v12.3.7/go.mod h1:SgEtYIBGvM0mgIBn2/tQE/5SdrPXaJUaT/kVqpAPxm0= github.com/blevesearch/zapx/v13 v13.3.7 h1:igIQg5eKmjw168I7av0Vtwedf7kHnQro/M+ubM4d2l8= -github.com/blevesearch/zapx/v13 v13.3.7/go.mod h1:yyrB4kJ0OT75UPZwT/zS+Ru0/jYKorCOOSY5dBzAy+s= github.com/blevesearch/zapx/v14 v14.3.7 h1:gfe+fbWslDWP/evHLtp/GOvmNM3sw1BbqD7LhycBX20= -github.com/blevesearch/zapx/v14 v14.3.7/go.mod h1:9J/RbOkqZ1KSjmkOes03AkETX7hrXT0sFMpWH4ewC4w= github.com/blevesearch/zapx/v15 v15.3.8 h1:q4uMngBHzL1IIhRc8AJUEkj6dGOE3u1l3phLu7hq8uk= -github.com/blevesearch/zapx/v15 v15.3.8/go.mod h1:m7Y6m8soYUvS7MjN9eKlz1xrLCcmqfFadmu7GhWIrLY= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/btcsuite/btcd v0.0.0-20190213025234-306aecffea32/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8= github.com/btcsuite/btcd v0.0.0-20190523000118-16327141da8c/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI= @@ -202,6 +186,8 @@ github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= github.com/cheggaaa/mb v1.0.3 h1:03ksWum+6kHclB+kjwKMaBtgl5gtNYUwNpxsHQciKe8= github.com/cheggaaa/mb v1.0.3/go.mod h1:NUl0GBtFLlfg2o6iZwxzcG7Lslc2wV/ADTFbLXtVPE4= +github.com/cheggaaa/mb/v3 v3.0.0 h1:+FkV4fAefQfJSsfMtWC9cnSrVYKd3TXcerPTwRuWWfE= +github.com/cheggaaa/mb/v3 v3.0.0/go.mod h1:zCt2QeYukhd/g0bIdNqF+b/kKz1hnLFNDkP49qN5kqI= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -220,16 +206,20 @@ github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE github.com/containerd/cgroups v0.0.0-20201119153540-4cbc285b3327/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE= github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/corona10/goimagehash v1.0.2 h1:pUfB0LnsJASMPGEZLj7tGY251vF+qLGqOgEP4rUs6kA= github.com/corona10/goimagehash v1.0.2/go.mod h1:/l9umBhvcHQXVtQO1V6Gp1yD20STawkhRnnX0D1bvVI= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= @@ -272,6 +262,7 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-farm v0.0.0-20190104051053-3adb47b1fb0f/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dgtony/collections v0.1.6 h1:Qv4xLe4nXJgIeeExex6e7mDyP57tzZN3MYaGfN8uECc= github.com/dgtony/collections v0.1.6/go.mod h1:olD2FRoNisWmjMhK6LDRKv+lMnDoryOZIT+owtd/o6U= github.com/dhowden/tag v0.0.0-20201120070457-d52dcb253c63 h1:/u5RVRk3Nh7Zw1QQnPtUH5kzcc8JmSSRpHSlGU/zGTE= @@ -410,8 +401,6 @@ github.com/gogo/status v1.1.0 h1:+eIkrewn5q6b30y+g/BJINVVdi2xH7je5MPJ3ZPK3JA= github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= -github.com/golang-jwt/jwt/v4 v4.4.2 h1:rcc4lwaZgFMCZ5jxF9ABolDcIHdBytAFgqFPbSJQAYs= -github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= @@ -421,6 +410,7 @@ github.com/golang/geo v0.0.0-20210211234256-740aa86cb551/go.mod h1:QZ0nwyI2jOfgR github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -475,7 +465,6 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= @@ -527,6 +516,7 @@ github.com/gosimple/slug v1.13.1/go.mod h1:UiRaFH+GEilHstLUmcBgWcI42viBN7mAb818J github.com/gosimple/unidecode v1.0.1 h1:hZzFTMMqSswvf0LBJZCZgThIZrpDHFXux9KeGmn6T/o= github.com/gosimple/unidecode v1.0.1/go.mod h1:CP0Cr1Y1kogOtx0bJblKzsVWrqYaqfNOnHzpgWw4Awc= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= @@ -534,6 +524,7 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 h1:MJG/KsmcqMwFAkh8mTnAwhyKoB+sTAnY4CACC110tbU= @@ -542,7 +533,9 @@ github.com/gxed/hashland/keccakpg v0.0.1/go.mod h1:kRzw3HkwxFU1mpmPP8v1WyQzwdGfm github.com/gxed/hashland/murmur3 v0.0.1/go.mod h1:KjXop02n4/ckmZSnY2+HKcLud/tcmvhST0bie/0lS48= github.com/h2non/filetype v1.1.1 h1:xvOwnXKAckvtLWsN398qS9QhlxlnVXBjXBydK2/UFB4= github.com/h2non/filetype v1.1.1/go.mod h1:319b3zT68BvV+WRj7cwy856M2ehB3HqNOt6sy1HndBY= +github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= +github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= @@ -793,8 +786,8 @@ github.com/klauspost/compress v1.15.12 h1:YClS/PImqYbn+UILDnqxQCZ3RehC9N318SU3kE github.com/klauspost/compress v1.15.12/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.2.1 h1:U33DW0aiEj633gHYw3LoDNfkDiYnE5Q8M/TKJn2f2jI= -github.com/klauspost/cpuid/v2 v2.2.1/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= +github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c= +github.com/klauspost/cpuid/v2 v2.2.2 h1:xPMwiykqNK9VK0NYC3+jTMYv9I6Vl3YdjZgPZKG3zO0= github.com/klauspost/cpuid/v2 v2.2.2/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -1028,6 +1021,7 @@ github.com/lucas-clemente/quic-go v0.31.1/go.mod h1:0wFbizLgYzqHqtlyxyCaJKlE7bYg github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.4 h1:8KGKTcQQGm0Kv7vEbKFErAoAOFyyacLStRtQSeYtvkY= github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -1061,8 +1055,8 @@ github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRC github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/mauidude/go-readability v0.0.0-20141216012317-2f30b1a346f1 h1:LUX7+Xw9WqBYU1KIhBeHhE9IEziRmfE6QL/KOJw27XY= -github.com/mauidude/go-readability v0.0.0-20141216012317-2f30b1a346f1/go.mod h1:JunVAey+5bzS6oFzfAEXL15REaSvzaDhB+muny1oSNU= +github.com/mauidude/go-readability v0.0.0-20220221173116-a9b3620098b7 h1:fyeF5W88KadlaznP18zkzo+RT7GKlH60Y1LtX1GzRs4= +github.com/mauidude/go-readability v0.0.0-20220221173116-a9b3620098b7/go.mod h1:exaOQ9fu7YHBGZsKGvfkrr5WSRi5iEeqdoawtTgrPP0= github.com/mb0/diff v0.0.0-20131118162322-d8d9a906c24d h1:eAS2t2Vy+6psf9LZ4T5WXWsbkBt3Tu5PWekJy5AGyEU= github.com/mb0/diff v0.0.0-20131118162322-d8d9a906c24d/go.mod h1:3YMHqrw2Qu3Liy82v4QdAG17e9k91HZ7w3hqlpWqhDo= github.com/mehanizm/dateparse v0.0.0-20210806203422-f82c8742c9f8 h1:SA/3Lk2gFZilCejaXeCTkA3+MHt9uI9ogzx45F/nOFE= @@ -1118,7 +1112,6 @@ github.com/mr-tron/base58 v1.1.3/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjW github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM= -github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw= github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA= github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aGkbLYxPE= github.com/multiformats/go-base32 v0.1.0/go.mod h1:Kj3tFY6zNr+ABYMqeUNeGvkIC/UYgtWibDcT0rExnbI= @@ -1185,6 +1178,7 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLA github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/oklog/ulid/v2 v2.0.2 h1:r4fFzBm+bv0wNKNh5eXTwU7i85y5x+uwkxCUTNVQqLc= github.com/oklog/ulid/v2 v2.0.2/go.mod h1:mtBL0Qe/0HAx6/a4Z30qxVIAL1eQDweXq5lxOEiwQ68= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= @@ -1221,7 +1215,6 @@ github.com/otiai10/copy v1.7.0 h1:hVoPiN+t+7d2nzzwMiDHPSOogsWAStewq3TwU05+clE= github.com/otiai10/copy v1.7.0/go.mod h1:rmRl6QPdJj6EiUqXQ/4Nn2lLXoNQjFCQbbNrxgc/t3U= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= -github.com/otiai10/marmoset v0.4.0 h1:Hg59lQI7qQowBEdsAJ/+VDTEospTBzXX/A1Gsw4mlvA= github.com/otiai10/marmoset v0.4.0/go.mod h1:t2q6dXWZ9YcFdRREDApX4bCmfQnL3isJ2dgl8ychlXg= github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= github.com/otiai10/mint v1.3.2/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= @@ -1253,13 +1246,14 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/polydawn/refmt v0.0.0-20190221155625-df39d6c2d992/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o= github.com/polydawn/refmt v0.0.0-20190408063855-01bf1e26dd14/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o= github.com/polydawn/refmt v0.0.0-20190807091052-3d65705ee9f1/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o= -github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e h1:ZOcivgkkFRnjfoTcGsDq3UQYiBmekwLA+qg0OjyB/ls= github.com/polydawn/refmt v0.0.0-20201211092308-30ac6d18308e/go.mod h1:uIp+gprXxxrWSjjklXD+mN4wed/tMfjMMmN/9+JsA9o= +github.com/polydawn/refmt v0.89.0 h1:ADJTApkvkeBZsN0tBTx8QjpD9JkmxbKp0cxfr9qszm4= github.com/polydawn/refmt v0.89.0/go.mod h1:/zvteZs/GwLtCgZ4BL6CBsk9IKIlexP43ObX9AxTqTw= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= @@ -1277,7 +1271,9 @@ github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6T github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= @@ -1290,6 +1286,7 @@ github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJ github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -1298,6 +1295,7 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/raulk/go-watchdog v1.3.0 h1:oUmdlHxdkXRJlwfG0O9omj8ukerm8MEQavSiDTEtBsk= github.com/raulk/go-watchdog v1.3.0/go.mod h1:fIvOnLbF0b0ZwkB9YU4mOW9Did//4vPZtDqv66NfsMU= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= @@ -1349,13 +1347,13 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/assertions v1.0.0 h1:UVQPSSmc3qtTi+zPPkCXvZX9VvW/xT/NsRvKfwY81a8= github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= +github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs= github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo= github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa/go.mod h1:2RVY1rIf+2J2o/IM9+vPq9RzmHDSseB7FoXiSNIUsoU= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg= github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM= github.com/smola/gocompat v0.2.0/go.mod h1:1B0MlxbmoZNo3h8guHp8HztB3BSYR5itql9qtVc0ypY= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -1372,6 +1370,7 @@ github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= @@ -1380,6 +1379,7 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/src-d/envconfig v1.0.0/go.mod h1:Q9YQZ7BKITldTBnoxsE5gOeB5y66RyPXeue/R4aaNBc= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -1400,6 +1400,7 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= @@ -1421,6 +1422,7 @@ github.com/tidwall/sjson v1.2.3/go.mod h1:5WdjKx3AQMvCJ4RG6/2UYT7dLrGvJUV1x4jdTA github.com/tj/assert v0.0.0-20190920132354-ee03d75cd160 h1:NSWpaDaurcAJY7PkL8Xt0PhZE7qpvbZl5ljd8r6U0bI= github.com/tj/assert v0.0.0-20190920132354-ee03d75cd160/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tyler-smith/go-bip39 v1.0.1-0.20190808214741-c55f737395bc h1:TnvShh/v2U3Jxq9rHLlmhoLiSECp2QHdsCh/uo1m9U8= github.com/tyler-smith/go-bip39 v1.0.1-0.20190808214741-c55f737395bc/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= github.com/uber/jaeger-client-go v2.28.0+incompatible h1:G4QSBfvPKvg5ZM2j9MrJFdfI5iSljY/WnJqOGFao6HI= @@ -1441,14 +1443,13 @@ github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMI github.com/warpfork/go-testmark v0.10.0 h1:E86YlUMYfwIacEsQGlnTvjk1IgYkyTGjPhF0RnwTCmw= github.com/warpfork/go-wish v0.0.0-20180510122957-5ad1f5abf436/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw= github.com/warpfork/go-wish v0.0.0-20190328234359-8b3e70f8e830/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw= -github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a h1:G++j5e0OC488te356JvdhaM8YS6nMsjLAYF7JxCv07w= github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw= +github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0 h1:GDDkbFiaK8jsSDJfjId/PEGEShv6ugrt4kYsC5UIDaQ= github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw= github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc h1:BCPnHtcboadS0DvysUuJXZ4lWVv5Bh5i7+tbIyi+ck4= github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc/go.mod h1:r45hJU7yEoA81k6MWNhpMj/kms0n14dkzkxYHoB96UM= github.com/whyrusleeping/cbor-gen v0.0.0-20200123233031-1cdf64d27158/go.mod h1:Xj/M2wWU+QdTdRbu/L/1dIZY8/Wb2K9pAhtroQuxJJI= -github.com/whyrusleeping/cbor-gen v0.0.0-20210219115102-f37d292932f2 h1:bsUlNhdmbtlfdLVXAVfuvKQ01RnWAM09TVrJkI7NZs4= -github.com/whyrusleeping/cbor-gen v0.0.0-20210219115102-f37d292932f2/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ= +github.com/whyrusleeping/cbor-gen v0.0.0-20221213004032-c09a31a7d5e8 h1:wGJHI5UqTlrtrgpA5kaQACNegkEHGhG/6Lmc7QORfqI= github.com/whyrusleeping/cbor-gen v0.0.0-20221213004032-c09a31a7d5e8/go.mod h1:fgkXqYy7bV2cFeIEOkVTZS/WjXARfBqSH6Q2qHL33hQ= github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f h1:jQa4QT2UP9WYv2nzyawpKMOCl+Z/jW7djv2/J50lj9E= github.com/whyrusleeping/chunker v0.0.0-20181014151217-fe64bd25879f/go.mod h1:p9UJB6dDgdPgMJZs7UjUOdulKyRr9fqkS+6JKAInPy8= @@ -1484,9 +1485,17 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/zeebo/assert v1.1.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= +github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= +github.com/zeebo/blake3 v0.2.3 h1:TFoLXsjeXqRNFxSbk35Dk4YtszE/MQQGK10BH4ptoTg= +github.com/zeebo/blake3 v0.2.3/go.mod h1:mjJjZpnsyIVtVgTOSpJ9vmRE4wgDeyt2HU3qXvvKCaQ= +github.com/zeebo/errs v1.3.0 h1:hmiaKqgYZzcVgRL1Vkc1Mn2914BbzB0IBxs+ebeutGs= +github.com/zeebo/errs v1.3.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4= +github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo= +github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= -go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.mongodb.org/mongo-driver v1.10.3 h1:XDQEvmh6z1EUsXuIkXE9TaVeqHw6SwS1uf93jFs0HBA= go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= @@ -1502,11 +1511,9 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/otel v1.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM= -go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk= +go.opentelemetry.io/otel v1.11.2 h1:YBZcQlsVekzFsFbjygXMOXSs6pialIZxcjfO/mBDmR0= go.opentelemetry.io/otel v1.11.2/go.mod h1:7p4EUV+AqgdlNV9gL97IgUZiVR3yrFXYo53f9BM3tRI= -go.opentelemetry.io/otel/trace v1.7.0 h1:O37Iogk1lEkMRXewVtZ1BBTVn5JEp8GrJvP92bJqC6o= -go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU= +go.opentelemetry.io/otel/trace v1.11.2 h1:Xf7hWSF2Glv0DE3MH7fBHvtpSBsjcBUe5MYAmZM/+y0= go.opentelemetry.io/otel/trace v1.11.2/go.mod h1:4N+yC7QEz7TTsG9BSRLNAa63eg5E06ObSbKPmxQ/pKA= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= @@ -1528,8 +1535,7 @@ go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/ go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= -go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= +go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= @@ -1570,8 +1576,7 @@ golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210506145944-38f3c27a63bf/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= -golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A= -golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= +golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8= golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1666,6 +1671,7 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200923182212-328152dc79b1/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= @@ -1783,7 +1789,6 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1832,6 +1837,7 @@ golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1870,8 +1876,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0= -golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= @@ -2002,6 +2007,8 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/src-d/go-cli.v0 v0.0.0-20181105080154-d492247bbc0d/go.mod h1:z+K8VcOYVYcSwSjGebuDL6176A1XskgbtNl64NSg+n8= gopkg.in/src-d/go-log.v1 v1.0.1/go.mod h1:GN34hKP0g305ysm2/hctJ0Y8nWP3zxXXJ8GFabTyABE= @@ -2044,3 +2051,5 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck= sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= +storj.io/drpc v0.0.32 h1:5p5ZwsK/VOgapaCu+oxaPVwO6UwIs+iwdMiD50+R4PI= +storj.io/drpc v0.0.32/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg= diff --git a/pkg/lib/cafe/client.go b/pkg/lib/cafe/client.go index cf5ff1e61..1dff356e8 100644 --- a/pkg/lib/cafe/client.go +++ b/pkg/lib/cafe/client.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/anytype/config" "github.com/anytypeio/go-anytype-middleware/core/wallet" "github.com/anytypeio/go-anytype-middleware/pkg/lib/cafe/pb" diff --git a/pkg/lib/core/core.go b/pkg/lib/core/core.go index 872d925ab..b7e952de9 100644 --- a/pkg/lib/core/core.go +++ b/pkg/lib/core/core.go @@ -3,7 +3,7 @@ package core import ( "context" "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/anytype/config" "github.com/anytypeio/go-anytype-middleware/core/configfetcher" "github.com/anytypeio/go-anytype-middleware/core/event" diff --git a/pkg/lib/datastore/clientds/clientds.go b/pkg/lib/datastore/clientds/clientds.go index 8a27a1ba5..61d21f6f5 100644 --- a/pkg/lib/datastore/clientds/clientds.go +++ b/pkg/lib/datastore/clientds/clientds.go @@ -13,7 +13,6 @@ import ( dgraphbadgerv1 "github.com/dgraph-io/badger" dgraphbadgerv1pb "github.com/dgraph-io/badger/pb" - "github.com/hashicorp/go-multierror" ds "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/query" dsbadgerv1 "github.com/ipfs/go-ds-badger" @@ -21,7 +20,7 @@ import ( dsbadgerv3 "github.com/textileio/go-ds-badger3" "github.com/textileio/go-threads/db/keytransform" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/wallet" "github.com/anytypeio/go-anytype-middleware/pkg/lib/datastore" "github.com/anytypeio/go-anytype-middleware/pkg/lib/logging" diff --git a/pkg/lib/datastore/datastore.go b/pkg/lib/datastore/datastore.go index a9cf3ea55..e049543e8 100644 --- a/pkg/lib/datastore/datastore.go +++ b/pkg/lib/datastore/datastore.go @@ -2,7 +2,7 @@ package datastore import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/dgraph-io/badger/v3" ds "github.com/ipfs/go-datastore" "github.com/textileio/go-threads/db/keytransform" diff --git a/pkg/lib/files/files.go b/pkg/lib/files/files.go index 8b401f8d6..42b7f6015 100644 --- a/pkg/lib/files/files.go +++ b/pkg/lib/files/files.go @@ -20,7 +20,7 @@ import ( "github.com/multiformats/go-base32" mh "github.com/multiformats/go-multihash" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/pkg/lib/crypto/symmetric" "github.com/anytypeio/go-anytype-middleware/pkg/lib/crypto/symmetric/cfb" "github.com/anytypeio/go-anytype-middleware/pkg/lib/crypto/symmetric/gcm" diff --git a/pkg/lib/gateway/gateway.go b/pkg/lib/gateway/gateway.go index 5b8a17cc4..cba8a1414 100644 --- a/pkg/lib/gateway/gateway.go +++ b/pkg/lib/gateway/gateway.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" "github.com/anytypeio/go-anytype-middleware/pkg/lib/logging" ) diff --git a/pkg/lib/ipfs/ipfs.go b/pkg/lib/ipfs/ipfs.go index 85dec4693..6fe58b65f 100644 --- a/pkg/lib/ipfs/ipfs.go +++ b/pkg/lib/ipfs/ipfs.go @@ -2,7 +2,7 @@ package ipfs import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/pkg/lib/logging" cid "github.com/ipfs/go-cid" blockstore "github.com/ipfs/go-ipfs-blockstore" diff --git a/pkg/lib/ipfs/ipfslite/lite.go b/pkg/lib/ipfs/ipfslite/lite.go index 5ea6acd2f..13e586938 100644 --- a/pkg/lib/ipfs/ipfslite/lite.go +++ b/pkg/lib/ipfs/ipfslite/lite.go @@ -12,9 +12,7 @@ import ( ds "github.com/ipfs/go-datastore" blockstore "github.com/ipfs/go-ipfs-blockstore" ipld "github.com/ipfs/go-ipld-format" - "github.com/ipfs/go-ipns" uio "github.com/ipfs/go-unixfs/io" - "github.com/libp2p/go-libp2p" dht "github.com/libp2p/go-libp2p-kad-dht" dualdht "github.com/libp2p/go-libp2p-kad-dht/dual" record "github.com/libp2p/go-libp2p-record" @@ -33,7 +31,7 @@ import ( madns "github.com/multiformats/go-multiaddr-dns" "github.com/textileio/go-threads/util" - app "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + app "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/anytype/config" "github.com/anytypeio/go-anytype-middleware/core/wallet" "github.com/anytypeio/go-anytype-middleware/pkg/lib/datastore" diff --git a/pkg/lib/localstore/filestore/files.go b/pkg/lib/localstore/filestore/files.go index 207b5f109..427002343 100644 --- a/pkg/lib/localstore/filestore/files.go +++ b/pkg/lib/localstore/filestore/files.go @@ -3,7 +3,7 @@ package filestore import ( "context" "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/pkg/lib/datastore" ds "github.com/anytypeio/go-anytype-middleware/pkg/lib/datastore/noctxds" "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore" diff --git a/pkg/lib/localstore/ftsearch/ftsearch.go b/pkg/lib/localstore/ftsearch/ftsearch.go index 7ea508437..7d5b122de 100644 --- a/pkg/lib/localstore/ftsearch/ftsearch.go +++ b/pkg/lib/localstore/ftsearch/ftsearch.go @@ -2,7 +2,7 @@ package ftsearch import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/wallet" "github.com/anytypeio/go-anytype-middleware/metrics" "github.com/blevesearch/bleve/v2/analysis/analyzer/custom" @@ -13,7 +13,6 @@ import ( "path/filepath" "strings" - "github.com/blevesearch/bleve/v2" "github.com/blevesearch/bleve/v2/analysis/analyzer/standard" "github.com/blevesearch/bleve/v2/mapping" "github.com/blevesearch/bleve/v2/search/query" diff --git a/pkg/lib/localstore/objectstore/objects.go b/pkg/lib/localstore/objectstore/objects.go index a9568e7a5..478edd313 100644 --- a/pkg/lib/localstore/objectstore/objects.go +++ b/pkg/lib/localstore/objectstore/objects.go @@ -18,7 +18,7 @@ import ( ds "github.com/ipfs/go-datastore" "github.com/ipfs/go-datastore/query" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/metrics" "github.com/anytypeio/go-anytype-middleware/pkg/lib/bundle" cafePb "github.com/anytypeio/go-anytype-middleware/pkg/lib/cafe/pb" diff --git a/pkg/lib/pin/service.go b/pkg/lib/pin/service.go index af1e5ae22..7fa691f43 100644 --- a/pkg/lib/pin/service.go +++ b/pkg/lib/pin/service.go @@ -3,7 +3,7 @@ package pin import ( "context" "errors" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/filestore" "sync" "time" diff --git a/pkg/lib/profilefinder/profilefinder.go b/pkg/lib/profilefinder/profilefinder.go index db0603867..abd7c274f 100644 --- a/pkg/lib/profilefinder/profilefinder.go +++ b/pkg/lib/profilefinder/profilefinder.go @@ -12,7 +12,7 @@ import ( "io" "sync" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" ) const CName = "process" diff --git a/pkg/lib/threads/service.go b/pkg/lib/threads/service.go index ccca62d1b..fba418f1e 100644 --- a/pkg/lib/threads/service.go +++ b/pkg/lib/threads/service.go @@ -29,7 +29,7 @@ import ( "github.com/textileio/go-threads/db/keytransform" "google.golang.org/grpc" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/wallet" "github.com/anytypeio/go-anytype-middleware/metrics" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core/smartblock" diff --git a/space/clientcache/cache.go b/space/clientcache/cache.go index f3ec7e67f..c2df52a0c 100644 --- a/space/clientcache/cache.go +++ b/space/clientcache/cache.go @@ -3,13 +3,13 @@ package clientcache import ( "context" "errors" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ocache" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/objecttree" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/treegetter" + "github.com/anytypeio/any-sync/accountservice" + "github.com/anytypeio/any-sync/app" + "github.com/anytypeio/any-sync/app/logger" + "github.com/anytypeio/any-sync/app/ocache" + "github.com/anytypeio/any-sync/commonspace/object/tree/objecttree" + "github.com/anytypeio/any-sync/commonspace/object/tree/treestorage" + "github.com/anytypeio/any-sync/commonspace/object/treegetter" "github.com/anytypeio/go-anytype-middleware/core/block/editor" "github.com/anytypeio/go-anytype-middleware/core/block/editor/smartblock" coresb "github.com/anytypeio/go-anytype-middleware/pkg/lib/core/smartblock" diff --git a/space/rpchandler.go b/space/rpchandler.go index 20b9a6ab9..585a0231c 100644 --- a/space/rpchandler.go +++ b/space/rpchandler.go @@ -2,8 +2,8 @@ package space import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" + "github.com/anytypeio/any-sync/commonspace" + "github.com/anytypeio/any-sync/commonspace/spacesyncproto" ) type rpcHandler struct { diff --git a/space/service.go b/space/service.go index 0428134a4..9181946f0 100644 --- a/space/service.go +++ b/space/service.go @@ -2,15 +2,15 @@ package space import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/accountservice" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/logger" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ocache" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/net/rpc/server" + "github.com/anytypeio/any-sync/accountservice" + "github.com/anytypeio/any-sync/app" + "github.com/anytypeio/any-sync/app/logger" + "github.com/anytypeio/any-sync/app/ocache" + "github.com/anytypeio/any-sync/commonspace" + "github.com/anytypeio/any-sync/commonspace/spacestorage" + "github.com/anytypeio/any-sync/commonspace/spacesyncproto" + "github.com/anytypeio/any-sync/commonspace/syncstatus" + "github.com/anytypeio/any-sync/net/rpc/server" "time" ) diff --git a/space/space.go b/space/space.go index d6680f9a6..81638076f 100644 --- a/space/space.go +++ b/space/space.go @@ -2,7 +2,7 @@ package space import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace" + "github.com/anytypeio/any-sync/commonspace" ) func newClientSpace(cc commonspace.Space) (commonspace.Space, error) { diff --git a/space/statusreceiver.go b/space/statusreceiver.go index 9b10fbc13..5e0e1e8a1 100644 --- a/space/statusreceiver.go +++ b/space/statusreceiver.go @@ -2,7 +2,7 @@ package space import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/syncstatus" + "github.com/anytypeio/any-sync/commonspace/syncstatus" "go.uber.org/zap" ) diff --git a/space/storage/keys.go b/space/storage/keys.go index b2d7ac618..022853ba7 100644 --- a/space/storage/keys.go +++ b/space/storage/keys.go @@ -1,7 +1,7 @@ package storage import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" + "github.com/anytypeio/any-sync/commonspace/object/tree/treestorage" ) type aclKeys struct { diff --git a/space/storage/liststorage.go b/space/storage/liststorage.go index 923a274d8..a962efd6f 100644 --- a/space/storage/liststorage.go +++ b/space/storage/liststorage.go @@ -3,8 +3,8 @@ package storage import ( "context" "errors" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/liststorage" + "github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/any-sync/commonspace/object/acl/liststorage" "github.com/dgraph-io/badger/v3" ) diff --git a/space/storage/liststorage_test.go b/space/storage/liststorage_test.go index 8b9a344c5..82942cb9d 100644 --- a/space/storage/liststorage_test.go +++ b/space/storage/liststorage_test.go @@ -2,8 +2,8 @@ package storage import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/liststorage" + "github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/any-sync/commonspace/object/acl/liststorage" "github.com/dgraph-io/badger/v3" "github.com/stretchr/testify/require" "testing" diff --git a/space/storage/spacestorage.go b/space/storage/spacestorage.go index 830222998..2f7944b31 100644 --- a/space/storage/spacestorage.go +++ b/space/storage/spacestorage.go @@ -1,11 +1,11 @@ package storage import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/liststorage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" - storage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" - spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" + "github.com/anytypeio/any-sync/commonspace/object/acl/liststorage" + "github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto" + storage "github.com/anytypeio/any-sync/commonspace/object/tree/treestorage" + spacestorage "github.com/anytypeio/any-sync/commonspace/spacestorage" + "github.com/anytypeio/any-sync/commonspace/spacesyncproto" "github.com/dgraph-io/badger/v3" ) diff --git a/space/storage/spacestorage_test.go b/space/storage/spacestorage_test.go index 7b48068c3..edec0b5df 100644 --- a/space/storage/spacestorage_test.go +++ b/space/storage/spacestorage_test.go @@ -1,10 +1,10 @@ package storage import ( - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/acl/aclrecordproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" - spacestorage "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacesyncproto" + "github.com/anytypeio/any-sync/commonspace/object/acl/aclrecordproto" + "github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto" + spacestorage "github.com/anytypeio/any-sync/commonspace/spacestorage" + "github.com/anytypeio/any-sync/commonspace/spacesyncproto" "github.com/stretchr/testify/require" "sort" "strconv" diff --git a/space/storage/storageservice.go b/space/storage/storageservice.go index 2173727e5..c5454d318 100644 --- a/space/storage/storageservice.go +++ b/space/storage/storageservice.go @@ -2,8 +2,8 @@ package storage import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/spacestorage" + "github.com/anytypeio/any-sync/app" + "github.com/anytypeio/any-sync/commonspace/spacestorage" "github.com/anytypeio/go-anytype-middleware/pkg/lib/datastore" "github.com/dgraph-io/badger/v3" ) diff --git a/space/storage/treestorage.go b/space/storage/treestorage.go index 3e60a7044..58b2ca50b 100644 --- a/space/storage/treestorage.go +++ b/space/storage/treestorage.go @@ -2,8 +2,8 @@ package storage import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" + "github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto" + "github.com/anytypeio/any-sync/commonspace/object/tree/treestorage" "github.com/dgraph-io/badger/v3" ) diff --git a/space/storage/treestorage_test.go b/space/storage/treestorage_test.go index a5c6e4c0b..660f2fb37 100644 --- a/space/storage/treestorage_test.go +++ b/space/storage/treestorage_test.go @@ -2,8 +2,8 @@ package storage import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treestorage" + "github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto" + "github.com/anytypeio/any-sync/commonspace/object/tree/treestorage" "github.com/dgraph-io/badger/v3" "github.com/stretchr/testify/require" "os" diff --git a/space/typeprovider/typeprovider.go b/space/typeprovider/typeprovider.go index ec91b2972..c4d06f95e 100644 --- a/space/typeprovider/typeprovider.go +++ b/space/typeprovider/typeprovider.go @@ -3,8 +3,8 @@ package typeprovider import ( "context" "errors" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/commonspace/object/tree/treechangeproto" + "github.com/anytypeio/any-sync/app" + "github.com/anytypeio/any-sync/commonspace/object/tree/treechangeproto" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core/smartblock" "github.com/anytypeio/go-anytype-middleware/pkg/lib/localstore/addr" "github.com/anytypeio/go-anytype-middleware/space" diff --git a/util/builtinobjects/builtinobjects.go b/util/builtinobjects/builtinobjects.go index 3b48ef742..78a32ae80 100644 --- a/util/builtinobjects/builtinobjects.go +++ b/util/builtinobjects/builtinobjects.go @@ -14,7 +14,7 @@ import ( "github.com/gogo/protobuf/types" "github.com/textileio/go-threads/core/thread" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/anytype/config" "github.com/anytypeio/go-anytype-middleware/core/block" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" diff --git a/util/builtintemplate/builtintemplate.go b/util/builtintemplate/builtintemplate.go index 86ea1760d..5b20386e5 100644 --- a/util/builtintemplate/builtintemplate.go +++ b/util/builtintemplate/builtintemplate.go @@ -12,7 +12,7 @@ import ( "io" "io/ioutil" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/core/block/editor/state" "github.com/anytypeio/go-anytype-middleware/core/block/simple" "github.com/anytypeio/go-anytype-middleware/core/block/simple/relation" diff --git a/util/linkpreview/cache.go b/util/linkpreview/cache.go index dcaabf900..0b3098a55 100644 --- a/util/linkpreview/cache.go +++ b/util/linkpreview/cache.go @@ -2,10 +2,10 @@ package linkpreview import ( "context" + "github.com/golang/groupcache/lru" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" - "github.com/hashicorp/golang-lru" ) const ( @@ -23,7 +23,7 @@ type cache struct { func (c *cache) Init(_ *app.App) (err error) { c.lp = New() - c.cache, _ = lru.New(maxCacheEntries) + c.cache = lru.New(maxCacheEntries) return } diff --git a/util/linkpreview/linkpreview.go b/util/linkpreview/linkpreview.go index 7156c6b37..373dd0dc4 100644 --- a/util/linkpreview/linkpreview.go +++ b/util/linkpreview/linkpreview.go @@ -1,17 +1,17 @@ package linkpreview import ( - "bytes" "context" "github.com/anytypeio/go-anytype-middleware/util/text" - "github.com/go-shiori/go-readability" + "github.com/mauidude/go-readability" "io" "net/http" + "net/url" "path/filepath" "strings" "unicode/utf8" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/util/uri" "github.com/anytypeio/go-anytype-middleware/pkg/lib/pb/model" @@ -87,7 +87,7 @@ func (l *linkPreview) convertOGToInfo(fetchUrl string, og *opengraph.OpenGraph) } if len(og.Image) != 0 { - url, err := uri.NormalizeURI(og.Image[0].URL) + url, err := uri.ProcessURI(og.Image[0].URL) if err == nil { i.ImageUrl = url } @@ -102,12 +102,11 @@ func (l *linkPreview) findContent(data []byte) (content string) { // ignore possible panic while html parsing } }() - - article, err := readability.FromReader(bytes.NewReader(data), nil) + doc, err := readability.NewDocument(string(data)) if err != nil { return } - content = article.TextContent + content = doc.Content() content = strings.TrimSpace(l.bmPolicy.Sanitize(content)) content = strings.Join(strings.Fields(content), " ") // removes repetitive whitespaces if text.UTF16RuneCountString(content) > maxDescriptionSize { @@ -128,11 +127,11 @@ func (l *linkPreview) makeNonHtml(fetchUrl string, resp *http.Response) (i model } else { i.Type = model.LinkPreview_Unknown } - pURL, e := uri.ParseURI(fetchUrl) + pUrl, e := url.Parse(fetchUrl) if e == nil { - pURL.Path = "favicon.ico" - pURL.RawQuery = "" - i.FaviconUrl = pURL.String() + pUrl.Path = "favicon.ico" + pUrl.RawQuery = "" + i.FaviconUrl = pUrl.String() } return } diff --git a/util/testMock/anytype.go b/util/testMock/anytype.go index 315d61464..d0092fad8 100644 --- a/util/testMock/anytype.go +++ b/util/testMock/anytype.go @@ -5,7 +5,7 @@ package testMock import ( "context" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" + "github.com/anytypeio/any-sync/app" "github.com/anytypeio/go-anytype-middleware/app/testapp" "github.com/anytypeio/go-anytype-middleware/core/kanban" "github.com/anytypeio/go-anytype-middleware/pkg/lib/core" diff --git a/util/unsplash/unsplash.go b/util/unsplash/unsplash.go index 596d41e14..673b547b2 100644 --- a/util/unsplash/unsplash.go +++ b/util/unsplash/unsplash.go @@ -3,19 +3,18 @@ package unsplash import ( "context" "fmt" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app" - "github.com/anytypeio/go-anytype-infrastructure-experiments/common/app/ocache" + "github.com/anytypeio/any-sync/app" + "github.com/anytypeio/any-sync/app/ocache" "github.com/anytypeio/go-anytype-middleware/core/configfetcher" "github.com/anytypeio/go-anytype-middleware/pkg/lib/logging" "github.com/anytypeio/go-anytype-middleware/util/pbtypes" - "github.com/anytypeio/go-anytype-middleware/util/uri" - "github.com/dsoprea/go-exif/v3" jpegstructure "github.com/dsoprea/go-jpeg-image-structure/v2" "github.com/hbagdi/go-unsplash/unsplash" "golang.org/x/oauth2" "io" "io/ioutil" "net/http" + "net/url" "os" "path/filepath" "regexp" @@ -111,8 +110,8 @@ func newFromPhoto(v unsplash.Photo) (Result, error) { fUrl := v.Urls.Regular.String() // hack to have full hd instead of 1080w, // in case unsplash will change the URL format it will not break things - u, err := uri.ParseURI(fUrl) - if err == nil { + u, _ := url.Parse(fUrl) + if u != nil { if q := u.Query(); q.Get("w") != "" { q.Set("w", "1920") u.RawQuery = q.Encode()